Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Extendable config cascade for userstyles and userscript | Gerrit Uitslag | 2014-12-10 |
| | | | | Added user*.less files to config | ||
* | Merge remote-tracking branch 'origin/master' into scrutinizerissues | Gerrit Uitslag | 2014-12-09 |
|\ | | | | | | | | | | | | | | | | | Conflicts: inc/media.php inc/plugin.php inc/template.php lib/plugins/authplain/_test/escaping.test.php lib/plugins/syntax.php | ||
| * | visibility from private to protected for DokuCssFile | Gerrit Uitslag | 2014-10-22 |
| | | |||
| * | Merge pull request #903 from LarsGit223/master | Andreas Gohr | 2014-10-17 |
| |\ | | | | | | | Fixed unrecognized regular expressions behind '&&' or '||' operators in JavaScript compression. Finally fixes #897. | ||
| | * | Fixed JavaScript compression. The compressor did not recognize a regular ↵ | LarsDW223 | 2014-10-15 |
| | | | | | | | | | | | | expression after a '&&' ot '||' operator. So it could happen that code had been cut off if the regular expression included '\//' (which was treated as a single line comment because of the regular expression not being recognized). Finally fixes #897. | ||
| * | | Merge pull request #901 from LarsGit223/master | Andreas Gohr | 2014-10-14 |
| |\| | | | | | | | Corrected compression for ++ and -- operator. Partially fixes #897. | ||
| | * | Corrected compression for ++ and -- operator. Partially fixes #897. | LarsDW223 | 2014-10-14 |
| | | | |||
| * | | Merge pull request #896 from splitbrain/lessmorecomments | Andreas Gohr | 2014-10-14 |
| |\ \ | | |/ | |/| | preserve comments in less if 'compress' config disabled | ||
| | * | preserve comments in less if 'compress' config disabled | Gerrit Uitslag | 2014-10-11 |
| | | | | | | | | | | | | Otherwise comments are never visible in css.php | ||
| * | | Merge remote-tracking branch master into revisions | lisps | 2014-09-26 |
| |\| | |||
| * | | Merge remote-tracking branch 'remotes/origin/master' into revisions_local | lisps | 2014-03-19 |
| |\ \ | |||
| * \ \ | Merge remote-tracking branch 'origin/diff_navigation' into revisions | lisps | 2014-02-17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php | ||
| * | | | | remove property rev from xhtml.php | lisps | 2013-11-22 |
| | | | | | | | | | | | | | | | | | | | | changed variable name $create_time to $modified_time | ||
| * | | | | add parameter at($DATE_AT) and mind revisions | lisps | 2013-11-21 |
| | | | | | |||
* | | | | | PHPDocs and some improvements | Gerrit Uitslag | 2014-10-02 |
| | | | | | |||
* | | | | | more PHPDocs, unused var, small bit code reformatting | Gerrit Uitslag | 2014-10-01 |
| | | | | | |||
* | | | | | Many PHPDocs, some unused and dyn declared vars | Gerrit Uitslag | 2014-10-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | many PHPDocs some unused variables some dynamically declared variables declared | ||
* | | | | | more scrutinizer issue improvements | Gerrit Uitslag | 2014-09-29 |
| | | | | | |||
* | | | | | scrutinizer documentations issues | Gerrit Uitslag | 2014-09-29 |
| |_|_|/ |/| | | | |||
* | | | | fix mediamanager messages. closes #792 | Andreas Gohr | 2014-07-30 |
| | | | | |||
* | | | | Quick fix for #765 - ACL checks in the media manager ajax calls | Michael Hamann | 2014-06-25 |
| | | | | | | | | | | | | | | | | This should be superseded by a proper rewrite of the media manager code | ||
* | | | | don't treat double slashes as comments when used in string | Andreas Gohr | 2014-05-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids treating double slashes as single line comments in CSS when they are used in a filter or content string. closes #638 | ||
* | | | | fix include_once for JavaScript | Andreas Gohr | 2014-04-09 |
| |_|/ |/| | | | | | | | | the second include was never removed, causing an endless loop. | ||
* | | | Merge pull request #616 from splitbrain/stripsourcemaps | Christopher Smith | 2014-03-18 |
|\ \ \ | | | | | | | | | strip sourcemaps in CSS and JS #601 | ||
| * | | | strip sourcemaps in CSS and JS #601 | Andreas Gohr | 2014-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/jqueryupdate | Christopher Smith | 2014-03-18 |
|\ \ \ \ | | | | | | | | | | | JQuery Update | ||
| * | | | | fixed online comment stripping | Andreas Gohr | 2014-03-05 |
| | | | | | |||
| * | | | | fix single line comments in CSS compression | Andreas Gohr | 2014-03-05 |
| | | | | | | | | | | | | | | | | | | | | double slashes in url() always have to be ignored | ||
* | | | | | Fixed cache dependency for template's style.ini | Michal Koutný | 2014-03-16 |
| |/ / / |/| | | | | | | | | | | | Web path was used instead of filesystem one. | ||
* | | | | use empty() where array values might not be set | Christopher Smith | 2014-03-05 |
| | | | | |||
* | | | | fix misspelled variable name, | Christopher Smith | 2014-03-05 |
|/ / / | |||
* | | | Merge pull request #557 from splitbrain/cachetimeattr | Christopher Smith | 2014-03-02 |
|\ \ \ | | | | | | | | | Add _time attribute to cache object and minor PHPDocs improvements | ||
| * | | | PHPDocs js.php | Gerrit Uitslag | 2014-02-18 |
| | |/ | |/| | |||
* | | | 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 |
|/ / | |||
* | | included geshi styles per @import, removed from lib/exe/css | Anika Henke | 2014-02-15 |
| | | |||
* | | move geshi highlighting to it's own LESS file | 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. | ||
* | | fix global $AUTH hiding $auth | Andreas Gohr | 2014-02-14 |
| | | |||
* | | Merge pull request #503 from splitbrain/datepickerlocale | Andreas Gohr | 2014-02-02 |
|\ \ | | | | | | | localize jQuery UI date picker FS#2912 | ||
| * | | localize jQuery UI date picker FS#2912 | Andreas Gohr | 2014-01-17 |
| | | | |||
* | | | Merge pull request #517 from gamma/master | Andreas Gohr | 2014-02-02 |
|\ \ \ | | | | | | | | | Add the original filename to sendFile for Content-Disposition | ||
| * | | | Re-order parameters to not break other callers | Gerry Weißbach | 2014-01-27 |
| | | | | |||
| * | | | Use original filename for Content-Disposition | Gerry Weißbach | 2014-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. | ||
* | | | | fix error on CSS includes on windows | Andreas Gohr | 2014-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 #454 from lisps/resize_image-height | Andreas Gohr | 2014-01-19 |
|\ \ \ | |/ / |/| | | Resize image by height | ||
| * | | media image can be resized by height (without width) | lisps | 2013-11-27 |
| |/ | |||
* / | improved comments for code associated with PR#407 & PR#408 | Christopher Smith | 2013-11-26 |
|/ | |||
* | Merge pull request #406 from splitbrain/remove-deprecated-stuff | Christopher Smith | 2013-11-17 |
|\ | | | | | Remove deprecated stuff |