summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* 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
| * | 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
| | |
* | | 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
|/ / /
* | | translation updateAleksandr Selivanov2014-03-17
| | |
* | | 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
| | | |
| * | | 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
| * | | | change default userspace to :user:<username> and add interwiki classGerrit Uitslag2014-02-17
| | | | |
| * | | | fix comment in _resolveInterWikiGerrit Uitslag2014-02-15
| | | | |
| * | | | interwiki : prefixed configurls handled as wikilinksGerrit Uitslag2014-02-15
| | | | |
| * | | | code reformattingGerrit Uitslag2014-02-15
| | | | |
| * | | | wikilink creating refactored to _resolveinterwiki().Gerrit Uitslag2014-02-15
| | | | | | | | | | | | | | | | | | | | Added DOKU_BASE for local target
| * | | | 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 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 pull request #574 from splitbrain/FS#2124deniedtextAndreas Gohr2014-03-14
| |\ \ \ \ \ | | | | | | | | | | | | | | Improve denied access text FS#2124
| | * | | | | remove placeholder van denied.txtGerrit Uitslag2014-03-07
| | | | | | |
| | * | | | | removed 'not logged in' text, loginform is shown alreadyGerrit Uitslag2014-03-06
| | | | | | |
| | * | | | | Revert "added stripped bit to language file"Gerrit Uitslag2014-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 524df5769a0b9b7aa35af6500c85528c2b0515fe. Conflicts: inc/lang/bn/lang.php inc/lang/fr/lang.php
| | * | | | | Merge remote-tracking branch 'origin/master' into FS#2124deniedtextGerrit Uitslag2014-03-04
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/bn/lang.php inc/lang/fr/denied.txt
| | * \ \ \ \ \ Merge branch 'FS#2124deniedtext' of github.com:splitbrain/dokuwiki into ↵Gerrit Uitslag2014-03-04
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | FS#2124deniedtext
| | | * | | | | | added stripped bit to language fileAndreas Gohr2014-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this has been done by a script and might not be 100% accurate
| | * | | | | | | added login form at denied access pageGerrit Uitslag2014-03-04
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - restore lang string as well
| | * | | | | | Update localizationsGerrit Uitslag2014-02-25
| | | | | | | |
| | * | | | | | added new html_denied() method as wellGerrit Uitslag2014-02-25
| | | | | | | |
| | * | | | | | Show 'not logged in' only when logged out FS#2124Gerrit Uitslag2014-02-25
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'lang_update_119' of ↵Andreas Gohr2014-03-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-605 * 'lang_update_119' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: lib/plugins/acl/lang/et/lang.php
| | * | | | | | translation updateJanar Leas2014-03-12
| | | | | | | |
| * | | | | | | Merge pull request #554 from splitbrain/fileiconsAndreas Gohr2014-03-14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Switched file icons against generated ones, added 32x32 versions
| | * | | | | | | Switched file icons against generated ones, added 32x32 versionsAndreas Gohr2014-02-16
| | | | | | | | |