summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix CodeSniffer violationsMatt Perry2013-08-27
| | | | | | | Fix violations for the following sniff DokuWiki.Functions.OpeningFunctionBrace Also removed an extraneous semicolon.
* Merge pull request #320 from lupo49/masterAndreas Gohr2013-08-26
|\ | | | | Added "global $conf" to make the conditions working.
| * Added "global $conf" to make the conditions working.Matthias Schulte2013-08-25
|/
* Fix CodeSniffer violations for PHP filesMatt Perry2013-08-23
| | | | | | | Fix violations for Squiz.Commenting.DocCommentAlignment.SpaceBeforeTag Conflicts: inc/parser/xhtml.php
* Merge pull request #316 from mperry2/cs-closingtagAndreas Gohr2013-08-23
|\ | | | | Fix CodeSniffer violations for Zend.Files.ClosingTag.NotAllowed
| * Fix CodeSniffer violations for PHP filesMatt Perry2013-08-23
| | | | | | | | Fix violations for Zend.Files.ClosingTag.NotAllowed
* | Merge pull request #315 from mperry2/cs-codeAndreas Gohr2013-08-23
|\ \ | | | | | | Fix CodeSniffer violations for Generic.PHP.LowerCaseConstant.Found
| * | Fix CodeSniffer violations for PHP filesMatt Perry2013-08-23
| |/ | | | | | | Fix violations for Generic.PHP.LowerCaseConstant.Found
| * Exclude files from CodeSniffer checksMatt Perry2013-08-22
| | | | | | | | | | Exclude inc/blowfish.php and lib/scripts/fileuploader.js from CodeSniffer checks.
| * Revert changes to phpseclib to previous commitMatt Perry2013-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-fixAndreas Gohr2013-08-23
|\ \ | | | | | | Fix several grammar mistakes in the configuration manager
| * | Fix grammar in proxy_except descriptionMatt Perry2013-08-23
| | | | | | | | | | | | Remove trailing preposition.
| * | Fix grammar for allowdebug descriptionMatt Perry2013-08-23
| | | | | | | | | | | | Add a full stop between sentences for the allowdebug description.
| * | Fix grammar for the hidepages descriptionMatt Perry2013-08-23
| |/
* / FS#2840 fix typo in debug messageChristoph Schindler2013-08-23
|/
* Merge pull request #312 from mperry2/masterAndreas Gohr2013-08-22
|\ | | | | Exclude inc/lessc.inc.php from CodeSniffer checks
| * Exclude inc/lessc.inc.php from CodeSniffer checksMatt Perry2013-08-22
|/
* Merge pull request #311 from mperry2/scopeindentAndreas Gohr2013-08-22
|\ | | | | Fix CodeSniffer violations
| * Fix CodeSniffer violationsMatt Perry2013-08-22
| | | | | | | | Change indentation to ensure code confirms to CodeSniffer rules.
* | Merge pull request #310 from mperry2/cs-rulesetAndreas Gohr2013-08-22
|\| | | | | Update exclude patterns for CodeSniffer
| * Add jQuery exclusion in CodeSniffer rule setMatt Perry2013-08-21
| | | | | | | | Add a CodeSniffer exclusion rule for the lib/scripts/jquery directory.
| * Fix adLDAP exclusion in CodeSniffer rule setMatt Perry2013-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_234Andreas Gohr2013-08-21
|\ | | | | Translation update (de-informal)
| * translation updateDennis Plöger2013-08-19
| |
* | Merge pull request #305 from dokuwiki-translate/lang_update_244Andreas Gohr2013-08-21
|\ \ | | | | | | Translation update (ru)
| * | translation updateAleksandr Selivanov2013-08-20
| | |
* | | Merge pull request #307 from dokuwiki-translate/lang_update_245Andreas Gohr2013-08-21
|\ \ \ | | | | | | | | Translation update (ko)
| * | | translation updateMyeongjin2013-08-21
| |/ /
* | | Merge pull request #306 from mperry2/whitespaceAndreas Gohr2013-08-20
|\ \ \ | |/ / |/| | Fix CodeSniffer violations
| * | Fix CodeSniffer violationsMatt Perry2013-08-20
|/ / | | | | | | | | Remove whitespace from end of lines to reduce the number of CodeSniffer violations.
* | Merge pull request #303 from dokuwiki-translate/lang_update_232Andreas Gohr2013-08-19
|\ \ | |/ |/| Translation update (ko)
| * translation updateMyeongjin2013-08-19
|/
* Merge pull request #302 from dokuwiki-translate/lang_update_223Andreas Gohr2013-08-18
|\ | | | | Translation update (ko)
| * translation updateMyeongjin2013-08-17
| |
* | Fix backlinks for internal links with parametersMichael Hamann2013-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-1Andreas Gohr2013-08-16
|\ | | | | translation update
| * translation update mailwrap.htmlMyeongjin2013-08-16
|/
* Merge pull request #300 from dokuwiki-translate/lang_update_208Andreas Gohr2013-08-16
|\ | | | | Translation update (ko)
| * translation updateMyeongjin2013-08-16
| |
* | Merge pull request #297 from dokuwiki-translate/lang_update_199Andreas Gohr2013-08-16
|\ \ | | | | | | Translation update (cs)
| * | translation updateZbyněk Křivka2013-08-15
| |/
* | Merge pull request #299 from dokuwiki-translate/lang_update_202Andreas Gohr2013-08-16
|\ \ | |/ |/| Translation update (pt)
| * translation updateAndré Neves2013-08-16
|/
* Merge pull request #296 from dokuwiki-translate/lang_update_193Andreas Gohr2013-08-15
|\ | | | | Translation update (eo)
| * translation updateFelipe Castro2013-08-15
|/
* Merge pull request #295 from dokuwiki-translate/lang_update_190Andreas Gohr2013-08-15
|\ | | | | Translation update (pt-br)
| * translation updateFrederico Gonçalves Guimarães2013-08-15
| |
* | Merge pull request #292 from dokuwiki-translate/lang_update_165Andreas Gohr2013-08-15
|\ \ | | | | | | Translation update (ne)
| * | translation updateSaroj Dhakal2013-08-15
| | |
* | | Merge pull request #294 from dokuwiki-translate/lang_update_184Andreas Gohr2013-08-15
|\ \ \ | |_|/ |/| | Translation update (ko)