summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAge
* combined geshi stylesAndreas Gohr2014-02-15
* 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
* fixed some doc stringsAndreas Gohr2014-02-14
* fix global $AUTH hiding $authAndreas Gohr2014-02-14
* Merge branch 'pull-request-524'Andreas Gohr2014-02-14
|\
| * authldap: handle bad groupkey gracefullyAndreas Gohr2014-02-14
| * Merge branch 'master' of git://github.com/SteScho/dokuwiki into pull-request-524Andreas Gohr2014-02-14
| |\
| | * Update auth.phpSteScho2014-02-03
| | * Update auth.phpSteScho2014-01-30
* | | 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
|\ \ \
| * | | megre changesSzymon Olewniczak2014-02-07
| * | | add preventDefault to toolbar buttonsSzymon Olewniczak2014-02-07
* | | | Merge pull request #502 from splitbrain/multiqsearchAndreas Gohr2014-02-14
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
| |/ / |/| |
* | | Merge pull request #531 from dokuwiki-translate/lang_update_10Andreas Gohr2014-02-04
|\ \ \
| * | | translation updatematej2014-02-04
* | | | Merge pull request #503 from splitbrain/datepickerlocaleAndreas Gohr2014-02-02
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * \ \ \ \ 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into video-audioAnika Henke2013-08-04
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added spacing below video and audio elementsAnika Henke2013-08-04
| * | | | | | | | | 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#2915Andreas Gohr2014-01-17
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #517 from gamma/masterAndreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Re-order parameters to not break other callersGerry Weißbach2014-01-27
| * | | | | | | | | | Use original filename for Content-DispositionGerry Weißbach2014-01-27
* | | | | | | | | | | Merge pull request #512 from araname/masterAndreas Gohr2014-02-02
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | translation updateMyeongjin2014-01-24
* | | | | | | | | | | | fix error on CSS includes on windowsAndreas Gohr2014-02-02
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #525 from dokuwiki-translate/lang_update_57Andreas Gohr2014-01-31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | translation updateumriya afini2014-01-31
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | extension manager: some minor tweaks in the info screenAndreas Gohr2014-01-30
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #521 from dokuwiki-translate/lang_update_47Andreas Gohr2014-01-29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | translation updatePetr Klíma2014-01-29
| |/ / / / / / / / /
* | | | | | | | | | Update action.phpjgpcx2014-01-28
* | | | | | | | | | Merge pull request #518 from dokuwiki-translate/lang_update_41Andreas Gohr2014-01-27
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |