Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch master into revisions | lisps | 2014-09-26 |
|\ | |||
| * | updated dates in info.txt of various plugins and template | Anika Henke | 2014-08-02 |
| | | |||
| * | oops, removed unintentionally added CSS files | Anika Henke | 2014-04-06 |
| | | |||
* | | Merge remote-tracking branch 'remotes/origin/master' into revisions_local | lisps | 2014-03-19 |
|\| | |||
| * | Merge pull request #527 from splitbrain/userlink | Gerrit Uitslag | 2014-03-16 |
| |\ | | | | | | | Linked and formatted user names | ||
| | * | override user link icon in header | Andreas Gohr | 2014-03-15 |
| | | | |||
| | * | Merge remote-tracking branch 'origin/master' into userlink | Gerrit Uitslag | 2014-03-10 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/renderer.php inc/template.php | ||
| | * | | generalised link colour in header, making interwiki links blue as well (to ↵ | Anika Henke | 2014-02-16 |
| | | | | | | | | | | | | | | | | fit design) | ||
| * | | | Merge pull request #573 from splitbrain/FS#2437detailphprefactor | Andreas Gohr | 2014-03-16 |
| |\ \ \ | | | | | | | | | | | refactor detail.php to template.php | ||
| | * | | | refactor detail.php to template.php | Gerrit Uitslag | 2014-02-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - refactor detail en mediamanager link creation - refactor metadata listing | ||
| * | | | | tiny improvement on diffnav select width | Anika Henke | 2014-03-16 |
| | | | | | |||
| * | | | | Merge branch 'master' into diff_navigation | Andreas Gohr | 2014-03-14 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (103 commits) Add a basic test case for the cache Events: Trigger a warning if the default action is not callable Fix caching (make the event callback public again) translation update translation update translation update translation update translation update translation update translation update avoid HTTP image screenshot urls. closes #595 translation update Extension manager: Fix cache extension to be .repo adjusted the office type color again another instance of empty() where an array key might not exist remove placeholder van denied.txt updated file icons once more removed 'not logged in' text, loginform is shown already Revert "added stripped bit to language file" fixed index file ... Conflicts: inc/html.php | ||
| | * | | | made sidebar content styles re-usable outside of ID (added class: aside) | Anika Henke | 2014-02-23 |
| | | | | | |||
| | * | | | made search form styles independent from sitetools ID | Anika Henke | 2014-02-23 |
| | |/ / | |||
| * | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-23 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: inc/html.php | ||
| | * | | 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 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/diff_navigation' into revisions | lisps | 2014-02-17 |
|\| | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php | ||
| * | | roughly styled diff nav row | Anika Henke | 2014-02-17 |
| |/ | |||
| * | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2014-02-02 |
| |\ | |||
| | * | dokuwiki template: Fix the preview width on small screens FS#2914 | Michael Hamann | 2014-01-12 |
| | | | |||
| * | | 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 |
| |\| | |||
| * | | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2013-11-02 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php | ||
| * \ \ | Merge remote-tracking branch 'origin/master' into video-audio | Anika Henke | 2013-08-04 |
| |\ \ \ | |||
| * | | | | added spacing below video and audio elements | Anika Henke | 2013-08-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Note: The spacing will now show as too much as long as the paragraph bug is not fixed | ||
* | | | | | add parameter at($DATE_AT) and mind revisions | lisps | 2013-11-21 |
| |_|_|/ |/| | | | |||
* | | | | removed tpl from TEMPLATE_PAGETOOLS_DISPLAY event as it's always available in | Anika Henke | 2013-11-17 |
| | | | | |||
* | | | | Improved pagetools event in dokuwiki template | Anika Henke | 2013-11-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the template name away from the hook name into the event data (as the 'tpl' value). Therefore it moves the previous data items into the 'items' sub array. A 'view' value has also been added to describe in which template file the event was called ('main' or 'detail'). This way it will be much easier for plugins to consider default cases and differentiate between main and other layouts. | ||
* | | | | updated inline documentation about location of local style.ini | Anika Henke | 2013-11-11 |
| |_|/ |/| | | |||
* | | | replace boolean conditional checks on possibly uninitialized vars with ↵ | Christopher Smith | 2013-10-16 |
| | | | | | | | | | | | | \!empty/empty/isset as appropriate | ||
* | | | RS#2860 fix configuration option key to 'template' | Christopher Smith | 2013-10-04 |
| | | | |||
* | | | Fix CodeSniffer whitespace violoations | Matt Perry | 2013-09-10 |
| | | | | | | | | | | | | | | | Removed extraneous whitespace to eliminate errors reported by the Squiz.WhiteSpace.SuperfluousWhitespace sniff. | ||
* | | | Merge pull request #308 from flammy/patch-3 | Michael Hamann | 2013-09-01 |
|\ \ \ | | | | | | | | | add pointer curser to mediafile | ||
| * | | | add pointer curser to mediafile | flammy | 2013-08-14 |
| | | | | | | | | | | | | Added the pointer icon to the media manager pop-up to show users it is clickable. | ||
* | | | | Fix CodeSniffer violations for PHP files | Matt Perry | 2013-08-23 |
|/ / / | | | | | | | | | | Fix violations for Zend.Files.ClosingTag.NotAllowed | ||
* | | | removed unintentionally added sidebar classes from detail.php | Anika Henke | 2013-08-11 |
| | | | |||
* | | | changed style of `<file>` slightly to help tell it apart from `<code>` | Anika Henke | 2013-08-06 |
| |/ |/| | | | | | For Ingo from the LinuxHotel | ||
* | | corrected comment in pagetools-item() mixin | Anika Henke | 2013-08-03 |
| | | |||
* | | use only one mixin name for pagetools | Andreas Gohr | 2013-08-03 |
| | | | | | | | | less will use the right one based on parameter counts | ||
* | | lessified pagetools items, added mixins simplify maintenance | Anika Henke | 2013-08-03 |
| | | |||
* | | fixed old pagetools sprite loading from cache when hovering | Anika Henke | 2013-08-03 |
| | | |||
* | | removed a merge conflict I missed on merge | Andreas Gohr | 2013-08-02 |
| | | |||
* | | Merge branch 'less' | Andreas Gohr | 2013-08-02 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * less: check less compilation for errors removed possibility to have rtl.less files in plugins switched to LESS variables in rest of template's css files unlessified and lessified a few more css fixed broken structure removed debug statement. sorry convert ini replacements to less vars first make sure calculations are correct lessified more files lessyfied another one lessyfied the first of template's CSS files fixed ini replacement to less variables stuff added missing lessc library add LESS support Conflicts: inc/load.php lib/tpl/dokuwiki/css/basic.less | ||
| * | | switched to LESS variables in rest of template's css files | Anika Henke | 2013-07-31 |
| | | | |||
| * | | unlessified and lessified a few more css | Anika Henke | 2013-07-30 |
| | | | |||
| * | | fixed broken structure | Anika Henke | 2013-07-30 |
| | | | |||
| * | | make sure calculations are correct | Andreas Gohr | 2013-07-30 |
| | | | |||
| * | | lessified more files | Andreas Gohr | 2013-07-30 |
| | | |