summaryrefslogtreecommitdiff
path: root/lib
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
| * Merge pull request #163 from splitbrain/jquery1.9Andreas Gohr2013-02-03
| |\ | | | | | | Update to JQuery 1.9
| | * fixed revision JS for imagesAndreas Gohr2013-02-03
| | |
| | * removed obsolete browser plugin (migrate does it)Andreas Gohr2013-02-03
| | |
| | * added minified version of jquery-migrateAndreas Gohr2013-01-26
| | |
| | * added jquery-migrate as a copatibility layerAndreas Gohr2013-01-26
| | | | | | | | | | | | | | | this will be removed soon again. plugins using jQuery should make sure they are compatible to jQuery 1.9
| | * fixed closing of link wizardAndreas Gohr2013-01-26
| | |
| | * fixed permission messupAndreas Gohr2013-01-26
| | |
| | * Merge branch 'master' of git://github.com/gronke/dokuwiki into pull-request-158Andreas Gohr2013-01-26
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/gronke/dokuwiki: update.js applied update.sh must overwrite stylesheet jQuery update.sh jQuery latest
| | | * update.js appliedStefan Grönke2013-01-20
| | | |
| | | * update.sh must overwrite stylesheetStefan Grönke2013-01-19
| | | |
| | | * jQuery update.shStefan Grönke2013-01-19
| | | | | | | | | | | | | | | | * OSX compatible
| | | * jQuery latestStefan Grönke2013-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * jQuery 1.9.0 * jQuery-UI v1.9.2 * jQuery.fn.live > jQuery.fn.on * jQuery.fn.browser replacement (jquery.mb.browser.js)
| * | | Merge pull request #172 from splitbrain/newtpl_formsadjustmentsAndreas Gohr2013-02-03
| |\ \ \ | | | | | | | | | | Some tidying up of the "auth" forms in the 'dokuwiki' template
| | * | | adjust spacing to match standard 1.4em gridChristopher Smith2013-02-03
| | | | |
| | * | | unwind the width narrowing commitChristopher Smith2013-01-30
| | | | |
| | * | | put some whitespace between form submit button and fieldset bottom borderChristopher Smith2013-01-30
| | | | |
| | * | | reduce the content region width on auth forms (profile, login, register & ↵Christopher Smith2013-01-30
| | | | | | | | | | | | | | | | | | | | resend password) to match the fieldset
| | * | | line up remember me checkbox with the text input fieldsChristopher Smith2013-01-30
| | | | |
| * | | | Merge pull request #170 from splitbrain/dont_hide_searchsuggestionsAndreas Gohr2013-02-03
| |\ \ \ \ | | | | | | | | | | | | Don't hide search suggestion during typing & limit suggestions.
| | * | | | use var and remove suggestions when neededKlap-in2013-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
| | * | | | Add a break to ajax_qsearch()Klap-in2013-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the search input is still only a few characters, the number of matching pages is big. Browsers have heavy work to progress this whole return, better cut off so only the part that is directly displayed will be sent.
| | * | | | Keep search suggestions, during typing in search fieldKlap-in2013-01-29
| | |/ / /
| * | | | Merge pull request #175 from splitbrain/touchconfigAndreas Gohr2013-02-03
| |\ \ \ \ | | | | | | | | | | | | touch the config on save, even if no changes were made
| | * | | | touch the config on save, even if no changes were madeAndreas Gohr2013-01-31
| | | | | |
| * | | | | reduced required max width to go into tablet modeAnika Henke2013-02-03
| | | | | |
| * | | | | re-added linear gradients for firefoxAnika Henke2013-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed them because of FS#2447 a while ago. But as the original problem was most probably only caused by the gradient for the page background and that's using a PNG now, the gradients for the buttons should be fine. Please test to double check if this change causes performance problems in Firefox.
| * | | | | added missing styling for disabled form elements (FS#2705)Anika Henke2013-02-03
| | | | | |
| * | | | | fixed acronyms in italics (FS#2684)Anika Henke2013-02-03
| | | | | |
| * | | | | improved print styles (includes fixes for FS#2645 and FS#2707)Anika Henke2013-02-03
| | | | | |
| * | | | | basic styles improvementsAnika Henke2013-02-03
| | | | | |
| * | | | | Merge pull request #176 from splitbrain/aclhelptextstructuringAndreas Gohr2013-02-01
| |\ \ \ \ \ | | | | | | | | | | | | | | Use list in acl help text, for more structure
| | * | | | | Use list in acl help text, for more structureKlap-in2013-02-01
| | | | | | |
| * | | | | | 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
| | * | | | | set $msg argument of loadHelper() default to true.Klap-in2013-01-27
| | | | | | |
| | * | | | | Merge remote-tracking branch 'upstream/master'Klap-in2013-01-26
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Reformat last bottom end of the syntax plugin fileKlap-in2013-01-26
| | | | | | |
| | * | | | | Added loadHelper() to DokuWiki_Syntax_Plugin.Klap-in2013-01-26
| | | | | | |
| * | | | | | Galician language updateRodrigo Rega2013-02-01
| | |/ / / / | |/| | | |
| * | | | | fixed issue with pagetools over tabsAnika Henke2013-01-26
| | | | | |
| * | | | | added SHA512 hashing method FS#2663Andreas Gohr2013-01-26
| | | | | |
| * | | | | added mediawiki password method FS#2559Andreas Gohr2013-01-26
| | |_|/ / | |/| | | | | | | | | | | | | This should make migrating from MediaWiki a bit easier.
| * | | | 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 ...
| | * \ \ \ 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
| | * | | | | correctly check if subscriptions are enabledAndreas Gohr2012-08-12
| | | | | | |
| | * | | | | more subscription refactoring BROKENAndreas Gohr2012-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now the actual sending of bulk messages (digest, list) is reimplemented and partially tested. Still not complete
| * | | | | | fixed files being unselectable after upload (FS#2591)Anika Henke2013-01-24
| | |_|_|/ / | |/| | | |
| * | | | | Revert "handle bzip1 as well"Andreas Gohr2013-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2cb3ec76dec3fe2b40f25765ef842223c7132fe. Turns out I was too fast merging this. I can't get PHP's bzip handler to handle a bzip1 compressed file.
| * | | | | handle bzip1 as wellElan Ruusamäe2013-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in fact .tbz is tar.bz (bzip1) and .tbz2 is what tar.bz2 is used commonly.