summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* fixed a JSON bug with handling backspacesAndreas Gohr2012-05-03
| | | | This was fixed in upstream and the upstream tests caught this :-)
* also skip native JSON encoding when skipnative is trueAndreas Gohr2012-05-03
|
* removed duplicated documentation header in JSON.phpAndreas Gohr2012-05-02
|
* Merge pull request #96 from dom-mel/phpunitAndreas Gohr2012-05-01
|\ | | | | Replace SimpleTest with PHPUnit
| * avoid integer overflow in PassHash::pmd5 methodAndreas Gohr2012-05-01
| | | | | | | | | | | | Input iteration counts are squared in the function and passing something above 30 is giving integer overflows on 32 bit systems (and causes insane iteration counts on 64bit systems).
| * make HTTPClient loadable via autoloaderAndreas Gohr2012-04-26
| | | | | | | | | | this fixes the HTTP tests which do test the base class directly instead of the DokuHTTPClient subclass
| * Merge branch 'master' into phpunitAndreas Gohr2012-04-23
| |\ | | | | | | | | | | | | * master: added option to disable reverse DNS lookups
| * \ Merge branch 'master' into phpunitAndreas Gohr2012-04-20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (29 commits) some edge case checking in search result highlighting Resolve empty page ID to configured start page Added more detail error code for unauthorized calls in xmlrpc interface. changed internal Mailer members from private to protected made it possible to disable HTML mails in the config removed commented code left from the quoted_printable days add missing table tags for HTML diff mails fixed subscriber mail signatures use real HRs in HTML mails Add various headers to the mails FS#2247. pull request #83 closed removed footer image from HTML mails use inlinestyles for diffs in HTML mails fixed signature stripping fixed mailprefix handling fixed missing replacement for HTML notify mails allow image embeds in HTML mail templates Added HTML wrapper for mails allow non-txt extensions when accessing locales added Mailer class to autoloader Replaced mail_send calls with new Mailer class ...
| * \ \ Merge branch 'master' into phpunitTobias Sarnowski2012-04-20
| |\ \ \
| * | | | have a default plugin configAndreas Gohr2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | This allows us to distribute plugins that are disabled by default. We'll may want to do that for a special unit test plugin
| * | | | no need to pass objects by referenceAndreas Gohr2012-04-17
| | | | | | | | | | | | | | | | | | | | fixes passing null to event hook registration
| * | | | Romanian language updateEmanuel-Emeric Andraşi2012-04-16
| | | | |
| * | | | Marathi language updatePadmanabh Kulkarni2012-04-16
| | | | |
| * | | | Remote search is aware of useheading optionTim Roes2012-04-16
| | | | |
| * | | | Added page title to search results in Remote APITim Roes2012-04-16
| | | | |
| * | | | Arabic Language UpdateUsama Akkad2012-04-16
| | | | |
* | | | | Esperanto language updateRobert Bogenschneider2012-04-27
| | | | |
* | | | | Japanese language updateOsaka2012-04-27
| | | | |
* | | | | French language updateYannick Aure2012-04-27
| | | | |
* | | | | display uploadable file size in media manager FS#2425Andreas Gohr2012-04-23
| |_|_|/ |/| | |
* | | | added option to disable reverse DNS lookupsAndreas Gohr2012-04-23
| |_|/ |/| |
* | | some edge case checking in search result highlightingAndreas Gohr2012-04-20
| | |
* | | Merge pull request #97 from timroes/masterAndreas Gohr2012-04-20
|\ \ \ | | | | | | | | Remote interface improvements
| * | | Resolve empty page ID to configured start pageTim Roes2012-04-19
| | |/ | |/|
* | | Merge branch 'htmlmail'Andreas Gohr2012-04-20
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * htmlmail: (26 commits) changed internal Mailer members from private to protected made it possible to disable HTML mails in the config removed commented code left from the quoted_printable days add missing table tags for HTML diff mails fixed subscriber mail signatures use real HRs in HTML mails Add various headers to the mails FS#2247. pull request #83 closed removed footer image from HTML mails use inlinestyles for diffs in HTML mails fixed signature stripping fixed mailprefix handling fixed missing replacement for HTML notify mails allow image embeds in HTML mail templates Added HTML wrapper for mails allow non-txt extensions when accessing locales added Mailer class to autoloader Replaced mail_send calls with new Mailer class Make use of new Mailer class in notify() Copy all text replacements to HTML replacements in Mailer Added setBody() to Mailer class ...
| * | Merge branch 'master' into htmlmailAndreas Gohr2012-04-15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (382 commits) Romanian language update Marathi language update Arabic Language Update when there's not enough space for images, make sure they stay proportional (might be FS#2480) added minimal RTL print styles (part of FS#2185) moved plugins' rtl.css to their style.css counterpart (part of FS#2185) removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary removed comments from accidentally commented lines in tpl_includeFile() removed obsolete template file added tpl_includeFile() to core Make getTitle method in remote interface public Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors. BG: language update Korean language update fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447) deleted very old (and unused) images added accidentally removed '<?php' back in (was in 57fc5edd) wrapped X-UA-Compatible meta tag with conditional comments added explanation to todo in _forms.css removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950) ... Conflicts: inc/auth.php inc/load.php
| * | | changed internal Mailer members from private to protectedAndreas Gohr2012-04-15
| | | |
| * | | made it possible to disable HTML mails in the configAndreas Gohr2012-04-15
| | | |
| * | | removed commented code left from the quoted_printable daysAndreas Gohr2012-03-23
| | | |
| * | | add missing table tags for HTML diff mailsAndreas Gohr2012-03-14
| | | |
| * | | fixed subscriber mail signaturesAndreas Gohr2012-03-09
| | | |
| * | | use real HRs in HTML mailsAndreas Gohr2012-03-09
| | | |
| * | | Add various headers to the mails FS#2247. pull request #83 closedAndreas Gohr2012-03-09
| | | |
| * | | removed footer image from HTML mailsAndreas Gohr2012-03-09
| | | |
| * | | use inlinestyles for diffs in HTML mailsAndreas Gohr2012-03-09
| | | |
| * | | fixed signature strippingAndreas Gohr2012-03-09
| | | |
| * | | fixed mailprefix handlingAndreas Gohr2012-03-09
| | | |
| * | | fixed missing replacement for HTML notify mailsAndreas Gohr2012-03-04
| | | |
| * | | allow image embeds in HTML mail templatesAndreas Gohr2011-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the place holder @MEDIA(<mediaid>)@ you now can directly embed images from the media repository into your HTML mail template. An example was added to the mailwrap.html, but because images are embedded as is (no prescaling) this is suboptimal. If we keep it, a smaller version of the DokuWiki logo should be shipped with DokuWiki.
| * | | Added HTML wrapper for mailsAndreas Gohr2011-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mailwrap.html adds the standard headers and footers to all HTML mails. The signature present in the text body will be removed before inserting in the wrapper, allowing a nicer footer for HTML. Users can overwrite the file with their own to create HTML mails in corporate design. However, a way to automatically embed referenced images is missing currently.
| * | | allow non-txt extensions when accessing localesAndreas Gohr2011-11-13
| | | |
| * | | added Mailer class to autoloaderAndreas Gohr2011-11-12
| | | |
| * | | Replaced mail_send calls with new Mailer classAndreas Gohr2011-11-12
| | | |
| * | | Make use of new Mailer class in notify()Andreas Gohr2011-11-12
| | | | | | | | | | | | | | | | It now uses inline diff format for diff HTML mails
| * | | Copy all text replacements to HTML replacements in MailerAndreas Gohr2011-11-12
| | | | | | | | | | | | | | | | | | | | With this change it's easy to just set the replacements for HTML that need special attention.
| * | | Added setBody() to Mailer classAndreas Gohr2011-11-12
| | | | | | | | | | | | | | | | | | | | | | | | This method makes it easy to send a HTML mail based on the default text mails. This is probably enough for simpler mails where no sophisticated HTML is needed except a bit of formatting and linked URLs.
| * | | shorten title when used as prefixAndreas Gohr2011-11-12
| | | |
| * | | mail prefix defaults to title when emptyAndreas Gohr2011-11-12
| | | |
| * | | added old plugin hook back into Mailer classAndreas Gohr2011-11-12
| | | | | | | | | | | | | | | | | | | | | | | | it now passes the whole Mail object and also signals if the mail sending was successful to the AFTER event. A bunch of references should make it compatible with old plugins.
| * | | clean headers in a separate stepAndreas Gohr2011-11-12
| | | | | | | | | | | | | | | | | | | | this should make it easier to reintroduce a plugin hook compatible with the old one