summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* improved tpl_license() (removed unnecessary class, fixed space issues)Anika Henke2012-03-10
|
* made tpl_license a bit more flexibleAndreas Gohr2012-03-10
| | | | This way there's less custom code for the footer buttons needed
* 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.
* | | | Romanian language updateEmanuel-Emeric Andrași2012-01-25
| | | |
* | | | removed 'view original' button from new media manager again (was added in ↵Anika Henke2012-01-22
| | | | | | | | | | | | | | | | b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned
* | | | corrected old mediaupload introduction textAnika Henke2012-01-19
| | | |
* | | | Disable E_STRICT error reportingMichael Hamann2012-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change disables the reporting of strict standard errors in PHP 5.4, in PHP versions prior to 5.4 E_STRICT wasn't part of E_ALL so for these versions this doesn't cause any change (however E_STRICT is available in all versions of PHP 5 so this doesn't cause any problems). See also FS#2427.
* | | | Make Sitemapper functions static as they were used as static functionsMichael Hamann2012-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All calls to the Sitemapper were static function calls, this caused notices because they weren't static, with this commit they are marked as static. Furthermore two FIXME comments were removed as dbglog now checks if debugging is enabled.
* | | | Merge pull request #75 from lupo49/masterAndreas Gohr2012-01-13
|\ \ \ \ | | | | | | | | | | localization: removed strings from old flashuploader
| * | | | localization: removed strings from old flashuploaderlupo492012-01-13
| | | | |
* | | | | Slovak language updateMartin Michalek2012-01-13
|/ / / /
* | | | Polish language updateBegina Felicysym2012-01-13
| | | |
* | | | readded missing "view original" button to the new media managerAndreas Gohr2012-01-13
| | | | | | | | | | | | | | | | Template authors need to update their _mediamanager.css
* | | | always show full filename as tooltip in mediamanagerAndreas Gohr2012-01-13
| | | |
* | | | Fix sorting in media manager search (FS#2423)Adrian Lang2012-01-13
| | | |
* | | | do not rely on tmpfile() in the AJAX uploader backend FS#2417Andreas Gohr2012-01-09
| | | |
* | | | Galician language updateOscar M. Lage2012-01-09
| | | |
* | | | Spanish language updateOscar M. Lage2012-01-08
| | | |
* | | | make sure that sidebar TOCs won't interfere with page TOCsAndreas Gohr2012-01-07
| | | | | | | | | | | | | | | | | | | | This could happen if a sidebar is rendered before the page (populating $TOC) and the page itself had no own TOC (no headers).
* | | | French language updateskimpax2011-12-22
| | | |
* | | | Japanese language updateKazutaka Miyasaka2011-12-22
| |_|/ |/| |
* | | Revert 4a24b459, thus fixing FETCH_MEDIA_STATUS for missing files (FS#2405)Adrian Lang2011-12-20
| | |
* | | Fix double URL-encoding in media manager (FS#2403)Adrian Lang2011-12-18
| | |
* | | Malay language updateJian Wei Tay2011-12-15
| | |
* | | Polish language updateBegina Felicysym2011-12-14
| | |
* | | Avoid a warning when a media cachefile doesn't exist yetAndreas Gohr2011-12-13
| | |
* | | Dutch language updateRicardo Guijt2011-12-08
| | |
* | | Norwegian language updateEgil Hansen2011-12-06
| | |
* | | fixed link in popup media manager to fullscreen media manager to open in ↵Anika Henke2011-12-04
| | | | | | | | | | | | correct namespace (FS#2401)
* | | Merge pull request #66 from dploeger/28db35ad3dd974cc2f627d25f7bcc16e9fd0ceacAndreas Gohr2011-11-28
|\ \ \ | | | | | | | | This fix is alright. The action gets escaped by DokuForm's use of buildAttributes()
| * | | Fixes SYMPTOMS of FS #2393dploeger2011-11-28
| | | |
* | | | deprecated 3rd parameter of cleanID() FS#2377Andreas Gohr2011-11-28
|/ / / | | | | | | | | | | | | | | | | | | For some reason trailing/leading underscores were allowed when uploading files. But the rest of the code (eg. listing or downloading files) never supported this. This patch removes this special case for uploading files to streamline ID cleaning of pages and media files.
* | | suppress errors on stream_select FS#2276Andreas Gohr2011-11-27
| | | | | | | | | | | | | | | On certain environments, stream_select might produce temporary errors when file descriptors are running scarce.