aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-0/+1
|\
| * [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-121-1/+1
| * [ticket/11745] Group request approved notificationNathan Guse2013-07-271-0/+1
* | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-121-0/+1
|\ \ | |/
| * [ticket/11744] LanguageNathan Guse2013-07-271-1/+1
| * [ticket/11744] Group join request notificationNathan Guse2013-07-261-0/+1
* | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-241-0/+1
* | [feature/oauth] Fix indentation on new language constantsJoseph Warner2013-08-241-7/+7
* | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-0/+2
* | [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-0/+2
* | [feature/oauth] Move language constants for oauth services to common.phpJoseph Warner2013-07-241-0/+3
* | [feature/oauth] Update error message with actual errorJoseph Warner2013-07-231-0/+1
|/
* Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-131-3/+3
|\
| * Merge branch 'develop-olympus' into developNathaniel Guse2013-07-121-3/+3
| |\
| | * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-3/+3
* | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-111-0/+7
|\ \ \ | |/ /
| * | 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
* | | [ticket/9657] Include poster name in "deleted post" messageJoas Schilling2013-03-111-2/+2
* | | [ticket/9657] Fix some language problems and inconsistencesJoas Schilling2013-03-111-1/+1
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-051-0/+3
|\ \ \ | |/ /
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-0/+24
| |\ \
| * | | [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
| |\ \ \
| * | | | [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 branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-031-0/+35
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
| |\ \ \ \ | | |/ / /
| | * | | [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
| | | |/ | | |/|
| * | | 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