Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 |
|/ / | |||
* | | Merge pull request #311 from mperry2/scopeindent | Andreas Gohr | 2013-08-22 |
|\ \ | | | | | | | Fix CodeSniffer violations | ||
| * | | Fix CodeSniffer violations | Matt Perry | 2013-08-22 |
| | | | | | | | | | | | | Change indentation to ensure code confirms to CodeSniffer rules. | ||
* | | | Merge pull request #310 from mperry2/cs-ruleset | Andreas Gohr | 2013-08-22 |
|\| | | | | | | | | Update exclude patterns for CodeSniffer | ||
| * | | Add jQuery exclusion in CodeSniffer rule set | Matt Perry | 2013-08-21 |
| | | | | | | | | | | | | Add a CodeSniffer exclusion rule for the lib/scripts/jquery directory. | ||
| * | | Fix adLDAP exclusion in CodeSniffer rule set | Matt Perry | 2013-08-21 |
|/ / | | | | | | | | | Fix the exclusion of adLDAP to exclude all of its dependent subdirectories in addition to the main adLDAP.php file. | ||
* | | Merge pull request #304 from dokuwiki-translate/lang_update_234 | Andreas Gohr | 2013-08-21 |
|\ \ | | | | | | | Translation update (de-informal) | ||
| * | | translation update | Dennis Plöger | 2013-08-19 |
| | | | |||
* | | | Merge pull request #305 from dokuwiki-translate/lang_update_244 | Andreas Gohr | 2013-08-21 |
|\ \ \ | | | | | | | | | Translation update (ru) | ||
| * | | | translation update | Aleksandr Selivanov | 2013-08-20 |
| | | | | |||
* | | | | Merge pull request #307 from dokuwiki-translate/lang_update_245 | Andreas Gohr | 2013-08-21 |
|\ \ \ \ | | | | | | | | | | | Translation update (ko) | ||
| * | | | | translation update | Myeongjin | 2013-08-21 |
| |/ / / | |||
* | | | | Merge pull request #306 from mperry2/whitespace | Andreas Gohr | 2013-08-20 |
|\ \ \ \ | |/ / / |/| | | | Fix CodeSniffer violations | ||
| * | | | Fix CodeSniffer violations | Matt Perry | 2013-08-20 |
|/ / / | | | | | | | | | | | | | Remove whitespace from end of lines to reduce the number of CodeSniffer violations. | ||
* | | | Merge pull request #303 from dokuwiki-translate/lang_update_232 | Andreas Gohr | 2013-08-19 |
|\ \ \ | |/ / |/| | | Translation update (ko) | ||
| * | | translation update | Myeongjin | 2013-08-19 |
|/ / | |||
* | | Merge pull request #302 from dokuwiki-translate/lang_update_223 | Andreas Gohr | 2013-08-18 |
|\ \ | | | | | | | Translation update (ko) | ||
| * | | translation update | Myeongjin | 2013-08-17 |
| | | | |||
* | | | Fix backlinks for internal links with parameters | Michael Hamann | 2013-08-17 |
|/ / | | | | | | | | | | | | | This adds the parameter extraction code from the xhtml renderer to the metadata renderer in order to not to include the parameters in the id that is recorded as link target. A test case checks that the link is actually returned as backlink (fails without the fix). | ||
* | | Merge pull request #301 from araname/patch-1 | Andreas Gohr | 2013-08-16 |
|\ \ | | | | | | | translation update | ||
| * | | translation update mailwrap.html | Myeongjin | 2013-08-16 |
|/ / | |||
* | | Merge pull request #300 from dokuwiki-translate/lang_update_208 | Andreas Gohr | 2013-08-16 |
|\ \ | | | | | | | Translation update (ko) | ||
| * | | translation update | Myeongjin | 2013-08-16 |
| | | |