summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #340 from dokuwiki-translate/lang_update_300Michael Hamann2013-09-17
|\ | | | | Translation update (nl)
| * translation updateGerrit Uitslag2013-09-17
|/
* Merge pull request #337 from dokuwiki-translate/lang_update_288Anika Henke2013-09-15
|\ | | | | Translation update (fr)
| * translation updateschplurtz2013-09-15
| |
* | removed authmodfailed line in ro lang again (sneaked back in)Anika Henke2013-09-15
| |
* | Merge pull request #331 from araname/masterAnika Henke2013-09-15
|\ \ | |/ |/| Translation update in Korean
| * Translation update in KoreanMyeongjin2013-09-15
| |
| * Merge branch 'master' of https://github.com/splitbrain/dokuwikiMyeongjin2013-09-15
| |\ | |/ |/|
* | Merge pull request #335 from dokuwiki-translate/lang_update_279Anika Henke2013-09-15
|\ \ | | | | | | Translation update (ja)
| * | translation updateHideaki SAWADA2013-09-12
| | |
* | | Merge pull request #336 from razvand/masterAnika Henke2013-09-15
|\ \ \ | | | | | | | | Use consistent translation in Romanian language file
| * | | Use consistent translation in Romanian language fileRazvan Deaconescu2013-09-14
| |/ /
* | | Merge pull request #332 from dokuwiki-translate/lang_update_269Anika Henke2013-09-15
|\ \ \ | | | | | | | | Translation update (ru)
| * | | translation updateAleksandr Selivanov2013-09-08
| |/ /
* | | Merge pull request #334 from mperry2/notabsAnika Henke2013-09-15
|\ \ \ | |/ / |/| | Replace tabs with spaces
| * | Replace tabs with spacesMatt Perry2013-09-10
|/ / | | | | | | | | Replace tabs with spaces to fixed the Generic.WhiteSpace.DisallowTabIndent.TabsUsed sniff.
| * Translation update in KoreanMyeongjin2013-09-08
|/
* Merge pull request #329 from dokuwiki-translate/lang_update_266Dominik Eckelmann2013-09-04
|\ | | | | Translation update (fr)
| * translation updateVincent Feltz2013-09-04
|/
* removed unused lang string (authmodfailed)Anika Henke2013-09-03
|
* Removed old default templateAnika Henke2013-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-3Michael Hamann2013-09-01
|\ | | | | add pointer curser to mediafile
| * add pointer curser to mediafileflammy2013-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_252Michael Hamann2013-09-01
|\ \ | | | | | | Translation update (sl)
| * | translation updateMatej Urbančič2013-08-26
| | |
* | | Merge pull request #326 from mperry2/scopeindentMichael Hamann2013-09-01
|\ \ \ | | | | | | | | Fix CodeSniffer violations
| * | | Fix CodeSniffer violationsMatt Perry2013-08-27
| |/ / | | | | | | | | | | | | Fix violations for the following sniff DokuWiki.WhiteSpace.ScopeIndent
* | | Merge pull request #324 from mperry2/openbraceMichael Hamann2013-09-01
|\ \ \ | |/ / |/| | Fix CodeSniffer violations
| * | 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.