Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Extend pageutils_clean_id tests to show more behavior details | Gerrit Uitslag | 2013-09-19 |
| | |||
* | Fix the js and css cache seed to contain the update version | Michael Hamann | 2013-09-17 |
| | |||
* | Fix tpl_basedir to use the supplied template | Michael Hamann | 2013-09-17 |
| | | | | | Previously only the path for the configured template was returned and the parameter was ignored. | ||
* | Merge pull request #339 from dokuwiki-translate/lang_update_299 | Michael Hamann | 2013-09-17 |
|\ | | | | | Translation update (fr) | ||
| * | translation update | schplurtz | 2013-09-16 |
| | | |||
* | | Merge pull request #340 from dokuwiki-translate/lang_update_300 | Michael Hamann | 2013-09-17 |
|\ \ | |/ |/| | Translation update (nl) | ||
| * | translation update | Gerrit Uitslag | 2013-09-17 |
|/ | |||
* | Merge pull request #337 from dokuwiki-translate/lang_update_288 | Anika Henke | 2013-09-15 |
|\ | | | | | Translation update (fr) | ||
| * | translation update | schplurtz | 2013-09-15 |
| | | |||
* | | removed authmodfailed line in ro lang again (sneaked back in) | Anika Henke | 2013-09-15 |
| | | |||
* | | Merge pull request #331 from araname/master | Anika Henke | 2013-09-15 |
|\ \ | |/ |/| | Translation update in Korean | ||
| * | Translation update in Korean | Myeongjin | 2013-09-15 |
| | | |||
| * | Merge branch 'master' of https://github.com/splitbrain/dokuwiki | Myeongjin | 2013-09-15 |
| |\ | |/ |/| | |||
* | | Merge pull request #335 from dokuwiki-translate/lang_update_279 | Anika Henke | 2013-09-15 |
|\ \ | | | | | | | Translation update (ja) | ||
| * | | translation update | Hideaki SAWADA | 2013-09-12 |
| | | | |||
* | | | Merge pull request #336 from razvand/master | Anika Henke | 2013-09-15 |
|\ \ \ | | | | | | | | | Use consistent translation in Romanian language file | ||
| * | | | Use consistent translation in Romanian language file | Razvan Deaconescu | 2013-09-14 |
| |/ / | |||
* | | | Merge pull request #332 from dokuwiki-translate/lang_update_269 | Anika Henke | 2013-09-15 |
|\ \ \ | | | | | | | | | Translation update (ru) | ||
| * | | | translation update | Aleksandr Selivanov | 2013-09-08 |
| |/ / | |||
* | | | Merge pull request #334 from mperry2/notabs | Anika Henke | 2013-09-15 |
|\ \ \ | |/ / |/| | | Replace tabs with spaces | ||
| * | | Replace tabs with spaces | Matt Perry | 2013-09-10 |
|/ / | | | | | | | | | Replace tabs with spaces to fixed the Generic.WhiteSpace.DisallowTabIndent.TabsUsed sniff. | ||
| * | Translation update in Korean | Myeongjin | 2013-09-08 |
|/ | |||
* | Merge pull request #329 from dokuwiki-translate/lang_update_266 | Dominik Eckelmann | 2013-09-04 |
|\ | | | | | Translation update (fr) | ||
| * | translation update | Vincent Feltz | 2013-09-04 |
|/ | |||
* | removed unused lang string (authmodfailed) | Anika Henke | 2013-09-03 |
| | |||
* | Removed old default template | Anika Henke | 2013-09-01 |
| | | | | | | | | | | The old 'default' template was deprecated with the release of the new 'dokuwiki' template (2012-10-13). It is still available in a separate repository here: https://github.com/dokufreaks/template-default But no-one in the core development team intends to maintain this template anymore. So, anyone willing to adopt it is welcome to clone it and make it your own. | ||
* | Merge pull request #308 from flammy/patch-3 | Michael Hamann | 2013-09-01 |
|\ | | | | | add pointer curser to mediafile | ||
| * | add pointer curser to mediafile | flammy | 2013-08-14 |
| | | | | | | Added the pointer icon to the media manager pop-up to show users it is clickable. | ||
* | | Merge pull request #322 from dokuwiki-translate/lang_update_252 | Michael Hamann | 2013-09-01 |
|\ \ | | | | | | | Translation update (sl) | ||
| * | | translation update | Matej Urbančič | 2013-08-26 |
| | | | |||
* | | | Merge pull request #326 from mperry2/scopeindent | Michael Hamann | 2013-09-01 |
|\ \ \ | | | | | | | | | Fix CodeSniffer violations | ||
| * | | | Fix CodeSniffer violations | Matt Perry | 2013-08-27 |
| |/ / | | | | | | | | | | | | | Fix violations for the following sniff DokuWiki.WhiteSpace.ScopeIndent | ||
* | | | Merge pull request #324 from mperry2/openbrace | Michael Hamann | 2013-09-01 |
|\ \ \ | |/ / |/| | | Fix CodeSniffer violations | ||
| * | | Fix CodeSniffer violations | Matt Perry | 2013-08-27 |
|/ / | | | | | | | | | | | | | Fix violations for the following sniff DokuWiki.Functions.OpeningFunctionBrace Also removed an extraneous semicolon. | ||
* | | Merge pull request #320 from lupo49/master | Andreas Gohr | 2013-08-26 |
|\ \ | | | | | | | Added "global $conf" to make the conditions working. | ||
| * | | Added "global $conf" to make the conditions working. | Matthias Schulte | 2013-08-25 |
|/ / | |||
* | | Fix CodeSniffer violations for PHP files | Matt Perry | 2013-08-23 |
| | | | | | | | | | | | | | | Fix violations for Squiz.Commenting.DocCommentAlignment.SpaceBeforeTag Conflicts: inc/parser/xhtml.php | ||
* | | Merge pull request #316 from mperry2/cs-closingtag | Andreas Gohr | 2013-08-23 |
|\ \ | | | | | | | Fix CodeSniffer violations for Zend.Files.ClosingTag.NotAllowed | ||
| * | | Fix CodeSniffer violations for PHP files | Matt Perry | 2013-08-23 |
| | | | | | | | | | | | | Fix violations for Zend.Files.ClosingTag.NotAllowed | ||
* | | | Merge pull request #315 from mperry2/cs-code | Andreas Gohr | 2013-08-23 |
|\ \ \ | | | | | | | | | Fix CodeSniffer violations for Generic.PHP.LowerCaseConstant.Found | ||
| * | | | Fix CodeSniffer violations for PHP files | Matt Perry | 2013-08-23 |
| |/ / | | | | | | | | | | Fix violations for Generic.PHP.LowerCaseConstant.Found | ||
| * | | Exclude files from CodeSniffer checks | Matt Perry | 2013-08-22 |
| | | | | | | | | | | | | | | | Exclude inc/blowfish.php and lib/scripts/fileuploader.js from CodeSniffer checks. | ||
| * | | Revert changes to phpseclib to previous commit | Matt Perry | 2013-08-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | Michael Hamann commented in pull request #306 that phpseclib has not been adopted by the DokuWiki project. Therefore, the changes made to reduce the CodeSniffer violations should be reverted and the local copy of phpseclib should be excluded from CS checks. This commit reverts the previous changes and adds the appropriate exclusion rule. | ||
* | | | Merge pull request #318 from mperry2/text-fix | Andreas Gohr | 2013-08-23 |
|\ \ \ | | | | | | | | | Fix several grammar mistakes in the configuration manager | ||
| * | | | Fix grammar in proxy_except description | Matt Perry | 2013-08-23 |
| | | | | | | | | | | | | | | | | Remove trailing preposition. | ||
| * | | | Fix grammar for allowdebug description | Matt Perry | 2013-08-23 |
| | | | | | | | | | | | | | | | | Add a full stop between sentences for the allowdebug description. | ||
| * | | | Fix grammar for the hidepages description | Matt Perry | 2013-08-23 |
| |/ / | |||
* / / | FS#2840 fix typo in debug message | Christoph Schindler | 2013-08-23 |
|/ / | |||
* | | Merge pull request #312 from mperry2/master | Andreas Gohr | 2013-08-22 |
|\ \ | | | | | | | Exclude inc/lessc.inc.php from CodeSniffer checks | ||
| * | | Exclude inc/lessc.inc.php from CodeSniffer checks | Matt Perry | 2013-08-22 |
|/ / |