Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-23 |
|\ | | | | | | | | | Conflicts: inc/html.php | ||
| * | translation update | Robert Bogenschneider | 2014-02-23 |
| | | |||
| * | Merge pull request #565 from dokuwiki-translate/lang_update_54 | Andreas Gohr | 2014-02-22 |
| |\ | | | | | | | Translation update (hu) | ||
| | * | translation update | Marina Vladi | 2014-02-22 |
| | | | |||
| * | | Merge pull request #566 from dokuwiki-translate/lang_update_59 | Andreas Gohr | 2014-02-22 |
| |\ \ | | | | | | | | | Translation update (fr) | ||
| | * | | translation update | Schplurtz le Déboulonné | 2014-02-22 |
| | |/ | |||
| * | | Merge pull request #561 from splitbrain/dir_delete | Andreas Gohr | 2014-02-22 |
| |\ \ | | |/ | |/| | replace dir_delete by io_rmdir | ||
| | * | replace dir_delete by io_rmdir | Gerrit Uitslag | 2014-02-20 |
| | | | |||
| * | | Removed unused vars, define undefined ones | Gerrit Uitslag | 2014-02-20 |
| |/ | |||
| * | fixed pagetools being inaccessible on screens lacking necessary height, and ↵ | Anika Henke | 2014-02-15 |
| | | | | | | | | aligned them to content when on smaller screens | ||
* | | improved positioning of diff options | Anika Henke | 2014-02-19 |
| | | |||
* | | improved styling of diff nav row | Anika Henke | 2014-02-19 |
| | | |||
* | | roughly styled diff nav row | Anika Henke | 2014-02-17 |
| | | |||
* | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-15 |
|\| | |||
| * | fixed retrieveUser function in authad | Andreas Gohr | 2014-02-15 |
| | | | | | | | | previously it never returned any users | ||
| * | handle limit=0 correctly in authmysql/pgsql FS#2919 | Andreas Gohr | 2014-02-15 |
| | | |||
| * | streamlined retrieveUsers() signature over all auth plugins FS#2919 | Andreas Gohr | 2014-02-15 |
| | | |||
| * | included geshi styles per @import, removed from lib/exe/css | Anika Henke | 2014-02-15 |
| | | |||
| * | LESSified GeSHI styles | Andreas Gohr | 2014-02-15 |
| | | |||
| * | combined geshi styles | Andreas Gohr | 2014-02-15 |
| | | | | | | | | using http://cleancss.com/ | ||
| * | recompiled geshi styles FS#2902 | Andreas Gohr | 2014-02-15 |
| | | |||
| * | move geshi highlighting to it's own LESS file | Andreas Gohr | 2014-02-15 |
| | | |||
| * | enable/disable extensions via AJAX FS#2927 | Andreas Gohr | 2014-02-15 |
| | | |||
| * | Revert "fix global $AUTH hiding $auth" | Andreas Gohr | 2014-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 strings | Andreas Gohr | 2014-02-14 |
| | | |||
| * | fix global $AUTH hiding $auth | Andreas Gohr | 2014-02-14 |
| | | |||
| * | Merge branch 'pull-request-524' | Andreas Gohr | 2014-02-14 |
| |\ | | | | | | | | | | | | | | | | | | | * pull-request-524: authldap: handle bad groupkey gracefully Update auth.php Update auth.php | ||
| | * | authldap: handle bad groupkey gracefully | Andreas Gohr | 2014-02-14 |
| | | | |||
| | * | Merge branch 'master' of git://github.com/SteScho/dokuwiki into pull-request-524 | Andreas Gohr | 2014-02-14 |
| | |\ | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/SteScho/dokuwiki: Update auth.php Update auth.php | ||
| | | * | Update auth.php | SteScho | 2014-02-03 |
| | | | | | | | | | | | | As suggested by @selfthinker | ||
| | | * | Update auth.php | SteScho | 2014-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 #535 | Andreas Gohr | 2014-02-14 |
| | | | | |||
| * | | | Merge branch 'toolbar' of git://github.com/hafron/dokuwiki into pull-request-535 | Andreas Gohr | 2014-02-14 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | * 'toolbar' of git://github.com/hafron/dokuwiki: megre changes add preventDefault to toolbar buttons | ||
| | * | | | megre changes | Szymon Olewniczak | 2014-02-07 |
| | | | | | |||
| | * | | | add preventDefault to toolbar buttons | Szymon Olewniczak | 2014-02-07 |
| | | | | | |||
| * | | | | Merge pull request #502 from splitbrain/multiqsearch | Andreas Gohr | 2014-02-14 |
| |\ \ \ \ | | |_|/ / | |/| | | | dw_qsearch as jQuery function | ||
| | * | | | Use more general name for qsearch output | Gerrit Uitslag | 2014-01-17 |
| | | | | | |||
| | * | | | move getSearchterm to overrideable method | Gerrit Uitslag | 2014-01-17 |
| | | | | | |||
| | * | | | Reformat qsearch.js | Gerrit Uitslag | 2014-01-17 |
| | | | | | |||
| | * | | | Made a jquery function of dw_qsearch | Gerrit Uitslag | 2014-01-17 |
| | | | | | |||
| * | | | | adjusted IE detection for smblinks | Andreas Gohr | 2014-02-13 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | MSIE 11 tries hard to break any previous working browser detection even through feature checks. This resolves to browser sniffing (MSIE for old IE, Trident for IE11+) See https://forum.dokuwiki.org/thread/10824 | ||
| * | | | Merge pull request #531 from dokuwiki-translate/lang_update_10 | Andreas Gohr | 2014-02-04 |
| |\ \ \ | | | | | | | | | | | Translation update (sl) | ||
| | * | | | translation update | matej | 2014-02-04 |
| | | | | | |||
| * | | | | Merge pull request #503 from splitbrain/datepickerlocale | Andreas Gohr | 2014-02-02 |
| |\ \ \ \ | | | | | | | | | | | | | localize jQuery UI date picker FS#2912 | ||
| | * | | | | do not keep zero size files | Andreas Gohr | 2014-01-17 |
| | | | | | | |||
| | * | | | | localize jQuery UI date picker FS#2912 | Andreas Gohr | 2014-01-17 |
| | | | | | | |||
| * | | | | | Merge pull request #265 from splitbrain/video-audio | Anika Henke | 2014-02-02 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added video and audio support | ||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2014-02-02 |
| | |\ \ \ \ \ | |||
| | * | | | | | | fixed html errors in video and audio rendering | Anika Henke | 2014-02-02 |
| | | | | | | | | |||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2014-01-26 |
| | |\ \ \ \ \ \ |