summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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 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
| * | fixed testsAndreas Gohr2013-01-18
| | |
| * | 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.
| * | | fixed subscription managementAndreas Gohr2012-08-12
| | | | | | | | | | | | | | | | now adding and removing subscriptions works again
| * | | correctly check if subscriptions are enabledAndreas Gohr2012-08-12
| | | |
| * | | subscription system should work now againAndreas Gohr2012-08-12
| | | | | | | | | | | | | | | | | | | | This readds the last part of the subscription system: the normal "every" subscriptions.
| * | | added list testAndreas 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
| * | | handle empty changelog in getRecentsSince()Andreas Gohr2012-08-12
| | | |
| * | | first start at refactoring the subscription system BROKENAndreas Gohr2012-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a class for nicer wrapping and easier testing. Some functions were changed to provide nicer APIs (no throwing around of unescaped regexps) and to simplify things (hopefully). The refactoring isn't completed yet, so this will break the subscription system. The goal is to move as much subscription related stuff to this class as possible. Currently there is some code in lib/exe/indexer.php and maybe elsewhere (common.php?). Additionally everything should be covered by tests. A few tests are included here already.
* | | | updated year in copyrightAndreas Gohr2013-01-25
| | | |
* | | | fixed files being unselectable after upload (FS#2591)Anika Henke2013-01-24
| | | |
* | | | fix custom editor loadingAndreas Gohr2013-01-24
| | | | | | | | | | | | | | | | | | | | | | | | Custom editors can also be loaded when not a section is given. For example this happens on a preview click where the page is already separated into pre, suf and text.
* | | | fixed test caseAndreas Gohr2013-01-23
| | | |
* | | | 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.
* | | | Merge pull request #162 from glensc/bz-bz2Andreas Gohr2013-01-23
|\ \ \ \ | | | | | | | | | | handle bz (bzip not bzip2) better
| * | | | handle bzip1 as wellElan Ruusamäe2013-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | in fact .tbz is tar.bz (bzip1) and .tbz2 is what tar.bz2 is used commonly.
* | | | | Merge pull request #161 from glensc/tarlibAndreas Gohr2013-01-23
|\ \ \ \ \ | |/ / / / |/| | | | fixes from bee9f377bc547c99fe99b4e38199cb92cf668554 commit notes
| * | | | fixes from bee9f377bc547c99fe99b4e38199cb92cf668554 commit notesElan Ruusamäe2013-01-23
|/ / / /
* | | | Merge pull request #160 from gturri/addedUTestsAndreas Gohr2013-01-23
|\ \ \ \ | | | | | | | | | | Added unit tests
| * \ \ \ Merge remote-tracking branch 'origin/master' into addedUTestsGuillaume Turri2013-01-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Hurray, tests pass!
| * | | | | Added test for search_allpagesGuillaume Turri2013-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently both the 2nd and the third assertions fail (the first one is just for upcoming non-regression)
* | | | | | fixed sample handling in toolbar FS#2691Kazutaka Miyasaka2013-01-22
| | | | | |
* | | | | | Merge pull request #157 from gturri/permsMichael Hamann2013-01-21
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | wiki.getAttachments returns 'perms' according to documentation
| * | | | | Increment DOKU_API_VERSIONGuillaume Turri2013-01-21
| | | | | | | | | | | | | | | | | | Because wiki.getAttachments now returns 'perms' instead of 'perm'
| * | | | | wiki.getAttachments returns 'perms' according to documentationGuillaume Turri2013-01-19
| | |_|_|/ | |/| | |
* | | | | Merge pull request #154 from gturri/searchDepthAndreas Gohr2013-01-20
|\ \ \ \ \ | | | | | | | | | | | | Check search limit depth with an inequality
| * | | | | If depth option is set to 0, we should recurse foreverGuillaume Turri2013-01-10
| | | | | | | | | | | | | | | | | | | | | | | | At least if we want to be consistent with search_universal
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 17:01:26 +0000