summaryrefslogtreecommitdiff
path: root/inc
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/splitbrain/dokuwikiDominik Eckelmann2012-03-14
|\
| * Merge pull request #86 from lupo49/masterAndreas Gohr2012-03-14
| |\
| | * Parser: Allow parser to fully recognize windows share links with a hyphen cha...lupo492012-03-07
| * | pass the correct clean parameter when reading wiki pagesAndreas Gohr2012-03-13
| * | Merge branch 'adexpirywarn'Andreas Gohr2012-03-10
| |\ \
| | * | make sure AD pass expiry message is never shown twiceAndreas Gohr2012-02-17
| | * | do not hardcode profile link in AD pass expire messageAndreas Gohr2012-02-17
| | * | translatable AD expiry warning and link to update profile pageAndreas Gohr2011-11-07
| | * | Don't return any data for non-existant usersAndreas Gohr2011-11-07
| | * | do not query AD for empty user nameAndreas Gohr2011-11-07
| | * | always check expire time when configuredAndreas Gohr2011-11-07
| | * | Check password expiry times in Active Directory backendAndreas Gohr2011-10-31
| * | | Merge pull request #71 from danny0838/masterAndreas Gohr2012-03-10
| |\ \ \
| | * | | Fix a stupid typoDanny2012-03-01
| | * | | Slight fix to match current version.Danny2011-12-17
| | * | | Rework for missing commit 08162f005f3ced0555de590dc1a53155af99d998Danny2011-12-17
| | * | | Rewark for missing commit 9aa0e6c6087e616511fc95d1650ca9b608edece8Danny2011-12-17
| * | | | Merge branch 'jscachekey'Andreas Gohr2012-03-10
| |\ \ \ \
| | * | | | added INIT_LANG_LOAD eventDominik Eckelmann2012-01-24
| * | | | | Merge branch 'resetpassword'Andreas Gohr2012-03-10
| |\ \ \ \ \
| | * | | | | added a timelimit for password reset tokensAndreas Gohr2012-02-19
| | * | | | | removed commented lineAndreas Gohr2012-02-17
| | * | | | | use correct lang string for password mismatchAndreas Gohr2012-02-17
| | * | | | | removed outdated language string. it has to be retranslatedAndreas Gohr2012-02-17
| | * | | | | German translation for password resetAndreas Gohr2011-11-07
| | * | | | | honor autopasswd setting for resend passwordAndreas Gohr2011-10-31
| | | |_|/ / | | |/| | |
| * | | | | Add link to view non images files in media manager (FS#2439)Guy Brand2012-03-07
| | |_|_|/ | |/| | |
| * | | | Czech language updateBohumír Zámečník2012-03-04
| * | | | fixed media only RSS feedAndreas Gohr2012-03-02
| * | | | simpler/more robust header parsing in HTTPClientAndreas Gohr2012-02-22
| * | | | Korean language updateErial Krale2012-02-15
| * | | | Romanian language updateMarius Olar2012-02-07
| * | | | Russian language updatePCPA2012-02-06
| * | | | added div.table around non-editable content as well (FS#1980)Anika Henke2012-02-04
| * | | | Slovak language updateMatej Urban2012-02-02
| * | | | Polish language updateBegina Felicysym2012-02-02
| * | | | Merge pull request #72 from dom-mel/auth_fixesAndreas Gohr2012-02-01
| |\ \ \ \
| | * | | | use in_array to filter groups instead of preg_grep for aclDominik Eckelmann2011-12-20
| * | | | | Merge pull request #58 from splitbrain/bcryptAndreas Gohr2012-02-01
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'lmd5' into bcryptAndreas Gohr2011-11-27
| | |\ \ \ \ \
| | | * | | | | renamed passhash method smd6 to lsmd5Andreas Gohr2011-11-27
| | | * | | | | MD5 password hash format of the LDAP RFC FS#2378Patrick Michel2011-11-27
| | * | | | | | Merge branch 'master' into bcryptAndreas Gohr2011-11-27
| | |\| | | | |
| | * | | | | | Added bcrypt support for password hashesAndreas Gohr2011-10-14
| * | | | | | | fixed .curid to always highlight the current ID of the main/viewed pageAnika Henke2012-01-31
| * | | | | | | added missing global statementsAndreas Gohr2012-01-30
| * | | | | | | DOKU_TPL* considered harmfulAndreas Gohr2012-01-30
| * | | | | | | made the tpl_getMediaFile() function more flexibleAndreas Gohr2012-01-30
| * | | | | | | added tpl_getMediaFile() to replace tpl_getFavicon()Anika Henke2012-01-29
| * | | | | | | added missing actions to tpl_actiondropdown()Anika Henke2012-01-29