summaryrefslogtreecommitdiff
path: root/inc/lang/en
Commit message (Collapse)AuthorAge
* notloggedin lang string leftGerrit Uitslag2014-03-17
|
* Merge pull request #573 from splitbrain/FS#2437detailphprefactorAndreas Gohr2014-03-16
|\ | | | | refactor detail.php to template.php
| * refactor detail.php to template.phpGerrit Uitslag2014-02-25
| | | | | | | | | | - refactor detail en mediamanager link creation - refactor metadata listing
* | Merge branch 'master' into diff_navigationAndreas Gohr2014-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
| * | remove placeholder van denied.txtGerrit Uitslag2014-03-07
| | |
| * | added login form at denied access pageGerrit Uitslag2014-03-04
| | | | | | | | | | | | - restore lang string as well
| * | Show 'not logged in' only when logged out FS#2124Gerrit Uitslag2014-02-25
| |/
* | remove unnecessary strings and Dutch diff strings (better later once)Gerrit Uitslag2014-02-17
| |
* | replace arrows in names of diff links by textsGerrit Uitslag2014-02-17
| |
* | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
|\|
| * renamed code button to monospace FS#2934 and many othersAndreas Gohr2014-02-05
| | | | | | | | Let's stop confusing people with what this button does
* | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2013-11-19
|\|
| * swapped logic for allowing/disabling registration in installerAnika Henke2013-11-17
| |
| * changed user approval option to disable registration option in installerAnika Henke2013-11-17
| |
| * added possibility to approve users to ACL policies in installerAnika Henke2013-11-09
| |
| * localize some meta header titels. Fixes FS#2409Gerrit Uitslag2013-10-31
| |
| * removed unused lang string (authmodfailed)Anika Henke2013-09-03
| |
| * Fix CodeSniffer violationsMatt Perry2013-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 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
| | * FS#2751 - self deletion of user accountChristopher Smith2013-07-31
| | |
| * | added aria attributes to edit modeAnika Henke2013-08-01
| |/
* | merge master in branchKlap-in2013-07-14
|\|
| * Language files: insignificant fixesKiril LastName2013-03-06
| |
* | Added diff navigationKlap-in2013-01-27
|/ | | | Navigation links to move to previous edit before revision in left column or next/last edit after revision in right column.
* Merge branch 'subscription' Pull Request #125Andreas Gohr2013-01-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * subscription: (25 commits) link directly to subscription management in mails only use mailfromnobody for bulk mails added missing context for list mails readded mailfromnobody to subscription sending correctly escape diffs in HTML mails fixed lists in HTML mails simplified subscription->add() code a bit comment adjusted removed unused vars removed data parameter in subscription_handle_post() fixed tests some reformatting added compatibility function moved registration notification to subscription class fixed merge error in inc/auth.php consolidate more notification code in subscription class minor cleanup initialize new subscriptions with current time fixed subscription management correctly check if subscriptions are enabled ...
| * link directly to subscription management in mailsAndreas Gohr2013-01-26
| | | | | | | | | | This was updated in the english translation a while ago, but was still missing in some translations
* | added option to enable automatic popularity data in installerAndreas Gohr2012-12-07
| |
* | Re-phrased "no license" installer textHakan Sandell2012-12-02
| |
* | Merge pull request #119 from whoopdedo/installerstringsAndreas Gohr2012-12-02
|\ \ | |/ |/| Translatable string for "None" license selection
| * Translatable string for "None" license selectionTom N Harris2012-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 Gohr2012-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 confusingAnika Henke2012-11-18
| | |
| * | changed the link in the installer to point to wiki:welcomeAndreas Gohr2012-07-14
| | |
* | | improved grammar in preview text (FS#2614)Anika Henke2012-10-07
| | |
* | | Use hardcoded plugin loading error message as $lang isn't initializedMichael Hamann2012-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.
* | reworded the word 'button' to be more generic and independent from template ↵Anika Henke2012-07-15
| | | | | | | | (FS#2543)
* | fixed validation errors in the installerAnika Henke2012-07-14
|/
* added lang string for 'Sidebar'Anika Henke2012-07-08
|
* Restore page versions - add timestamp of the restored version to to the ↵lupo492012-05-08
| | | | | | summary field. This allows easier identifying of which version has been restored. (FS#2522)
* display uploadable file size in media manager FS#2425Andreas Gohr2012-04-23
|
* Merge branch 'master' into htmlmailAndreas Gohr2012-04-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (382 commits) Romanian language update Marathi language update Arabic Language Update when there's not enough space for images, make sure they stay proportional (might be FS#2480) added minimal RTL print styles (part of FS#2185) moved plugins' rtl.css to their style.css counterpart (part of FS#2185) removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary removed comments from accidentally commented lines in tpl_includeFile() removed obsolete template file added tpl_includeFile() to core Make getTitle method in remote interface public Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors. BG: language update Korean language update fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447) deleted very old (and unused) images added accidentally removed '<?php' back in (was in 57fc5edd) wrapped X-UA-Compatible meta tag with conditional comments added explanation to todo in _forms.css removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950) ... Conflicts: inc/auth.php inc/load.php
| * Merge branch 'adexpirywarn'Andreas Gohr2012-03-10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adexpirywarn: make sure AD pass expiry message is never shown twice do not hardcode profile link in AD pass expire message translatable AD expiry warning and link to update profile page Don't return any data for non-existant users do not query AD for empty user name always check expire time when configured Check password expiry times in Active Directory backend
| | * do not hardcode profile link in AD pass expire messageAndreas Gohr2012-02-17
| | | | | | | | | | | | Changing passwords might not be available.
| | * translatable AD expiry warning and link to update profile pageAndreas Gohr2011-11-07
| | |
| * | Merge branch 'resetpassword'Andreas Gohr2012-03-10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer autogenerate passwords for password reset when $conf['autopasswd'] is disabled. Instead allow to change the password online. * resetpassword: added a timelimit for password reset tokens removed commented line use correct lang string for password mismatch removed outdated language string. it has to be retranslated German translation for password reset honor autopasswd setting for resend password Conflicts: inc/lang/no/lang.php inc/lang/sl/lang.php
| | * | honor autopasswd setting for resend passwordAndreas Gohr2011-10-31
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When autopasswd is disabled, the resend password option now asks for a new password instead of autogenerating a new one and sending it by mail. Note to translators: the wording for btn_resendpwd and resendpwd changed to be more universal. English and German language files where updated - other languages need to be adjusted. Conflicts: inc/lang/en/lang.php
| * | added 5 new language strings for action tools and skip link (needs translations)Anika Henke2012-01-29
| | | | | | | | | | | | This is in preparation for the new default template. This also updates the tpl_actiondropdown() to use most of them.
| * | corrected old mediaupload introduction textAnika Henke2012-01-19
| | |
| * | localization: removed strings from old flashuploaderlupo492012-01-13
| |/
* | fixed subscriber mail signaturesAndreas Gohr2012-03-09
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 03:10:23 +0000