aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-0/+1
|\
| * [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-1/+1
| * [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-0/+1
* | [ticket/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-201-0/+3
* | [ticket/11413] Translate the errorNathan Guse2013-05-101-0/+1
* | Merge remote-tracking branch 'github-asperous/ticket/9975' into developNils Adermann2013-04-241-0/+1
|\ \
| * | [ticket/9975] Moved a few E_USER_ERROR errors to /languageasperous2013-04-231-0/+2
* | | Merge branch 'develop-olympus' into developNils Adermann2013-04-241-0/+1
|\ \ \ | |/ / |/| / | |/
| * [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-211-0/+1
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-0/+24
|\ \
| * \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-261-0/+1
| |\ \
| | * \ Merge branch 'develop-olympus' into developNils Adermann2013-02-241-0/+1
| | |\ \ | | | |/
| | | * [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-041-1/+1
| | | * [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-041-0/+1
| * | | [ticket/11103] Make the number of notifications strong if > 0Nathaniel Guse2013-02-131-2/+3
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-111-0/+11
| |\ \ \ | | |/ /
| * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2012-12-121-0/+2
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-201-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-0/+1
| |\ \ \ \ \ \
| * | | | | | | [ticket/11103] Message of no notifications if you have noneNathan Guse2012-10-201-0/+1
| * | | | | | | [ticket/11103] U_VIEW_ALL_NOTIFICATIONS LinkNathan Guse2012-10-161-0/+2
| * | | | | | | [ticket/11103] Make sure notifications are marked read when clicking themNathan Guse2012-10-141-2/+2
| * | | | | | | [ticket/11103] Fix some language stringsNathan Guse2012-10-141-4/+4
| * | | | | | | [ticket/11103] Finishing up report post/pm and adding report closedNathan Guse2012-10-111-2/+3
| * | | | | | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-091-1/+2
| * | | | | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-0/+1
| * | | | | | | [ticket/11103] Do not abbreviate template outputNathan Guse2012-10-041-1/+1
| * | | | | | | [ticket/11103] UCP Notification Options can now be setNathan Guse2012-09-271-1/+4
| * | | | | | | [ticket/11103] Prettify the output for prosilver.Nathaniel Guse2012-09-201-1/+2
| * | | | | | | [ticket/11103] Topic/Post in queue notificationNathan Guse2012-09-151-0/+2
| * | | | | | | [ticket/11103] Topic and post dis/approval notificationsNathan Guse2012-09-151-6/+10
| * | | | | | | [ticket/11103] Add/Update/Mark Read functions accept an array for the typeNathan Guse2012-09-141-0/+1
| * | | | | | | [ticket/11103] Quote notificationsNathan Guse2012-09-121-0/+1
| * | | | | | | [ticket/11103] Add topic ID to view post URLNathan Guse2012-09-121-1/+2
| * | | | | | | [ticket/11103] Use the language system, topic notificationsNathan Guse2012-09-091-0/+3
* | | | | | | | [feature/avatars] Use "Main" as category for avatars in root of galleryMarc Alexander2013-02-191-0/+1
* | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-071-0/+11
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-041-0/+3
| * | | | | | | [ticket/11328] Add language variables for buttonsVjacheslav Trushkin2013-01-161-0/+11
| * | | | | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-111-3/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [feature/avatars] Improve handling of incorrect input for avatarsMarc Alexander2013-01-041-0/+1
* | | | | | | [feature/avatars] Inform user of no available local avatarsMarc Alexander2013-01-041-0/+1
|/ / / / / /
* | | | | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | [feature/template-events] Changes per imkingdavid's review.Oleg Pudeyev2012-11-171-0/+1
| * | | | | [feature/template-events] Wording: wrongly -> improperly.Nathan Guse2012-11-171-1/+1
| * | | | | [feature/template-events] Handle incorrect template event identifiersErik Frèrejean2012-11-171-0/+1
| | |_|/ / | |/| | |
* | | | | Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into developOleg Pudeyev2012-12-021-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/10771] Using Remember Me instead of autologin or persistent keysHari Sankar R2012-12-021-1/+1
| | |/ / | |/| |
* | | | Merge PR #1074 branch 'develop-olympus' into developOleg Pudeyev2012-11-161-0/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|