Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #1072 from flammy/master | Anika Henke | 2015-05-09 |
|\ | | | | | Added file-in-use reference to page | ||
| * | Added file-in-use reference to page | flammy | 2015-03-12 |
| | | | | | | Added english translation for file-in-use reference | ||
* | | Report more meaningful errors when an auth backend fails. closes #1093 | Patrick Brown | 2015-05-06 |
| | | |||
* | | Remove no longer needed language string | Patrick Brown | 2015-04-04 |
| | | |||
* | | Remove unused language strings | Patrick Brown | 2015-04-03 |
|/ | |||
* | "Login" and "Logout" become "Log In" and "Log Out" | Gilles-Philippe Morin | 2015-01-18 |
| | | | This change improves consistency with neighboring links such as "Update Profile" and "Register", which are two action verbs. "Login" and "Logout" were nouns and not verbs. Title case capitalization is applied because of "Update Profile". | ||
* | "Recent changes" becomes "Recent Changes" | Gilles-Philippe Morin | 2015-01-13 |
| | | | To improve consistency: it is surrounded by "Update Profile" and "Media Manager". | ||
* | Merge pull request #624 from lisps/revisions | Andreas Gohr | 2014-09-29 |
|\ | | | | | date_at support | ||
| * | parse AT parameter: first strtotime then timestamp | lisps | 2014-09-29 |
| | | | | | | | | remove config option | ||
| * | Merge remote-tracking branch master into revisions | lisps | 2014-09-26 |
| |\ | |||
| * | | add config date_at_format | lisps | 2014-03-19 |
| | | | | | | | | | change translation message | ||
| * | | 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 | ||
| * | | | | localize msg | lisps | 2013-11-22 |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly | Gerrit Uitslag | 2014-09-28 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/hr/searchpage.txt inc/lang/ko/searchpage.txt | ||
| * | | | | Merge remote-tracking branch 'origin/master' into trailingcolons | Gerrit Uitslag | 2014-05-26 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/cs/lang.php inc/lang/hu/lang.php | ||
| | * | | | | check mbstring function overloading in installer. closes #736 | Andreas Gohr | 2014-05-24 |
| | | |_|/ | | |/| | | |||
| * / | | | Move colon from code to language strings | Gerrit Uitslag | 2014-05-16 |
| |/ / / | |||
| * | | | notloggedin lang string left | Gerrit Uitslag | 2014-03-17 |
| | | | | |||
| * | | | 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 | ||
| * | | | | 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 | ||
| | * | | | added login form at denied access page | Gerrit Uitslag | 2014-03-04 |
| | | | | | | | | | | | | | | | | | | | | - restore lang string as well | ||
| | * | | | Show 'not logged in' only when logged out FS#2124 | Gerrit Uitslag | 2014-02-25 |
| | |/ / | |||
| * | | | remove unnecessary strings and Dutch diff strings (better later once) | Gerrit Uitslag | 2014-02-17 |
| | | | | |||
| * | | | replace arrows in names of diff links by texts | Gerrit Uitslag | 2014-02-17 |
| | | | | |||
| * | | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2014-02-15 |
| |\| | | | |/ | |/| | |||
| * | | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2013-11-19 |
| |\ \ | |||
| * \ \ | merge master in branch | Klap-in | 2013-07-14 |
| |\ \ \ | |||
| * | | | | Added diff navigation | Klap-in | 2013-01-27 |
| | | | | | | | | | | | | | | | | | | | | Navigation links to move to previous edit before revision in left column or next/last edit after revision in right column. | ||
* | | | | | Update text above searchresults, when only read-acl FS#2697 | Gerrit Uitslag | 2014-02-21 |
| |_|_|/ |/| | | | |||
* | | | | renamed code button to monospace FS#2934 and many others | Andreas Gohr | 2014-02-05 |
| |_|/ |/| | | | | | | | | Let's stop confusing people with what this button does | ||
* | | | swapped logic for allowing/disabling registration in installer | Anika Henke | 2013-11-17 |
| | | | |||
* | | | changed user approval option to disable registration option in installer | Anika Henke | 2013-11-17 |
| | | | |||
* | | | added possibility to approve users to ACL policies in installer | Anika Henke | 2013-11-09 |
| | | | |||
* | | | localize some meta header titels. Fixes FS#2409 | Gerrit Uitslag | 2013-10-31 |
| | | | |||
* | | | removed unused lang string (authmodfailed) | Anika Henke | 2013-09-03 |
| | | | |||
* | | | Fix CodeSniffer violations | Matt Perry | 2013-08-20 |
| | | | | | | | | | | | | | | | Remove whitespace from end of lines to reduce the number of CodeSniffer violations. | ||
* | | | Merge branch 'FS#2751' of git://github.com/splitbrain/dokuwiki into ↵ | Andreas Gohr | 2013-08-02 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull-request-245 * 'FS#2751' of git://github.com/splitbrain/dokuwiki: coding corrections. correct type hint, remove unused variable assignment de/de-informal: localization updates (delete user function) unit tests for self deleting of user accounts FS#2751 - self deletion of user account | ||
| * | | | FS#2751 - self deletion of user account | Christopher Smith | 2013-07-31 |
| | |/ | |/| | |||
* / | | added aria attributes to edit mode | Anika Henke | 2013-08-01 |
|/ / | |||
* / | Language files: insignificant fixes | Kiril LastName | 2013-03-06 |
|/ | |||
* | added option to enable automatic popularity data in installer | Andreas Gohr | 2012-12-07 |
| | |||
* | Re-phrased "no license" installer text | Hakan Sandell | 2012-12-02 |
| | |||
* | Merge pull request #119 from whoopdedo/installerstrings | Andreas Gohr | 2012-12-02 |
|\ | | | | | Translatable string for "None" license selection | ||
| * | Translatable string for "None" license selection | Tom N Harris | 2012-07-17 |
| | | | | | | | | | | The position of the option was moved to the end of the list so the English label "None of the above" will make sense. | ||
* | | Merge branch 'guide' of git://github.com/splitbrain/dokuwiki into ↵ | Andreas Gohr | 2012-11-18 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull-request-118 * 'guide' of git://github.com/splitbrain/dokuwiki: changed semicolon to colon in link to welcome page to make it less confusing added initial pages to not be ignored by git improved welcome text added welcome page changed the link in the installer to point to wiki:welcome Conflicts: inc/lang/fr/lang.php | ||
| * | | changed semicolon to colon in link to welcome page to make it less confusing | Anika Henke | 2012-11-18 |
| | | | |||
| * | | changed the link in the installer to point to wiki:welcome | Andreas Gohr | 2012-07-14 |
| |/ | |||
* / | Use hardcoded plugin loading error message as $lang isn't initialized | Michael Hamann | 2012-09-08 |
|/ | | | | | | | | When loading plugins, $lang might not be initialized yet, so use a hardcoded error message instead, especially as this error should only be displayed for the admin (and then fixed). This also removes the previously localized message, it might be re-added as part of the new extension manager. |