summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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)
| * | | fix comment in _resolveInterWikiGerrit Uitslag2014-02-15
| | | |
| * | | interwiki : prefixed configurls handled as wikilinksGerrit Uitslag2014-02-15
| | | |
| * | | Use DOKU_BASE in resolveinterwiki unittestGerrit Uitslag2014-02-15
| | | |
| * | | Fix double slash in coral interwikilinkGerrit Uitslag2014-02-15
| | | |
| * | | code reformattingGerrit Uitslag2014-02-15
| | | |
| * | | wikilink creating refactored to _resolveinterwiki().Gerrit Uitslag2014-02-15
| | | | | | | | | | | | | | | | Added DOKU_BASE for local target
| * | | added tests for Doku_Renderer::_resolveInterWikiGerrit Uitslag2014-02-15
| | | |
| * | | Extend showuseras config with username_linkGerrit Uitslag2014-02-15
| | | | | | | | | | | | | | | | uses the user interwiki link as profile link
| * | | wikilink needs wiki target as wellGerrit Uitslag2014-02-15
| | | |
| * | | handle interwiki without slashes as pageids. Added user interwikiGerrit Uitslag2014-02-14
| | | | | | | | | | | | | | | | | | | | * allowed urlparams * added `wiki:users:` as default user profile link
| * | | change default arg value of userinfo in null instead falseGerrit Uitslag2014-02-14
| | | |
| * | | update $username as well, when read from _SERVERGerrit Uitslag2014-02-04
| | | |
| * | | wrap userlink building with event.Gerrit Uitslag2014-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements an event which can modify the link below usernames, and the displayed user name. When no name supplied, the name of currently logged-in user is used.
* | | | Merge pull request #573 from splitbrain/FS#2437detailphprefactorAndreas Gohr2014-03-16
|\ \ \ \ | | | | | | | | | | refactor detail.php to template.php
| * | | | Update lang of img pagetoolsGerrit Uitslag2014-03-05
| | | | |
| * | | | 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