summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* translation updateMartin Michalek2013-10-07
|
* Merge pull request #361 from splitbrain/FS#2860Christopher Smith2013-10-06
|\ | | | | RS#2860 fix configuration option key to 'template'
| * RS#2860 fix configuration option key to 'template'Christopher Smith2013-10-04
| |
* | Merge pull request #347 from hArpanet/patch-1Christopher Smith2013-10-06
|\ \ | | | | | | Bugfix: DOKU_CONF path in pageutils.php
| * | Bugfix: DOKU_CONF path in pageutils.phphArpanet2013-09-20
| | | | | | | | | Remove extraneous slash. This extra slash was preventing the file being displayed by DokuWiki. (apologies for the two pulls instead of one)
* | | Merge pull request #346 from hArpanet/patch-2Christopher Smith2013-10-06
|\ \ \ | | | | | | | | Bugfix: DOKU_CONF path in plugin.php
| * | | Bugfix: DOKU_CONF pathhArpanet2013-09-20
| | | | | | | | | | | | Remove extraneous slash
* | | | Merge pull request #348 from splitbrain/candochecksUsermanagerChristopher Smith2013-10-06
|\ \ \ \ | | | | | | | | | | Cando check and localization improvements of usermanager
| * | | | change visibility of private to protectedGerrit Uitslag2013-09-22
| | | | |
| * | | | Use ->cleanUser everywhere in usermanager. Fixes FS#2849Gerrit Uitslag2013-09-21
| | | | | | | | | | | | | | | | | | | | Some auth backend have bad cleaning, but that is responsibility of these.
| * | | | Move strings to language files. Fix lang keyGerrit Uitslag2013-09-21
| | | | |
| * | | | Improve PHPDocs and set visibility explicitlyGerrit Uitslag2013-09-21
| | | | |
| * | | | Use zero when getUserCount is unsupported. Fixes FS#2353Gerrit Uitslag2013-09-20
| |/ / /
* | | | Merge pull request #364 from splitbrain/fixsklocalizationGerrit Uitslag2013-10-06
|\ \ \ \ | | | | | | | | | | Fixsklocalization
| * \ \ \ Merge remote-tracking branch 'dokutranslatefork/lang_update_351' into ↵Gerrit Uitslag2013-10-06
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixsklocalization Conflicts: lib/plugins/authmysql/lang/sk/settings.php lib/plugins/authpgsql/lang/sk/settings.php
| | * | | | translation updateMartin Michalek2013-10-02
| | | |_|/ | | |/| |
* | | | | Merge pull request #363 from dokuwiki-translate/lang_update_363Gerrit Uitslag2013-10-06
|\ \ \ \ \ | | | | | | | | | | | | Translation update (hi)
| * | | | | translation updateSantosh Joshi2013-10-06
| | | | | |
* | | | | | Merge pull request #360 from dokuwiki-translate/lang_update_360Gerrit Uitslag2013-10-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (ja)
| * | | | | | translation updateHideaki SAWADA2013-10-04
| |/ / / / /
* | | | | | Merge pull request #358 from dokuwiki-translate/lang_update_356Gerrit Uitslag2013-10-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (fa)
| * | | | | | translation updatemehrdad2013-10-04
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #357 from dokuwiki-translate/lang_update_355Gerrit Uitslag2013-10-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translation update (ko)
| * | | | | | translation updateMyeongjin2013-10-04
| |/ / / / /
* | | | | | Merge pull request #356 from dokuwiki-translate/lang_update_354Gerrit Uitslag2013-10-06
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Translation update (pt-br)
| * | | | | translation updateDário Estevão2013-10-03
| |/ / / /
* | | | | Merge pull request #354 from dokuwiki-translate/lang_update_350Gerrit Uitslag2013-10-06
|\ \ \ \ \ | |_|/ / / |/| | | | Translation update (sk)
| * | | | translation updateMartin Michalek2013-10-01
| |/ / /
* | | | Merge pull request #359 from dokuwiki-translate/lang_update_359Gerrit Uitslag2013-10-04
|\ \ \ \ | |/ / / |/| | | Translation update (cs)
| * | | translation updateGerrit Uitslag2013-10-04
|/ / /
* | | Merge pull request #353 from dokuwiki-translate/lang_update_330Gerrit Uitslag2013-09-25
|\ \ \ | | | | | | | | Translation update (nl)
| * | | 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
| | | |