summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/diff_navigation' into revisionslisps2014-02-17
|\ | | | | | | | | Conflicts: inc/parser/xhtml.php
| * Improve PHPDocs html.phpGerrit Uitslag2014-02-17
| |
| * Reorganise generation and displaying of html. Added commentsGerrit Uitslag2014-02-17
| |
| * Put diff navigation in diff view tableGerrit Uitslag2014-02-17
| |
| * Code reformatting html_diffGerrit Uitslag2014-02-17
| |
| * roughly styled diff nav rowAnika Henke2014-02-17
| |
| * remove unnecessary strings and Dutch diff strings (better later once)Gerrit Uitslag2014-02-17
| |
| * add comments to html_diffGerrit Uitslag2014-02-17
| |
| * replace arrows in names of diff links by textsGerrit Uitslag2014-02-17
| |
| * rename unit tests for getRevisionAround. Fix revs order as well.Gerrit Uitslag2014-02-15
| |
| * reverse revisions display orderGerrit Uitslag2014-02-15
| |
| * remove close p tag in diffviewGerrit Uitslag2014-02-15
| |
| * diff navigation: move prev/next on one side or both sideGerrit Uitslag2014-02-15
| |
| * add disable options to form_makeListboxField. Disable out of range revisionsGerrit Uitslag2014-02-15
| |
| * Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
| | | | | | | | | | | | | | | | | | | | # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. * include upstream change * added dropdowns
| * Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
| |\
| | * try to ignore chmod errors FS#2895Andreas Gohr2014-02-15
| | |
| | * when creating a diff link always link to exact rev FS#2835Andreas Gohr2014-02-15
| | |
| * | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
| |\|
| | * fixed retrieveUser function in authadAndreas Gohr2014-02-15
| | | | | | | | | | | | previously it never returned any users
| | * show PHP version only to admins and managers FS#2655Andreas Gohr2014-02-15
| | |
| | * Merge pull request #544 from lisps/#2851Andreas Gohr2014-02-15
| | |\ | | | | | | | | Mediamanager: rename radio name attributes for sort and list buttons to
| | | * Mediamanager: rename radio name attributes for sort and list buttons tolisps2014-02-15
| | | | | | | | | | | | | | | | fix fs#2851 related to http://bugs.jqueryui.com/ticket/8761
| | * | handle limit=0 correctly in authmysql/pgsql FS#2919Andreas Gohr2014-02-15
| | | |
| | * | streamlined retrieveUsers() signature over all auth plugins FS#2919Andreas Gohr2014-02-15
| | | |
| | * | included geshi styles per @import, removed from lib/exe/cssAnika Henke2014-02-15
| | |/
| | * removed Yahoo sitemap ping, added Yandex instead FS#2880Andreas Gohr2014-02-15
| | |
| | * LESSified GeSHI stylesAndreas Gohr2014-02-15
| | |
| | * combined geshi stylesAndreas Gohr2014-02-15
| | | | | | | | | | | | using http://cleancss.com/
| | * recompiled geshi styles FS#2902Andreas Gohr2014-02-15
| | |
| | * move geshi highlighting to it's own LESS fileAndreas Gohr2014-02-15
| | |
| | * enable/disable extensions via AJAX FS#2927Andreas Gohr2014-02-15
| | |
| | * Merge pull request #542 from splitbrain/debug_apacheAndreas Gohr2014-02-15
| | |\ | | | | | | | | Add Apache module list to ?do=debug information
| | | * Add Apache module list to ?do=debug informationChristopher Smith2014-02-14
| | |/ | | | | | | | | | | | | This should make it possible to see if mod_security is involved, at least on servers running mod_php.
| | * Revert "fix global $AUTH hiding $auth"Andreas Gohr2014-02-14
| | | | | | | | | | | | | | | | | | | | | Yes, it's hiding $auth, but detail templates might depend on that. We need to fix this properly. This reverts commit 343aa1749f17e62fa68e26193011a5051025881a.
| | * fixed some doc stringsAndreas Gohr2014-02-14
| | |
| | * fix global $AUTH hiding $authAndreas Gohr2014-02-14
| | |
| | * Merge branch 'pull-request-524'Andreas Gohr2014-02-14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * pull-request-524: authldap: handle bad groupkey gracefully Update auth.php Update auth.php
| | | * authldap: handle bad groupkey gracefullyAndreas Gohr2014-02-14
| | | |
| | | * Merge branch 'master' of git://github.com/SteScho/dokuwiki into pull-request-524Andreas Gohr2014-02-14
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/SteScho/dokuwiki: Update auth.php Update auth.php
| | | | * Update auth.phpSteScho2014-02-03
| | | | | | | | | | | | | | | As suggested by @selfthinker
| | | | * Update auth.phpSteScho2014-01-30
| | | | | | | | | | | | | | | In Novell eDir the group search returns strings, not arrays. Added if-statement which determines if the result is an array or an string.
| | * | | fixed whitespace errors introduced in #535Andreas Gohr2014-02-14
| | | | |
| | * | | Merge branch 'toolbar' of git://github.com/hafron/dokuwiki into pull-request-535Andreas Gohr2014-02-14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'toolbar' of git://github.com/hafron/dokuwiki: megre changes add preventDefault to toolbar buttons
| | | * | | megre changesSzymon Olewniczak2014-02-07
| | | | | |
| | | * | | add preventDefault to toolbar buttonsSzymon Olewniczak2014-02-07
| | | | | |
| | * | | | Merge pull request #532 from splitbrain/gittoolAndreas Gohr2014-02-14
| | |\ \ \ \ | | | | | | | | | | | | | | added bin/gittool.php for simpler git management of plugins
| | | * | | | always fullpath repo dirsAndreas Gohr2014-02-14
| | | | | | |
| | | * | | | check for empty repoAndreas Gohr2014-02-05
| | | | | | |
| | | * | | | added bin/gittool.php for simpler git management of pluginsAndreas Gohr2014-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes use of the extension plugin