summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into indexer_rewriteMichael Hamann2011-02-24
|\ | | | | | | | | | | | | Conflicts: inc/fulltext.php inc/indexer.php lib/exe/indexer.php
| * deleted redundant lineAnika Henke2011-02-22
| |
| * improved actionOK and its useAnika Henke2011-02-22
| |
| * Merge remote-tracking branch 'origin/master'Andreas Gohr2011-02-21
| |\ | | | | | | | | | | | | Conflicts: inc/lang/bg/lang.php
| | * removed duplicate authors from language filesAnika Henke2011-02-20
| | |
| | * added 'register' and 'resendpwd' to action links and buttonsAnika Henke2011-02-20
| | | | | | | | | | | | | | | Attention: $lang['register'] has been renamed to $lang['btn_register'], anyone using that in any plugin or template should adjust it.
| * | Bulgarian language updateKiril Velikov2011-02-21
| | |
| * | Dutch language updateMarijn Hofstra2011-02-21
| |/
| * Merge branch 'master' of https://github.com/GromNaN/dokuwiki into GromNaN-masterAndreas Gohr2011-02-19
| |\
| | * Accept empty MySQL password for database auth.Jérôme Tamarelle2011-02-15
| | |
| * | Merge branch 'petsagouris-master'Andreas Gohr2011-02-19
| |\ \
| | * | Passed every png file through http://www.smushit.com/ysmush.it/ saving some ↵Petsagourakis George2011-02-18
| | |/ | | | | | | | | | 1-2kb of binary image data
| * | Chinese Language updateHiphen Lee2011-02-19
| | |
| * | Swedish language updateEdward H2011-02-19
| |/
| * More failsafe XMP parsing in jpeg picturesHakan Sandell2011-02-14
| |
| * Add skype interwikiElan Ruusamäe2011-02-13
| |
| * Add skype interwiki, similar to 023e47d6Elan Ruusamäe2011-02-13
| | | | | | | | | | | | | | Icon downloaded from http://forum.skype.com/style_emoticons/skype/skype.png I asked someone internally for file copyright and answer was ok (do whatever you want)
| * Add LANElan Ruusamäe2011-02-13
| |
| * Merge branch 'master' of https://github.com/lupo49/dokuwiki into lupo49-masterAndreas Gohr2011-02-13
| |\
| | * Support for VoIP/SIP callto-links (FS#2167)lupo492011-02-11
| | |
| * | Merge branch 'master' of https://github.com/petsagouris/dokuwiki into ↵Andreas Gohr2011-02-13
| |\ \ | | | | | | | | | | | | petsagouris-master
| | * | some more fixes on the Greek languagePetsagourakis George2011-02-12
| | | |
| | * | fixed error in popularity/helper.php (a quoted array instruction error'd ...)Petsagourakis George2011-02-12
| | | |
| | * | Greek translation revisitedPetsagourakis George2011-02-12
| | | |
| * | | French language updateGuillaume Turri2011-02-13
| |/ /
| * / avoid warning in linkwizard when a space is entered as queryAndreas Gohr2011-02-11
| |/
| * correctly encode quoted email namesElan Ruusamäe2011-02-11
| |
| * do not (re)render metadata in backlinksAndreas Gohr2011-02-10
| | | | | | | | | | A page could have possibly hundreds of backlinks, when the cache is outdated they should not be rererendered at once
| * Use Base64 encoding for long subjects FS#2169Andreas Gohr2011-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quoted-Printable specifies a maximum line length and some mail tools (Apple mail and Thunderbird) take this quite serious and will fail to decode subjects encoded with quoted-printable when the subject exceeds the length limit. The correct fix would be to wrap the header into multiple lines. But this seems not to be possible with mails() $subject variable. This patch switches to Base64 encoding for long subjects. A general decision if switching completely to Base64 is the best way to go is still open. (see bugreport)
| * Russian language updateWindy Wanderer2011-02-09
| |
| * added some spammers to the blacklistAndreas Gohr2011-02-09
| |
| * Fix test cases so they work with e7f59597d0b90f64f3479ebacc190717e067dc99Michael Hamann2011-02-09
| | | | | | | | All linebreaks before p_close have been removed.
| * Make the regex for internal links more restrictiveMichael Hamann2011-02-09
| | | | | | | | | | This fixes a PCRE backtrack error that occurred on large pages like :users on dokuwiki.org.
| * that smiley was far too happyAndreas Gohr2011-02-08
| |
| * Greek language updateGeorgios Petsagourakis2011-02-07
| |
| * Fix namespace template loading (load $data['tplfile'] instead of $data['tpl'])Michael Hamann2011-02-07
| |
| * added one of the most important smileysAndreas Gohr2011-02-07
| |
| * made config cascade more flexibleRoland Hager2011-02-06
| |
| * Revert "use CRLF in quoted printable encoding FS#1755"Andreas Gohr2011-02-06
| | | | | | | | | | | | | | | | | | | | This research suggests that, the change does not help, but in fact breaks previoulsy working setups: https://bugs.dokuwiki.org/index.php?do=details&task_id=1755#comment3446 I'm still at loss on how to fix this bug. This reverts commit 2ae68f97446ff6bae5fbbe463eb00312598be840.
| * JS: Add style helper and fix footnotes in non-static containersMichael Hamann2011-02-06
| |
| * no final comma in class members or IE craps outAndreas Gohr2011-02-06
| |
| * Merge branch 'danny'Andreas Gohr2011-02-06
| |\
| | * Merge remote branch 'danny0838/rewrite_block' into dannyAndreas Gohr2011-02-06
| | |\
| | | * Major rework of rewrite block in handler.php. (FS#2145)Danny Lin2011-01-26
| | | | | | | | | | | | | | | | | | | | | | | | -Simplify the algorithm. May improve performance. -Treat footnote as pure block and section as pure stack. -Remove post-p-open and pre-p-close linefeeds. Affects the effect of xbr plugin.
| | | * First attempt to improve rewrite blocks; also eliminates post-paragraph ↵Danny Lin2011-01-26
| | | | | | | | | | | | | | | | starting single linebreaks.
| * | | Revert "merged branch 'danny0838:rewrite_block' and resolved conflict"Andreas Gohr2011-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anika's merge did not pul in the individual patches as one would expect. Then I messed up when trying to fix this by merging with danny's repo again but used the wrong branch. So we're still missing two patches. To have them apply cleanly I have to revert Anika's merge here. Another merge for the missing two patches will follow. This reverts commit b17e20ac9cca30b612968d02f06fa9c5df5c01f0.
| * | | Merge branch 'danny'Andreas Gohr2011-02-06
| |\| |
| | * | Merge remote branch 'danny0838/master' into dannyAndreas Gohr2011-02-06
| | |\|
| | | * Fixes an issue of metadata missing on links with empty altname. FS#2144Danny Lin2011-01-26
| | | |
| | | * Like others, there's no need to define $sectionedits as private, and it ↵Danny Lin2011-01-26
| | | | | | | | | | | | | | | | | | | | | | | | prevents plugins that ought to handle headers from working and require a lot of ugly workarounds (such as header2). If there's a concern, "protected" may be another choice.