aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/ucp.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-1/+24
|\
| * [ticket/11103] Few more minor language thingsNathan Guse2013-02-281-3/+3
| * Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-261-1/+0
| |\
| | * Merge branch 'develop-olympus' into developNils Adermann2013-02-241-1/+0
| | |\
| | | * [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-041-1/+0
| | * | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-041-0/+1
| | * | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-111-1/+0
| * | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-4/+5
| |\ \ \ | | |/ /
| * | | [ticket/11103] Use phpBB Container to load types/methodsNathaniel Guse2012-11-091-2/+2
| * | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-2/+2
| * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-181-0/+1
| |\ \ \
| * | | | [ticket/11103] U_VIEW_ALL_NOTIFICATIONS LinkNathan Guse2012-10-161-1/+0
| * | | | [ticket/11103] UCP Notification option groupingNathan Guse2012-10-131-0/+3
| * | | | [ticket/11103] UCP Notification ListNathan Guse2012-10-131-0/+5
| * | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-0/+1
| * | | | [ticket/11103] Move UCP Notification Options to Board Preferences tabNathan Guse2012-10-051-1/+1
| * | | | [ticket/11103] Language key needed in the UCPNathan Guse2012-09-271-0/+1
| * | | | [ticket/11103] Fix module setup, add explanation to templateNathan Guse2012-09-271-1/+2
| * | | | [ticket/11103] Some tweaks to the template outputNathan Guse2012-09-261-11/+11
| * | | | [ticket/11103] More work on the UCP Notifications pageNathan Guse2012-09-261-0/+14
* | | | | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-091-4/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | [ticket/10679] Add new permission for changing profile field informationJoas Schilling2012-12-061-0/+1
| * | | | [ticket/10771] fix remember me languageDhruv2012-12-021-4/+4
| * | | | [ticket/10771] use remember me in ucpDhruv2012-12-021-4/+4
| | |/ / | |/| |
* | | | [feature/avatars] Change gravatar explain as discussed in PRMarc Alexander2012-11-251-1/+1
* | | | [feature/avatars] Add missing language variables for avatarsMarc Alexander2012-11-161-0/+15
|/ / /
* | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-0/+1
|\ \ \ | |/ / |/| / | |/
| * Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-0/+1
| |\
| | * [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-0/+1
* | | Merge branch 'develop-olympus' into developNils Adermann2012-09-011-1/+1
|\ \ \ | |/ /
| * | [ticket/10873] Change language for notice about undelivered, deleted PM.David King2012-08-211-1/+1
| |/
* | [feature/new-tz-handling] Remove additional marking of selected itemsJoas Schilling2012-07-181-1/+0
* | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-h...Joas Schilling2012-07-181-0/+7
|\ \
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2012-06-211-0/+1
| |\ \ | | |/
| | * [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-201-0/+1
| * | Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' ...Nils Adermann2012-06-111-0/+6
| |\ \
| | * | [feature/delete-auto-logins] fixes language entryDhruv Goel2012-05-171-1/+1
| | * | [feature/delete-auto-logins] fix language keys and stylingDhruv Goel2012-05-171-1/+3
| | * | [feature/delete-auto-logins] explain persistent keys in the ucp.Dhruv Goel2012-05-171-1/+1
| | * | [feature/delete-auto-logins] improved styling and fixes languageDhruv Goel2012-05-171-1/+1
| | * | [feature/delete-auto-logins] Fixes language entriesDhruv Goel2012-05-171-4/+4
| | * | [feature/delete-auto-logins] User can view/delete auto logins.Dhruv Goel2012-05-171-0/+4
* | | | [feature/new-tz-handling] Introduce 2 step timezone selection using javascriptJoas Schilling2012-06-181-0/+3
* | | | [feature/new-tz-handling] Fix selecting and validating of timezone in UCPJoas Schilling2012-06-181-0/+1
* | | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into fe...Joas Schilling2012-06-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [feature/new-tz-handling] Removed DST and numeric timezone-related language.Oleg Pudeyev2012-03-141-1/+0
| * | | [feature/new-tz-handling] Preselect a timezone in registration.Oleg Pudeyev2012-03-141-0/+1
* | | | Merge PR #785 branch 'develop-olympus' into developOleg Pudeyev2012-05-111-1/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | [ticket/10835] changing "e-mail" to "email"Senky2012-05-111-1/+1
| * | [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entrySenky2012-05-071-1/+1