summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #607 from splitbrain/osx_io_rmdir_testAndreas Gohr2014-03-24
|\ | | | | fix io_rmdir_test::test_nopes() for symlinks in paths
| * fix io_rmdir_test::test_nopes() for symlinks in pathsChristopher Smith2014-03-12
| |
* | Merge pull request #613 from splitbrain/detail_charset_fixAndreas Gohr2014-03-24
|\ \ | | | | | | Add encoding fix to tpl_img_getTag()
| * | Add encoding fix to tpl_img_getTag()Christopher Smith2014-03-13
| |/ | | | | | | | | | | Run jpeg meta tags through cleanText for a conversion to UTF-8 from latin-1 if possible. MediaManager already uses this conversion. Addresses a side issue of FS#1988
* | Merge pull request #614 from splitbrain/renderer_graceful_fallback_bugfixAndreas Gohr2014-03-24
|\ \ | | | | | | Fix a couple of issues with PR#571
| * | remove test expectation for E_USER_WARNINGChristopher Smith2014-03-13
| | |
| * | Fix a couple of issues with PR#571Christopher Smith2014-03-13
| |/ | | | | | | | | | | | | | | 1. renderer validity checks were too stringent for plugins, format should only need to be checked when mode is 'xhtml' 2. E_USER_WARNING message should now be obsolete, its previous use was to generate a warning when 'xhtml' rendering failed. PR#571 insures 'xhtml' rendering always succeeds.
* | Merge pull request #612 from splitbrain/improve_double_quote_matchingAndreas Gohr2014-03-24
|\ \ | | | | | | improvements to double quote matching
| * | improvements to double quote matchingChristopher Smith2014-03-13
| |/
* | Merge pull request #629 from bubblun/masterDominik Eckelmann2014-03-21
|\ \ | | | | | | Fixed spelling in lang.php
| * | Fixed spelling in lang.phpMarcel Bischoff2014-03-21
|/ / | | | | | | | | Changed "Erweitertet" to "Erweitert" since the word "Erweitertet" does not exist, see: http://www.duden.de/suchen/dudenonline?s=erweitertet Also, see leo.org translation for "advanced" to german: http://dict.leo.org/ende/index_de.html#/search=advanced&searchLoc=0&resultOrder=basic&multiwordShowSingle=on
* | Merge pull request #622 from splitbrain/disablefeedAndreas Gohr2014-03-19
|\ \ | | | | | | allow disabling the rss feed
| * | add visibility and PHPDocs to config plugin classGerrit Uitslag2014-03-19
| | |
| * | add 404 status header to feed disabledGerrit Uitslag2014-03-18
| | |
| * | added config stuff for disabling RSSAndreas Gohr2014-03-18
| | |
| * | allow disabling the rss feedGerrit Uitslag2014-03-18
| | |
* | | fixed media icons in recent changes. closes #625Andreas Gohr2014-03-19
| | |
* | | Merge pull request #616 from splitbrain/stripsourcemapsChristopher Smith2014-03-18
|\ \ \ | | | | | | | | strip sourcemaps in CSS and JS #601
| * | | strip sourcemaps in CSS and JS #601Andreas Gohr2014-03-15
| | | | | | | | | | | | | | | | | | | | | | | | source maps are invalid for our dispatched sources and may even cause problems. this makes sure any sourcemap declarations are stripped from the output
* | | | Merge pull request #586 from splitbrain/jqueryupdateChristopher Smith2014-03-18
|\ \ \ \ | | | | | | | | | | JQuery Update
| * | | | fixed online comment strippingAndreas Gohr2014-03-05
| | | | |
| * | | | strip sourcemaps after updateAndreas Gohr2014-03-05
| | | | |
| * | | | updated jquery-migrate to v1.2.1Andreas Gohr2014-03-05
| | | | |
| * | | | fix single line comments in CSS compressionAndreas Gohr2014-03-05
| | | | | | | | | | | | | | | | | | | | double slashes in url() always have to be ignored
| * | | | added (failing) test case for broken jquery ui compressionAndreas Gohr2014-03-05
| | | | |
| * | | | updates jquery and jquery uiAndreas Gohr2014-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we now pull jQuery directly from jquery's CDN instead of google because google serves slightly outdated versions under the /1/ branch The updated smoothness theme currently breaks compression. Haven't figured out why, yet.
* | | | | Merge pull request #623 from dokuwiki-translate/lang_update_154Andreas Gohr2014-03-18
|\ \ \ \ \ | |_|_|/ / |/| | | | Translation update (no)
| * | | | translation updateChristopher Schive2014-03-18
|/ / / /
* | | | notloggedin removed from nl as well + fix of AD domain string.Gerrit Uitslag2014-03-17
| | | |
* | | | Merge pull request #621 from dokuwiki-translate/lang_update_144Gerrit Uitslag2014-03-17
|\ \ \ \ | | | | | | | | | | Translation update (nl)
| * | | | translation updateRene2014-03-17
| | | | |
* | | | | notloggedin lang string leftGerrit Uitslag2014-03-17
|/ / / /
* | | | Merge pull request #620 from dokuwiki-translate/lang_update_141Andreas Gohr2014-03-17
|\ \ \ \ | | | | | | | | | | Translation update (ru)
| * | | | translation updateAleksandr Selivanov2014-03-17
|/ / / /
* | | | Merge pull request #619 from dokuwiki-translate/lang_update_139Andreas Gohr2014-03-17
|\ \ \ \ | | | | | | | | | | Translation update (de)
| * | | | translation updateSimon2014-03-17
|/ / / /
* | | | Merge pull request #527 from splitbrain/userlinkGerrit Uitslag2014-03-16
|\ \ \ \ | | | | | | | | | | Linked and formatted user names
| * | | | use more consistent namesGerrit Uitslag2014-03-16
| | | | |
| * | | | Rename userinfo() to userlink()Gerrit Uitslag2014-03-16
| | | | |
| * | | | Merge remote-tracking branch 'origin/userlink' into userlinkGerrit Uitslag2014-03-16
| |\ \ \ \
| | * | | | override user link icon in headerAndreas Gohr2014-03-15
| | | | | |
| * | | | | improve phpdocs editorinfo()Gerrit Uitslag2014-03-16
| |/ / / /
| * | | | enable editorinfo and userinfo to return plain text namesGerrit Uitslag2014-03-14
| | | | |
| * | | | declare more clear, before used as refGerrit Uitslag2014-03-11
| | | | |
| * | | | update usage in userlinkGerrit Uitslag2014-03-10
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into userlinkGerrit Uitslag2014-03-10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/renderer.php inc/template.php
| * | | | | added user.png for interwiki linksGerrit Uitslag2014-03-10
| | | | | |
| * | | | | update unittest with interwiki.conf change as wellGerrit Uitslag2014-02-17
| | | | | |
| * | | | | change default userspace to :user:<username> and add interwiki classGerrit Uitslag2014-02-17
| | | | | |
| * | | | | generalised link colour in header, making interwiki links blue as well (to ↵Anika Henke2014-02-16
| | | | | | | | | | | | | | | | | | | | | | | | fit design)