summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'authpwdexpire' into languagecleanupPatrick Brown2015-04-04
|\
| * Move language string to authad pluginPatrick Brown2015-03-31
* | Delete unused div (Fixes #1098)Patrick Brown2015-04-03
* | Remove unused language stringsPatrick Brown2015-04-03
* | Merge pull request #1097 from dokuwiki-translate/lang_update_35Andreas Gohr2015-04-02
|\ \
| * | translation updateRomulo Pereira2015-03-31
* | | Merge pull request #1102 from splitbrain/plugingroupsAndreas Gohr2015-04-02
|\ \ \ | |/ / |/| |
| * | add plugin groups to config plugin testChristopher Smith2015-04-01
| * | add more plugin groups to authplain testChristopher Smith2015-04-01
|/ /
* | Merge pull request #1089 from dokuwiki-translate/lang_update_27Andreas Gohr2015-03-31
|\ \
| * | translation updateMyeongjin2015-03-28
| |/
* | Merge pull request #1090 from dokuwiki-translate/lang_update_28Andreas Gohr2015-03-31
|\ \
| * | translation updateJaroslav Lichtblau2015-03-28
| |/
* | Merge pull request #1095 from dokuwiki-translate/lang_update_33Andreas Gohr2015-03-31
|\ \ | |/ |/|
| * translation updateAlejandro Nunez2015-03-31
|/
* Merge pull request #1083 from chang-zhao/masterAndreas Gohr2015-03-25
|\
| * Update toolbar.jschang-zhao2015-03-21
| * Merge pull request #1 from splitbrain/masterchang-zhao2015-03-21
| |\
* | \ Merge pull request #1085 from dokuwiki-translate/lang_update_25Andreas Gohr2015-03-24
|\ \ \ | |_|/ |/| |
| * | translation updateसरोज ढकाल2015-03-24
|/ /
* | Merge pull request #1022 from cdwertmann/patch-1Andreas Gohr2015-03-19
|\ \
| * | Speed up indexer on lighttpd by using tpl_flush()Christoph Dwertmann2015-03-17
| * | Add ob_flush() to sendGIFChristoph Dwertmann2015-02-05
* | | corrupted the gz test file moreAndreas Gohr2015-03-18
* | | SECURITY escape user properties in user manager #1081Andreas Gohr2015-03-18
* | | fixed HTTPS proxy tests, our tests now run on httpbin.orgAndreas Gohr2015-03-18
* | | correct error checking for bz2 file readingAndreas Gohr2015-03-18
* | | Merge pull request #1079 from dokuwiki-translate/lang_update_18Andreas Gohr2015-03-18
|\ \ \
| * | | translation updateitsho2015-03-18
|/ / /
* | | give better error message in HTTPClient for failed crypto setupAndreas Gohr2015-03-18
* | | Merge pull request #1078 from dokuwiki-translate/lang_update_14Andreas Gohr2015-03-17
|\ \ \
| * | | translation updateJacob Palm2015-03-17
|/ / /
* | | use correct host in proxy testsAndreas Gohr2015-03-16
* | | Merge pull request #1073 from sklrrzn/masterAndreas Gohr2015-03-16
|\ \ \
| * | | Add english description for new authldap optionsSascha Klopp2015-03-16
| * | | Add description for modPass-OptionSascha Klopp2015-03-13
| * | | Two new authldap config options: 'userkey' denotes the LDAPSascha Klopp2015-03-03
* | | | Merge pull request #1070 from micgro42/authadGetUserCountAndreas Gohr2015-03-16
|\ \ \ \
| * | | | Escape user strings given to adLDAPMichael Große2015-03-12
| * | | | Explain functions in docstringsMichael Große2015-03-12
| * | | | Clean up code, add phpdoc comments, some refactoring, etc.Michael Große2015-03-12
| * | | | Disable the ``last`` button when filtering groupsMichael Große2015-03-12
| * | | | When filtering for group implement prefetchingMichael Große2015-03-12
| * | | | Create and use ad search for user, name and emailMichael Große2015-03-12
| * | | | Get total number of users in ad, needed for pagingMichael Große2015-03-11
* | | | | send JavaScript with correct mimetypeAndreas Gohr2015-03-03
| |/ / / |/| | |
* | | | Merge pull request #1053 from splitbrain/pageidmobileAndreas Gohr2015-02-25
|\ \ \ \ | |/ / / |/| | |
| * | | remove additional sidebar bottom margin in phone modeAndreas Gohr2015-02-25
| * | | simple fix for pageID clash with sidebar in mobile viewAndreas Gohr2015-02-24
* | | | Merge pull request #1057 from dokuwiki-translate/lang_update_6Andreas Gohr2015-02-25
|\ \ \ \