Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into stable | Guy Brand | 2014-05-05 |
|\ | |||
| * | no fancy quotes in user manager import description | Gerrit Uitslag | 2014-05-05 |
| | | |||
| * | update deprecation stuff for dw_qearch | Gerrit Uitslag | 2014-05-05 |
| | | |||
| * | translation update | Myeongjin | 2014-04-27 |
| | | |||
| * | Merge pull request #661 from dokuwiki-translate/lang_update_243 | Anika Henke | 2014-04-26 |
| |\ | | | | | | | Translation update (ko) | ||
| | * | translation update | Myeongjin | 2014-04-22 |
| | | | |||
| * | | translation update | Владимир | 2014-04-25 |
| |/ | |||
| * | translation update | Antonio Bueno | 2014-04-16 |
| | | |||
| * | Merge pull request #655 from dokuwiki-translate/lang_update_230 | Anika Henke | 2014-04-16 |
| |\ | | | | | | | Translation update (zh) | ||
| | * | translation update | qinghao | 2014-04-12 |
| | | | |||
| * | | translation update | Eloy | 2014-04-11 |
| |/ | |||
| * | translation update | Robert Bogenschneider | 2014-04-10 |
| | | |||
| * | fix include_once for JavaScript | Andreas Gohr | 2014-04-09 |
| | | | | | | | | the second include was never removed, causing an endless loop. | ||
| * | Merge branch 'master' of github.com:splitbrain/dokuwiki | Anika Henke | 2014-04-06 |
| |\ | |||
| | * | Bulgarian language update | NEOhidra | 2014-04-06 |
| | | | |||
| * | | oops, removed unintentionally added CSS files | Anika Henke | 2014-04-06 |
| |/ | |||
| * | translation update | Jernej Vidmar | 2014-04-05 |
| | | |||
| * | Merge pull request #641 from dokuwiki-translate/lang_update_212 | Andreas Gohr | 2014-04-03 |
| |\ | | | | | | | Translation update (ko) | ||
| | * | translation update | Young gon Cha | 2014-04-03 |
| | | | |||
| * | | fixed unclosed tags in some language translations | Clomode | 2014-04-03 |
| |/ | |||
| * | translation update | ggallon | 2014-03-24 |
| | | |||
| * | Fixed spelling in lang.php | Marcel Bischoff | 2014-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/disablefeed | Andreas Gohr | 2014-03-19 |
| |\ | | | | | | | allow disabling the rss feed | ||
| | * | add visibility and PHPDocs to config plugin class | Gerrit Uitslag | 2014-03-19 |
| | | | |||
| | * | added config stuff for disabling RSS | Andreas Gohr | 2014-03-18 |
| | | | |||
| * | | Merge pull request #616 from splitbrain/stripsourcemaps | Christopher Smith | 2014-03-18 |
| |\ \ | | | | | | | | | strip sourcemaps in CSS and JS #601 | ||
| | * | | strip sourcemaps in CSS and JS #601 | Andreas Gohr | 2014-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/jqueryupdate | Christopher Smith | 2014-03-18 |
| |\ \ \ | | | | | | | | | | | JQuery Update | ||
| | * | | | fixed online comment stripping | Andreas Gohr | 2014-03-05 |
| | | | | | |||
| | * | | | strip sourcemaps after update | Andreas Gohr | 2014-03-05 |
| | | | | | |||
| | * | | | updated jquery-migrate to v1.2.1 | Andreas Gohr | 2014-03-05 |
| | | | | | |||
| | * | | | fix single line comments in CSS compression | Andreas Gohr | 2014-03-05 |
| | | | | | | | | | | | | | | | | | | | | double slashes in url() always have to be ignored | ||
| | * | | | updates jquery and jquery ui | Andreas Gohr | 2014-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. | ||
| * | | | | translation update | Christopher Schive | 2014-03-18 |
| | |_|/ | |/| | | |||
| * | | | notloggedin removed from nl as well + fix of AD domain string. | Gerrit Uitslag | 2014-03-17 |
| | | | | |||
| * | | | translation update | Rene | 2014-03-17 |
| | | | | |||
| * | | | translation update | Aleksandr Selivanov | 2014-03-17 |
| | | | | |||
| * | | | translation update | Simon | 2014-03-17 |
| | | | | |||
| * | | | Merge pull request #527 from splitbrain/userlink | Gerrit Uitslag | 2014-03-16 |
| |\ \ \ | | | | | | | | | | | Linked and formatted user names | ||
| | * | | | override user link icon in header | Andreas Gohr | 2014-03-15 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'origin/master' into userlink | Gerrit Uitslag | 2014-03-10 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/renderer.php inc/template.php | ||
| | * | | | | added user.png for interwiki links | Gerrit Uitslag | 2014-03-10 |
| | | | | | | |||
| | * | | | | generalised link colour in header, making interwiki links blue as well (to ↵ | Anika Henke | 2014-02-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | fit design) | ||
| | * | | | | Extend showuseras config with username_link | Gerrit Uitslag | 2014-02-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | uses the user interwiki link as profile link | ||
| * | | | | | Merge pull request #573 from splitbrain/FS#2437detailphprefactor | Andreas Gohr | 2014-03-16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | refactor detail.php to template.php | ||
| | * | | | | | refactor detail.php to template.php | Gerrit Uitslag | 2014-02-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactor detail en mediamanager link creation - refactor metadata listing | ||
| * | | | | | | Merge pull request #169 from splitbrain/diff_navigation | Christopher Smith | 2014-03-16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added diff navigation | ||
| | * | | | | | | tiny improvement on diffnav select width | Anika Henke | 2014-03-16 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'master' into diff_navigation | Andreas Gohr | 2014-03-14 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (103 commits) Add a basic test case for the cache Events: Trigger a warning if the default action is not callable Fix caching (make the event callback public again) translation update translation update translation update translation update translation update translation update translation update avoid HTTP image screenshot urls. closes #595 translation update Extension manager: Fix cache extension to be .repo adjusted the office type color again another instance of empty() where an array key might not exist remove placeholder van denied.txt updated file icons once more removed 'not logged in' text, loginform is shown already Revert "added stripped bit to language file" fixed index file ... Conflicts: inc/html.php | ||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-23 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: inc/html.php |