summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* translation updateKlap-in2013-09-25
|
* Merge pull request #352 from dokuwiki-translate/lang_update_321Andreas Gohr2013-09-25
|\ | | | | Translation update (es)
| * translation updatemonica2013-09-24
|/
* Merge pull request #351 from dokuwiki-translate/lang_update_315Andreas Gohr2013-09-24
|\ | | | | Translation update (zh)
| * translation updateDonald2013-09-23
| |
* | Merge pull request #350 from dokuwiki-translate/lang_update_314Andreas Gohr2013-09-24
|\ \ | | | | | | Translation update (pt-br)
| * | translation updateLeone Lisboa Magevski2013-09-22
| |/
* | Merge pull request #343 from dokuwiki-translate/lang_update_309Andreas Gohr2013-09-24
|\ \ | |/ |/| Translation update (ko)
| * translation updateGerrit Uitslag2013-09-20
| |
* | Merge pull request #333 from mperry2/whitespaceAndreas Gohr2013-09-22
|\ \ | |/ |/| Fix CodeSniffer whitespace violoations
| * Fix CodeSniffer whitespace violoationsMatt Perry2013-09-10
| | | | | | | | | | Removed extraneous whitespace to eliminate errors reported by the Squiz.WhiteSpace.SuperfluousWhitespace sniff.
* | Fix the js and css cache seed to contain the update versionMichael Hamann2013-09-17
| |
* | Fix tpl_basedir to use the supplied templateMichael Hamann2013-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_299Michael Hamann2013-09-17
|\ \ | | | | | | Translation update (fr)
| * | translation updateschplurtz2013-09-16
| | |
* | | 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