aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
| | | | PHPBB3-11814
* Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-023-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/language/en/email/forum_notify.txt phpBB/language/en/email/newtopic_notify.txt phpBB/language/en/email/topic_notify.txt
| * [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | | | | | | | PHPBB3-11769
* | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
|/ | | | | | This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196. PHPBB3-11821
* [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| | | | PHPBB3-11752
* [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| | | | PHPBB3-11740
* Merge remote-tracking branch 'github-marc1706/ticket/11112' into ↵Nils Adermann2013-07-135-10/+10
|\ | | | | | | | | | | | | | | prep-release-3.0.12 * github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| * [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | | | | | | PHPBB3-11112
| * [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-125-10/+10
| | | | | | | | PHPBB3-11112
* | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
|/ | | | PHPBB3-11670
* [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-123-5/+5
| | | | PHPBB3-11662
* Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-111-1/+2
|\ | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
| * [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-031-1/+2
| | | | | | | | | | | | The explanation now states that links are prefixed with the board URL. PHPBB3-8319
* | [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-031-1/+1
| | | | | | | | PHPBB3-11583
* | [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-011-1/+1
|/ | | | PHPBB3-11583
* [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-1/+1
| | | | | | | | | | | | The input length for the hex color is now limited to 6 characters and the support for colors starting with a '#' has been dropped. The allowed input length of 7 in prosilver seems to have been a relict from old ages of phpBB3. In order to have proper support for correct checking of the colour value, the new code was also ported to the ACP groups manage page. The tests have been modified to reflect the changes to the behavior of the color check. Tests for the ACP will follow. PHPBB3-11538
* [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-0/+1
| | | | | | | | | We are now using a regex with preg_match() in order to properly check if the entered color value is in hex color format or not. A proper error message is triggered if an incorrect color value is entered and the prepended '#' is removed if necessary. PHPBB3-11538
* [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-211-0/+1
| | | | | | | The error message about missing style data was not translated PHPBB3-9975
* [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-042-2/+1
| | | | PHPBB3-10896
* [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-041-0/+1
| | | | | | | Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896
* [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
| | | | | | | A improvement to the info popup which is displayed when the cursor is over the bbcode-button [list=] in the posting-editor PHPBB3-11220
* [ticket/11192] Add Tebibyte to get_formatted_filesize().Andreas Fischer2012-11-111-0/+2
| | | | PHPBB3-11192
* 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 PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-163-3/+3
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| * | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-153-3/+3
| | | | | | | | | | | | PHPBB3-8743
* | | [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
| | | | | | | | | | | | PHPBB3-11131
* | | [ticket/10873] Change language for notice about undelivered, deleted PM.David King2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | See the ticket for my reasoning. PHPBB3-10873
* | | [ticket/10943] displays searched query in search resultDhruv Goel2012-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
* | | [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* | | [ticket/10950] Delete PMs for users that have not yet read the pmJoas Schilling2012-07-201-1/+1
| |/ |/| | | | | PHPBB3-10950
* | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-201-0/+1
| | | | | | | | PHPBB3-10935
* | Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympusAndreas Fischer2012-05-312-2/+2
|\ \ | | | | | | | | | | | | | | | * naderman/ticket/10908: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| * | [ticket/10908] Document that 0 filesize configuration means limited by PHPNils Adermann2012-05-292-2/+2
| | | | | | | | | | | | PHPBB3-10908
* | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympusNils Adermann2012-05-291-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
| * | [ticket/10308] fixes language variable nameDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | Language variable has be renamed for better understanding PHPBB3-10308
| * | [ticket/10308] renames language key to USER_NO_POSTS_DELETEDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | language key renamed to make its usability more clearer. PHPBB3-10308
| * | [ticket/10308] fix language and user's total postsDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | language modified to be clear and select box disappears in case no posts by user. user's total posts are fetched using a new query. PHPBB3-10308
| * | [ticket/10308] fixes language entity.Dhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Language key has been changed and has been made more specific to avoid conflicts PHPBB3-10308
| * | [ticket/10308] Displays message to user if there are no posts.Dhruv Goel2012-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | While deletng the user, if the user has no posts in addition to the options being disabled an added message is displayed. PHPBB3-10308
* | | [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
* | Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils Adermann2012-04-202-1/+1
|\ \ | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
| * | [ticket/10797] language key rank moved to commonDhruv Goel2012-04-203-2/+1
| | | | | | | | | | | | | | | | | | | | | Language key RANK moved from memberlist to common. Removed from mcp language. PHPBB3-10797
| * | [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-161-0/+1
| | | | | | | | | | | | | | | | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* | | [ticket/10764] FAQ now mentions Area51 instead of SourceForgeAdonais Romero González2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The answer of the question "Why isn't X feature available?" in the FAQ now mentions Area51 instead of SourceForge and GitHub as the way to handle feature requests. PHPBB3-10764
* | | [ticket/10764] FAQ now mentions GitHub instead of SourceForgeAdonais Romero González2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The answer of the question "Why isn't X feature available?" in the FAQ now mentions GitHub instead of SourceForge as the way to handle feature requests. PHPBB3-10764
* | | Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympusOleg Pudeyev2012-04-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * Fyorl/ticket/10508: [ticket/10508] Marked as read message now less specific.
| * | | [ticket/10508] Marked as read message now less specific.Fyorl2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed 'The selected forums have been marked read' to 'Forums have been marked read' PHPBB3-10508