summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* Merge branch 'master' into futureAndreas Gohr2013-02-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (162 commits) fixed revision JS for images upgraded SimplePie to 1.3.1 FS#2708 removed obsolete browser plugin (migrate does it) adjust spacing to match standard 1.4em grid added comment on use of whitelist vs blacklist Updated idfilter() function for IIS use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found. added 'home' class to first link in hierarchical breadcrumbs reduced required max width to go into tablet mode re-added linear gradients for firefox added missing styling for disabled form elements (FS#2705) fixed acronyms in italics (FS#2684) improved print styles (includes fixes for FS#2645 and FS#2707) basic styles improvements Greek language update Use list in acl help text, for more structure Galician language update touch the config on save, even if no changes were made unwind the width narrowing commit put some whitespace between form submit button and fieldset bottom border ... Conflicts: lib/plugins/config/admin.php lib/plugins/config/settings/config.class.php
| * upgraded SimplePie to 1.3.1 FS#2708Andreas Gohr2013-02-03
| |
| * Merge pull request #165 from Chris--S/FS#2676Christopher Smith2013-02-03
| |\ | | | | | | fix for FS#2676, inserting zero length spaces into long sequences of non...
| | * update pattern to catch more html entitiesChristopher Smith2013-01-26
| | |
| | * fix for FS#2676, inserting zero length spaces into long sequences of ↵Christopher Smith2013-01-26
| | | | | | | | | | | | non-breaking characters in diffs
| * | Merge pull request #168 from Chris--S/FS#2245Andreas Gohr2013-02-03
| |\ \ | | | | | | | | Natural sorting - FS#2245
| | * | search: pass empty $sort to skip sortingPhilipp A. Hartmann2013-01-29
| | | |
| | * | change to use natural order sortingChristopher Smith2013-01-27
| | | |
| | * | ensure parameter is passed down during recursionChristopher Smith2013-01-27
| | | |
| | * | add documentation for sort parameter, change false to 'natural'Christopher Smith2013-01-27
| | | |
| | * | sp.Christopher Smith2013-01-27
| | |/
| * | added comment on use of whitelist vs blacklistAndreas Gohr2013-02-03
| | |
| * | Updated idfilter() function for IISborekb2013-02-03
| | | | | | | | | There is a condition inside idfilter() function that helps Apache on Windows to properly handle colon as a namespace separator by replacing it with semicolon. However, this is not necessary on Microsoft IIS server so the condition was improved.
| * | Merge pull request #171 from thesunrise1983/masterAndreas Gohr2013-02-03
| |\ \ | | | | | | | | Added the title attribute for namespace-links
| | * | Added the title attribute for namespace-linksRené Corinth2013-01-30
| | | |
| * | | added 'home' class to first link in hierarchical breadcrumbsAnika Henke2013-02-03
| | | |
| * | | Greek language updateVasileios Karavasilis2013-02-01
| | | |
| * | | Merge pull request #167 from Klap-in/masterAndreas Gohr2013-02-01
| |\ \ \ | | | | | | | | | | Adds loadHelper to Syntax class and litte code reformat
| | * | | $msg of loadHelper for base plugin class default to true too.Klap-in2013-01-27
| | | | |
| * | | | Galician language updateRodrigo Rega2013-02-01
| | |/ / | |/| |
| * | | open fullscreen media manager in current namespace (FS#2420)Anika Henke2013-01-27
| |/ /
| * | Implement media subscriptions in the new subscription classMichael Hamann2013-01-26
| | |
| * | Add threading headers to change notification mails as proposed in PR #120Michael Hamann2013-01-26
| |/
| * added SHA512 hashing method FS#2663Andreas Gohr2013-01-26
| |
| * allow varying salt length in password hasherAndreas Gohr2013-01-26
| |
| * added mediawiki password method FS#2559Andreas Gohr2013-01-26
| | | | | | | | This should make migrating from MediaWiki a bit easier.
| * Merge pull request #159 from michitux/indexerMichael Hamann2013-01-26
| |\ | | | | | | Indexer: Added page and meta value rename functions
| | * Indexer: abort page rename if deletion of new id failsMichael Hamann2013-01-26
| | |
| | * Indexer: added internal deletePageNoLock methodMichael Hamann2013-01-26
| | | | | | | | | | | | | | | The new deletePageNoLock method is used by renamePage and avoids that the index needs to be unlocked and locked again for deleting the page.
| | * Clarified the behavior of the Doku_Indexer::renamePage methodMichael Hamann2013-01-26
| | |
| | * Indexer: Added page and meta value rename functionsMichael Hamann2013-01-19
| | | | | | | | | | | | | | | | | | With these functions that search index can be updated after page moves or mass metadata updates without the need to reindex the whole page/wiki. These functions will be used by the new pagemove plugin.
| * | Merge branch 'subscription' Pull Request #125Andreas Gohr2013-01-26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * subscription: (25 commits) link directly to subscription management in mails only use mailfromnobody for bulk mails added missing context for list mails readded mailfromnobody to subscription sending correctly escape diffs in HTML mails fixed lists in HTML mails simplified subscription->add() code a bit comment adjusted removed unused vars removed data parameter in subscription_handle_post() fixed tests some reformatting added compatibility function moved registration notification to subscription class fixed merge error in inc/auth.php consolidate more notification code in subscription class minor cleanup initialize new subscriptions with current time fixed subscription management correctly check if subscriptions are enabled ...
| | * | link directly to subscription management in mailsAndreas Gohr2013-01-26
| | | | | | | | | | | | | | | | | | | | This was updated in the english translation a while ago, but was still missing in some translations
| | * | only use mailfromnobody for bulk mailsAndreas Gohr2013-01-25
| | | |
| | * | added missing context for list mailsAndreas Gohr2013-01-25
| | | |
| | * | readded mailfromnobody to subscription sendingAndreas Gohr2013-01-18
| | | | | | | | | | | | | | | | | | | | this was lost because the subscription branch, branched before this change in master
| | * | correctly escape diffs in HTML mailsAndreas Gohr2013-01-18
| | | |
| | * | fixed lists in HTML mailsAndreas Gohr2013-01-18
| | | |
| | * | simplified subscription->add() code a bitAndreas Gohr2013-01-18
| | | |
| | * | comment adjustedAndreas Gohr2013-01-18
| | | |
| | * | removed unused varsAndreas Gohr2013-01-18
| | | |
| | * | removed data parameter in subscription_handle_post()Andreas Gohr2013-01-18
| | | | | | | | | | | | | | | | | | | | now the data parameter, which really is a timestamp is only handled internally of the subscription class
| | * | some reformattingAndreas Gohr2012-12-07
| | | |
| | * | added compatibility functionAndreas Gohr2012-12-07
| | | |
| | * | moved registration notification to subscription classAndreas Gohr2012-11-30
| | | |
| | * | fixed merge error in inc/auth.phpAndreas Gohr2012-11-30
| | | | | | | | | | | | | | | | merged the wrong change here
| | * | Merge branch 'master' into subscriptionAndreas Gohr2012-11-30
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (175 commits) some coding style improvements added .idea project folder to gitignore use correct setUp method and parent calls. Correct German plugin manager translation (download != install) correct return in sendDigest() Fix case-insensitive match in ACL checking GeSHi update to 1.0.8.11 ignore empty header on mail sending remove empty BCC/CC mail headers Galician language update some welcome page changes Combine subsequent calls to strtr into a single transformation changed semicolon to colon in link to welcome page to make it less confusing fixed wrong sidebar showing in namespaces when sidebar is disabled Typo fix for TL;DR removed a bunch of outdated and irrelevant networking acronyms added another place to look for logo to make it more consistent (FS#2656) French language update Czech language update compat js findPosX/y more closely mimic historical function ... Conflicts: inc/auth.php inc/common.php inc/subscription.php lib/exe/indexer.php
| | * | | consolidate more notification code in subscription classAndreas Gohr2012-09-21
| | | | | | | | | | | | | | | | | | | | This is untested and probably broken currently
| | * | | minor cleanupAndreas Gohr2012-08-12
| | | | |
| | * | | initialize new subscriptions with current timeAndreas Gohr2012-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to create a bunch of mails whenever a namespace is subscribed. Only changes *after* the subscription should be considered. This patch adds the timestamp to "every" style subscriptions as well, though this data is ignored.