summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* Merge pull request #86 from lupo49/masterAndreas Gohr2012-03-14
|\ | | | | Parser: Allow parser to fully recognize windows share links with a hyphen character in it
| * Parser: Allow parser to fully recognize windows share links with a hyphen ↵lupo492012-03-07
| | | | | | | | | | | | character in it (Currently, the clickable link stops before a hyphen character)
* | pass the correct clean parameter when reading wiki pagesAndreas Gohr2012-03-13
| | | | | | | | | | | | | | DokuWiki's page loading is intended to be filesystem agnostic. DOS line endings in pages are supposed to be self healing. This behaviour was broken in a change in 2006. As long as you edited pages through DokuWiki only you never noticed the bug though.
* | Merge branch 'adexpirywarn'Andreas Gohr2012-03-10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adexpirywarn: make sure AD pass expiry message is never shown twice do not hardcode profile link in AD pass expire message translatable AD expiry warning and link to update profile page Don't return any data for non-existant users do not query AD for empty user name always check expire time when configured Check password expiry times in Active Directory backend
| * | 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
| | | | | | | | | | | | Changing passwords might not be available.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user logs in, the password expiry time is checked and compared to the $conf['auth']['ad']['expirywarn'] setting (in days). If the password is about to expire in the specified timeframe, a warning is issued on login. This patch adds a new method to the adLDAP class for querying domain parameters.
* | | Merge pull request #71 from danny0838/masterAndreas Gohr2012-03-10
|\ \ \ | | | | | | | | Rework for 2 missing commits
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jscachekey: trigger JS_CACHE_USE in lib/exe/js.php added INIT_LANG_LOAD event let js.php use multiple caches
| * | | | added INIT_LANG_LOAD eventDominik Eckelmann2012-01-24
| | | | |
* | | | | Merge branch 'resetpassword'Andreas Gohr2012-03-10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer autogenerate passwords for password reset when $conf['autopasswd'] is disabled. Instead allow to change the password online. * resetpassword: added a timelimit for password reset tokens removed commented line use correct lang string for password mismatch removed outdated language string. it has to be retranslated German translation for password reset honor autopasswd setting for resend password Conflicts: inc/lang/no/lang.php inc/lang/sl/lang.php
| * | | | | added a timelimit for password reset tokensAndreas Gohr2012-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passwords now need to be reset within 3 days of requesting the password change mail
| * | | | | 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
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When autopasswd is disabled, the resend password option now asks for a new password instead of autogenerating a new one and sending it by mail. Note to translators: the wording for btn_resendpwd and resendpwd changed to be more universal. English and German language files where updated - other languages need to be adjusted. Conflicts: inc/lang/en/lang.php
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | when the SKIP_DELETED flag was set, no recent changes where returned for media only queries, becuase file checks where done on page files instead of media files
* | | | simpler/more robust header parsing in HTTPClientAndreas Gohr2012-02-22
| | | | | | | | | | | | | | | | The previous regexp approach failed for empty headers.
* | | | 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 acl
| * | | | use in_array to filter groups instead of preg_grep for aclDominik Eckelmann2011-12-20
| | | | | | | | | | | | | | | | | | | | | | | | | the usage of preg_grep can result in "regular expression is too large" warnings, which leads to errors in auth_aclcheck.
* | | | | Merge pull request #58 from splitbrain/bcryptAndreas Gohr2012-02-01
|\ \ \ \ \ | | | | | | | | | | | | Added bcrypt support for password hashes
| * \ \ \ \ Merge branch 'lmd5' into bcryptAndreas Gohr2011-11-27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/plugins/config/settings/config.metadata.php
| | * | | | | renamed passhash method smd6 to lsmd5Andreas Gohr2011-11-27
| | | | | | |
| | * | | | | MD5 password hash format of the LDAP RFC FS#2378Patrick Michel2011-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the salted MD5 password hash format of the LDAP RFC. The format is quite simple the password, followed by the 8 byte hash in base64 encoding, which results in 32 characters, prepended with the string "{smd5}".
| * | | | | | Merge branch 'master' into bcryptAndreas Gohr2011-11-27
| |\| | | | |
| * | | | | | Added bcrypt support for password hashesAndreas Gohr2011-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method require PHP 5.3+ it will fail otherwise!
* | | | | | | fixed .curid to always highlight the current ID of the main/viewed pageAnika Henke2012-01-31
| | | | | | |
* | | | | | | added missing global statementsAndreas Gohr2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tss..
* | | | | | | DOKU_TPL* considered harmfulAndreas Gohr2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some plugins want to dynamically switch the template based on users, namspaces or the phase of the moon. Having fixed paths in a unchangable constant prevents this. This changes deprecates the DOKU_TPL* constants in favor of two new tpl_* functions that return the correct paths based on the $conf variables which can be changed from the DOKUWIKI_STARTED event.
* | | | | | | made the tpl_getMediaFile() function more flexibleAndreas Gohr2012-01-30
| | | | | | |
* | | | | | | added tpl_getMediaFile() to replace tpl_getFavicon()Anika Henke2012-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function tpl_getFavicon() was doing more than its name was implying. Therefore the new tpl_getMediaFile() was introduced (which is doing nearly exactly the same) and tpl_getFavicon() was deprecated. tpl_favicon() can still be used, though.
* | | | | | | added missing actions to tpl_actiondropdown()Anika Henke2012-01-29
| | | | | | |
* | | | | | | added 5 new language strings for action tools and skip link (needs translations)Anika Henke2012-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for the new default template. This also updates the tpl_actiondropdown() to use most of them.