aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/ucp.php
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | [ticket/11103] Move UCP Notification Options to Board Preferences tabNathan Guse2012-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename to "Edit notification options" for consistency PHPBB3-11103
| * | | | | [ticket/11103] Language key needed in the UCPNathan Guse2012-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | [ticket/11103] Fix module setup, add explanation to templateNathan Guse2012-09-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | [ticket/11103] Some tweaks to the template outputNathan Guse2012-09-261-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | [ticket/11103] More work on the UCP Notifications pageNathan Guse2012-09-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-091-4/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * | | | | [ticket/10679] Add new permission for changing profile field informationJoas Schilling2012-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setting is copied from "Can use signature" PHPBB3-10679
| * | | | | [ticket/10771] fix remember me languageDhruv2012-12-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10771
| * | | | | [ticket/10771] use remember me in ucpDhruv2012-12-021-4/+4
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-10771
* | | | | [feature/avatars] Change gravatar explain as discussed in PRMarc Alexander2012-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
* | | | | [feature/avatars] Add missing language variables for avatarsMarc Alexander2012-11-161-0/+15
|/ / / / | | | | | | | | | | | | PHPBB3-10018
* | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| * | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-0/+1
| |\ \ | | | | | | | | | | | | | | | | * Senky/ticket/10568: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| | * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10568
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-09-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10873] Change language for notice about undelivered, deleted PM.
| * | | [ticket/10873] Change language for notice about undelivered, deleted PM.David King2012-08-211-1/+1
| |/ / | | | | | | | | | | | | | | | See the ticket for my reasoning. PHPBB3-10873
* | | [feature/new-tz-handling] Remove additional marking of selected itemsJoas Schilling2012-07-181-1/+0
| | | | | | | | | | | | PHPBB3-9558
* | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-181-0/+7
|\ \ \ | | |/ | |/| | | | feature/new-tz-handling
| * | Merge branch 'develop-olympus' into developAndreas Fischer2012-06-211-0/+1
| |\ \ | | |/ | | | | | | | | | * develop-olympus: [ticket/10935] Limit number of PM rules per user to 5000
| | * [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-201-0/+1
| | | | | | | | | | | | PHPBB3-10935
| * | Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' ↵Nils Adermann2012-06-111-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * github-dhruvgoel92/feature/delete-auto-logins: [feature-delete-auto-logins] adds module to database update [feature/delete-auto-logins] fixes style [feature/delete-auto-logins] improves styling [feature/delete-auto-logins] fixes language entry [feature/delete-auto-logins] fix language keys and styling [feature/delete-auto-logins] explain persistent keys in the ucp. [feature/delete-auto-logins] template added for subsilver2 [feature/delete-auto-logins] improved styling and fixes language [feature/delete-auto-logins] using loop for errors [feature/delete-auto-logins] fixes css corners [feature/delete-auto-logins] Fixes language entries [feature/delete-auto-logins] checks form key [feature/delete-auto-logins] Fixes language entries and redirection. [feature/delete-auto-logins] User can view/delete auto logins.
| | * | [feature/delete-auto-logins] fixes language entryDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9647
| | * | [feature/delete-auto-logins] fix language keys and stylingDhruv Goel2012-05-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | introduction of language variables instead of hardcoded language. PHPBB3-9647
| | * | [feature/delete-auto-logins] explain persistent keys in the ucp.Dhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | a short explaination of persistent keys in edit persistent keys section PHPBB3-9647
| | * | [feature/delete-auto-logins] improved styling and fixes languageDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Table ahs been styled. Date is now formatted properly instead of the unix timestamp being displayed earlier. fixes small mistake in language entry PHPBB3-9647
| | * | [feature/delete-auto-logins] Fixes language entriesDhruv Goel2012-05-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed language entries so that UI shows persistent login keys instead of autologin keys. PHPBB3-9647
| | * | [feature/delete-auto-logins] User can view/delete auto logins.Dhruv Goel2012-05-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | User has an extra option in UCP->Profile to view the auto logins and clear them. PHPBB3-9647
* | | | [feature/new-tz-handling] Introduce 2 step timezone selection using javascriptJoas Schilling2012-06-181-0/+3
| | | | | | | | | | | | | | | | PHPBB3-9558
* | | | [feature/new-tz-handling] Fix selecting and validating of timezone in UCPJoas Schilling2012-06-181-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9558
* | | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-041-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| * | | [feature/new-tz-handling] Removed DST and numeric timezone-related language.Oleg Pudeyev2012-03-141-1/+0
| | | | | | | | | | | | | | | | PHPBB3-9558
| * | | [feature/new-tz-handling] Preselect a timezone in registration.Oleg Pudeyev2012-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Javascript to obtain client's timezone offset and select the first timezone in our list with that offset. Changes for prosilver only. The javascript file should be shared between styles. PHPBB3-9558
* | | | Merge PR #785 branch 'develop-olympus' into developOleg Pudeyev2012-05-111-1/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10835] changing "e-mail" to "email" [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry [ticket/10835] fixing misleading message in UCP Conflicts: phpBB/language/en/ucp.php
| * | [ticket/10835] changing "e-mail" to "email"Senky2012-05-111-1/+1
| | | | | | | | | | | | PHPBB3-10835
| * | [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entrySenky2012-05-071-1/+1
| | | | | | | | | | | | PHPBB3-10835
| * | [ticket/10835] fixing misleading message in UCPSenky2012-05-011-1/+2
| | | | | | | | | | | | PHPBB3-10835
* | | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-151-23/+23
| | | | | | | | | | | | | | | | | | | | | according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
* | | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-031-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-151-4/+0
| | | | | | | | | | | | | | | | PHPBB3-10535
* | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9916
* | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
|/ / / | | | | | | | | | PHPBB3-9916
* | | [ticket/10345] Remove more useless 0-casesJoas Schilling2011-11-251-2/+0
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Remove some unused 0 casesJoas Schilling2011-11-251-3/+0
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-251-10/+10
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-251-6/+14
| | | | | | | | | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
* | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-8/+25
| |/ |/| | | | | PHPBB3-10345
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+3
|\ \ | |/ | | | | | | * develop-olympus: [ticket/9361] View correct error messages when editing account information
| * [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-0/+3
| | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-0/+1
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10005] Add description to test cases [ticket/10005] Add validation of dropdown custom profile field values