summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'pull-request-245'Andreas Gohr2013-08-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | * pull-request-245: coding corrections. correct type hint, remove unused variable assignment HTTPClient don't pull too much bytes when no content-length is given de/de-informal: localization updates (delete user function) unit tests for self deleting of user accounts FS#2751 - self deletion of user account Conflicts: inc/lang/de-informal/lang.php inc/lang/de/lang.php
| * Merge branch 'FS#2751' of git://github.com/splitbrain/dokuwiki into ↵Andreas Gohr2013-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
| | * Merge remote-tracking branch 'origin/FS#2751' into FS#2751Christopher Smith2013-08-02
| | |\
| | | * Merge pull request #249 from lupo49/FS#2751Andreas Gohr2013-08-01
| | | |\ | | | | | | | | | | de/de-informal: localization updates (delete user function)
| | | | * de/de-informal: localization updates (delete user function)Matthias Schulte2013-08-01
| | | |/
| | * / coding corrections. correct type hint, remove unused variable assignmentChristopher Smith2013-08-02
| | |/
| | * unit tests for self deleting of user accountsChristopher Smith2013-07-31
| | |
| | * FS#2751 - self deletion of user accountChristopher Smith2013-07-31
| | |
| * | HTTPClient don't pull too much bytes when no content-length is givenAndreas Gohr2013-08-02
| | |
* | | HTTPClient don't pull too much bytes when no content-length is givenAndreas Gohr2013-08-02
| | |
* | | Merge pull request #251 from splitbrain/localizetemplateAndreas Gohr2013-08-02
|\ \ \ | | | | | | | | Localizetemplate
| * | | improve method name and phpdocsKlap-in2013-08-02
| | | |
| * | | Merge remote-tracking branch 'origin/master' into localizetemplateKlap-in2013-08-02
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into localizetemplateKlap-in2013-08-02
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Enable LANG.template.<template>.key to provide localized strings in templatesKlap-in2013-08-02
| | | | |
| * | | | localized texts for templatesKlap-in2013-08-02
| | | | |
* | | | | Merge pull request #252 from splitbrain/bi-directionalityAndreas Gohr2013-08-02
|\ \ \ \ \ | | | | | | | | | | | | fixed some bi-directionality issues
| * | | | | fixed some bi-directionality issuesAnika Henke2013-08-02
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some issues which occur whenever RTL and LTR languages could potentially be mixed, using the HTML5 `<bdi>` element. This element is currently only supported by Chrome and Firefox. The old and only partially working fix for tpl_breadcrumbs() was removed in favour of this solution.
* | | | | Merge pull request #255 from splitbrain/usermanager_bugAndreas Gohr2013-08-02
|\ \ \ \ \ | | | | | | | | | | | | Usermanager bug fix
| * | | | | improve html structure and styling for add & edit user notesChristopher Smith2013-08-02
| | | | | | | | | | | | | | | | | | | | | | | | made necessary by PR#254 which adds content below these notes.
| * | | | | usermanager: fix an issue where edit user table would incorrectly show the ↵Christopher Smith2013-08-02
| | | | | | | | | | | | | | | | | | | | | | | | password blank message
* | | | | | Merge pull request #256 from lupo49/masterAndreas Gohr2013-08-02
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | de/de-informal/en: Removed redundant suffixes in TOC of configuration manager / Synchronize terms in de and de-informal
| * | | | | de/de-informal/en: Removed redundant suffixes in TOC of configurationMatthias Schulte2013-08-02
| | | | | | | | | | | | | | | | | | | | | | | | manager / Synchronize terms in de and de-informal
* | | | | | Merge pull request #253 from lupo49/masterAndreas Gohr2013-08-02
|\| | | | | | |_|/ / / |/| | | | de/de-informal updates: Replace "Nutzer" with more common word "Benutzer" / fix several typos / Fixes FS#2821
| * | | | de/de-informal updates: Replace "Nutzer" with more common word "Benutzer"Matthias Schulte2013-08-02
| | | | | | | | | | | | | | | | | | | | / fix several typos / Fixes FS#2821
* | | | | small fix for pagetools in RTL languagesAnika Henke2013-08-02
| | | | |
* | | | | FS#2802 correctly fix tar testsAndreas Gohr2013-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the DokuWiki install was in a deep namespace, the used path name could land in the >100 char limit and trigger ustar format where the filename and directory name are split. This would fail the test.
* | | | | Revert "translation update"Andreas Gohr2013-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d6d855093f24c6c3f608d005189385959a7efbf7. I guess it was a bit too early to think straight :-/
* | | | | Merge pull request #250 from dokuwiki-translate/lang_update_6Andreas Gohr2013-08-01
|\ \ \ \ \ | |_|_|/ / |/| | | | Translation update (zh-tw)
| * | | | translation updateDokuWiki Translation2013-08-02
|/ / / /
* | | | fixed tar tests FS#2809Andreas Gohr2013-08-01
| | | | | | | | | | | | | | | | | | | | Tars strip the leading slash so the tests where wrong. Not sure why they stilldid work sometimes
* | | | Merge pull request #247 from splitbrain/FS#2766Anika Henke2013-08-01
|\ \ \ \ | |_|/ / |/| | | Improve nofollow behaviour for ?do=index
| * | | simplify commentChristopher Smith2013-08-01
| | | |
| * | | include namespace links when index access from the wiki start pageChristopher Smith2013-08-01
| | | | | | | | | | | | | | | | and no automatic sitemap.xml is being generated.
| * | | Improve nofollow behaviour for ?do=indexChristopher Smith2013-08-01
| |/ / | | | | | | | | | | | | | | | | | | In response to FS#2766 - make namespace links in the browser sitemap nofollow - remove nofollow from browser sitemap link on the wiki start page when sitemap.xml generation is disabled
* | | prevent overlong select boxes (FS#2817)Anika Henke2013-08-01
| | |
* | | Brazilian Portuguese language updateFrederico Guimarães2013-08-01
| | |
* | | added default icon to pagetoolsAnika Henke2013-08-01
| | |
* | | use http_build_query() in HTTPClientAndreas Gohr2013-08-01
| | | | | | | | | | | | this ensures nested POST data is correctly encoded
* | | Merge pull request #238 from splitbrain/logjserrorsChristopher Smith2013-08-01
|\ \ \ | | | | | | | | In debug mode: catch and log JS errors with file information
| * | | Don't recommend the deprecated default template for JS debuggingMichael Hamann2013-07-30
| | | |
| * | | In debug mode: catch and log JS errors with file informationMichael Hamann2013-07-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When debugging is enabled (allowdebug enabled) JS errors are now catched for each non-core JS file and logged with the additional information from which file they came. This should make it easier to find out which plugin is the cause for broken JS code. The feature isn't enabled by default as defining functions inside try-clauses isn't allowed in strict mode and causes a warning at least in Firefox.
* | | | HTTPClient: Implement handling of two-dimensional data arraysMichael Hamann2013-08-01
| | | |
* | | | Fix loading for helper components with loadHelper()Michael Hamann2013-08-01
| | | | | | | | | | | | | | | | | | | | The check if the plugin is enabled is done later in the plugin controller anyway.
* | | | Merge pull request #194 from splitbrain/loggedin-classChristopher Smith2013-08-01
|\ \ \ \ | | | | | | | | | | added loggedIn class to main tpl container
| * | | | improved coding style on tpl_classes()Anika Henke2013-08-01
| | | | |
| * | | | added tpl_classes() to return useful layout classesAnika Henke2013-07-21
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into loggedin-classAnika Henke2013-07-21
| |\| | |
| * | | | Merge remote-tracking branch 'origin/master' into loggedin-classAnika Henke2013-06-02
| |\ \ \ \
| * | | | | added loggedIn class to main tpl containerAnika Henke2013-03-04
| | | | | |