summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAge
* Merge branch 'master' into stableGuy Brand2014-05-05
|\
| * no fancy quotes in user manager import descriptionGerrit Uitslag2014-05-05
| |
| * update deprecation stuff for dw_qearchGerrit Uitslag2014-05-05
| |
| * translation updateMyeongjin2014-04-27
| |
| * Merge pull request #661 from dokuwiki-translate/lang_update_243Anika Henke2014-04-26
| |\ | | | | | | Translation update (ko)
| | * translation updateMyeongjin2014-04-22
| | |
| * | translation updateВладимир2014-04-25
| |/
| * translation updateAntonio Bueno2014-04-16
| |
| * Merge pull request #655 from dokuwiki-translate/lang_update_230Anika Henke2014-04-16
| |\ | | | | | | Translation update (zh)
| | * translation updateqinghao2014-04-12
| | |
| * | translation updateEloy2014-04-11
| |/
| * translation updateRobert Bogenschneider2014-04-10
| |
| * fix include_once for JavaScriptAndreas Gohr2014-04-09
| | | | | | | | the second include was never removed, causing an endless loop.
| * Merge branch 'master' of github.com:splitbrain/dokuwikiAnika Henke2014-04-06
| |\
| | * Bulgarian language updateNEOhidra2014-04-06
| | |
| * | oops, removed unintentionally added CSS filesAnika Henke2014-04-06
| |/
| * translation updateJernej Vidmar2014-04-05
| |
| * Merge pull request #641 from dokuwiki-translate/lang_update_212Andreas Gohr2014-04-03
| |\ | | | | | | Translation update (ko)
| | * translation updateYoung gon Cha2014-04-03
| | |
| * | fixed unclosed tags in some language translationsClomode2014-04-03
| |/
| * translation updateggallon2014-03-24
| |
| * 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
| | |
| | * added config stuff for disabling RSSAndreas Gohr2014-03-18
| | |
| * | 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
| | * | | 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.
| * | | | translation updateChristopher Schive2014-03-18
| | |_|/ | |/| |
| * | | notloggedin removed from nl as well + fix of AD domain string.Gerrit Uitslag2014-03-17
| | | |
| * | | translation updateRene2014-03-17
| | | |
| * | | translation updateAleksandr Selivanov2014-03-17
| | | |
| * | | translation updateSimon2014-03-17
| | | |
| * | | Merge pull request #527 from splitbrain/userlinkGerrit Uitslag2014-03-16
| |\ \ \ | | | | | | | | | | Linked and formatted user names
| | * | | override user link icon in headerAndreas Gohr2014-03-15
| | | | |
| | * | | 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
| | | | | |
| | * | | | generalised link colour in header, making interwiki links blue as well (to ↵Anika Henke2014-02-16
| | | | | | | | | | | | | | | | | | | | | | | | fit design)
| | * | | | Extend showuseras config with username_linkGerrit Uitslag2014-02-15
| | | | | | | | | | | | | | | | | | | | | | | | uses the user interwiki link as profile link
| * | | | | Merge pull request #573 from splitbrain/FS#2437detailphprefactorAndreas Gohr2014-03-16
| |\ \ \ \ \ | | | | | | | | | | | | | | refactor detail.php to template.php
| | * | | | | refactor detail.php to template.phpGerrit Uitslag2014-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactor detail en mediamanager link creation - refactor metadata listing
| * | | | | | Merge pull request #169 from splitbrain/diff_navigationChristopher Smith2014-03-16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added diff navigation
| | * | | | | | tiny improvement on diffnav select widthAnika Henke2014-03-16
| | | | | | | |
| | * | | | | | Merge branch 'master' into diff_navigationAndreas Gohr2014-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_navigationGerrit Uitslag2014-02-23
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: inc/html.php