summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAge
* fixed pagetools being inaccessible on screens lacking necessary height, and ↵Anika Henke2014-02-15
| | | | aligned them to content when on smaller screens
* fixed retrieveUser function in authadAndreas Gohr2014-02-15
| | | | previously it never returned any users
* 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
|
* 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
|
* 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 #502 from splitbrain/multiqsearchAndreas Gohr2014-02-14
|\ \ \ \ | |_|/ / |/| | | dw_qsearch as jQuery function
| * | | Use more general name for qsearch outputGerrit Uitslag2014-01-17
| | | |
| * | | move getSearchterm to overrideable methodGerrit Uitslag2014-01-17
| | | |
| * | | Reformat qsearch.jsGerrit Uitslag2014-01-17
| | | |
| * | | Made a jquery function of dw_qsearchGerrit Uitslag2014-01-17
| | | |
* | | | adjusted IE detection for smblinksAndreas Gohr2014-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_10Andreas Gohr2014-02-04
|\ \ \ | | | | | | | | Translation update (sl)
| * | | translation updatematej2014-02-04
| | | |
* | | | Merge pull request #503 from splitbrain/datepickerlocaleAndreas Gohr2014-02-02
|\ \ \ \ | | | | | | | | | | localize jQuery UI date picker FS#2912
| * | | | do not keep zero size filesAndreas Gohr2014-01-17
| | | | |
| * | | | localize jQuery UI date picker FS#2912Andreas Gohr2014-01-17
| | | | |
* | | | | Merge pull request #265 from splitbrain/video-audioAnika Henke2014-02-02
|\ \ \ \ \ | | | | | | | | | | | | Added video and audio support
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2014-02-02
| |\ \ \ \ \
| * | | | | | fixed html errors in video and audio renderingAnika Henke2014-02-02
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2014-01-26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2013-11-02
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2013-08-04
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added spacing below video and audio elementsAnika Henke2013-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: The spacing will now show as too much as long as the paragraph bug is not fixed
| * | | | | | | | | added basic suport for embedding (html5) videosAnika Henke2013-08-02
| | | | | | | | | |
* | | | | | | | | | Merge pull request #505 from splitbrain/fs2915Andreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | renamed conflicting JavaScript functions FS#2915
| * | | | | | | | | | renamed conflicting JavaScript functions FS#2915Andreas Gohr2014-01-17
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #517 from gamma/masterAndreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add the original filename to sendFile for Content-Disposition
| * | | | | | | | | | Re-order parameters to not break other callersGerry Weißbach2014-01-27
| | | | | | | | | | |
| * | | | | | | | | | Use original filename for Content-DispositionGerry Weißbach2014-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases this change will have no effect, but noes the response will use the filename that was originally requested. The downloaded filename can be modified to something different as well. E.g. the siteexport plugin will make use of it.
* | | | | | | | | | | Merge pull request #512 from araname/masterAndreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Translation update (ko)
| * | | | | | | | | | | translation updateMyeongjin2014-01-24
| | | | | | | | | | | |
* | | | | | | | | | | | fix error on CSS includes on windowsAndreas Gohr2014-02-02
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regex wasn't properly escaped here which lead to problems when the path contains backslashes. This is the root cause of the bug reported at https://github.com/cosmocode/edittable/issues/19
* | | | | | | | | | | Merge pull request #525 from dokuwiki-translate/lang_update_57Andreas Gohr2014-01-31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Translation update (id)