aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'vsephpbb/ticket/11904' into develop-ascraeusJoas Schilling2014-03-221-1/+1
|\ | | | | | | | | * vsephpbb/ticket/11904: [ticket/11904] Update explanation for what Allow CDN does
| * [ticket/11904] Update explanation for what Allow CDN doesMatt Friedman2014-03-161-1/+1
| | | | | | | | PHPBB3-11904
* | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-201-1/+0
|\ \ | | | | | | [ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
| * | [ticket/8309] Removing key with similar function to avoid redundancygeetakshi2014-03-171-1/+0
| | | | | | | | | | | | PHPBB3-8309
| * | [ticket/8309] Moving key to get keys in alphabetical ordergeetakshi2014-03-161-1/+1
| | | | | | | | | | | | PHPBB3-8309
| * | [ticket/8309] Renaming "Last visit" to "Last activity"geetakshi2014-03-161-1/+1
| |/ | | | | | | PHPBB3-8309
* | Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into ↵Joas Schilling2014-03-191-2/+0
|\ \ | | | | | | | | | | | | | | | | | | develop * netdeamon/ticket/12198-Language-issue: [ticket/12198] Language issue in en/common.php
| * | [ticket/12198] Language issue in en/common.phpnetdeamon2014-03-181-2/+0
| |/ | | | | | | | | | | Deleted lines as they are not needed anymore. PHPBB3-12198
* | [ticket/12269] Delete folder mods in languagenetdeamon2014-03-171-0/+0
|/ | | | | | Deleted mods folder in phpbb/language/en/. PHPBB3-12269
* Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-141-9/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/9871-2: [ticket/9871] Can set current version to use instead of the phpBB version [ticket/9871] Fix indentation on comment [ticket/9871] Fix test name [ticket/9871] Split fast and slow version tests [ticket/9871] Option to force the stability when checking for updates [ticket/9871] Allow setting the host/file to load for the version class [ticket/9871] Restore get_remote_file_test [ticket/9871] Fix tests [ticket/9871] Typehint and comment on var types [ticket/9871] Mark test as slow [ticket/9871] Restore phpbb_version_compare [ticket/9871] Restore get_remote_file [ticket/9871] Use $request->variable instead of request_var [ticket/9871] Update version check file to use json format
| * [ticket/9871] Update version check file to use json formatNathan Guse2014-02-191-9/+3
| | | | | | | | PHPBB3-9871
* | [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.phpCrizzo2014-03-131-43/+43
| | | | | | | | PHPBB3-11787
* | Merge remote-tracking branch 'crizz0/ticket/8785' into developJoas Schilling2014-03-131-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/8785: [ticket/8785] Deletes additional add and add_bcc buttons [ticket/8785] Fixed problem with add empty.png and travis will now pass [ticket/8785] and again a fresh line [ticket/8785] Just one blank line [ticket/8785] pm_layout.html back to more standard code [ticket/8785] <hr /> will only displayed when needed [ticket/8785] Adds blank lines at file end [ticket/8785] Adds a new optical improvement, new file and fixes html bugs [ticket/8785] Adds two <hr /> to seperate recipients and BCC [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px [ticket/8785] Little spaces mistake [ticket/8785] Rebuilding posting_editor pm head + new language vars
| * | [ticket/8785] Rebuilding posting_editor pm head + new language varsCrizzo2014-03-031-1/+5
| |/ | | | | | | PHPBB3-8785
* | Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-132-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8041] Merge item name into "Return to" string for better translations * nickvergessen/ticket/8041: [ticket/8041] Add space/tabs after => in array list [ticket/8041] Wrap forum name, topic title and pm folder name with quotes [ticket/8041] Merge item name into "Return to" string for better translations
| * | [ticket/8041] Wrap forum name, topic title and pm folder name with quotesJoas Schilling2014-03-121-1/+2
| | | | | | | | | | | | PHPBB3-8041
| * | [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-122-2/+1
| | | | | | | | | | | | PHPBB3-8041
* | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-131-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message. Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * \ \ Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-131-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12176: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message.
| | * | | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12176
* | | | | Merge remote-tracking branch 'vsephpbb/ticket/12244' into developJoas Schilling2014-03-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12244: [ticket/12244] Rename extensions manager tab [ticket/12244] Rename link to Extensions Manager in the ACP
| * | | | | [ticket/12244] Rename extensions manager tabMatt Friedman2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12244
| * | | | | [ticket/12244] Rename link to Extensions Manager in the ACPMatt Friedman2014-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12244
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-121-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] using correct variable in includes/functions_module.php too [ticket/10549] changed "right" to "incorrect" Conflicts: phpBB/includes/functions_module.php
| * | | | [ticket/10549] changed "right" to "incorrect"Crizzo2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10549
* | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2014-03-101-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/12106] Combined first and second sentence [ticket/12106] Adds a explaination that admin/mods still able to use the board Conflicts: phpBB/language/en/acp/board.php
| * | | | Merge pull request #2105 from Crizz0/ticket/12106Nathan Guse2014-03-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | [ticket/12106] Adds a explaination that admin/mods still able to use the...
| | * | | | [ticket/12106] Combined first and second sentenceCrizzo2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12106
| | * | | | [ticket/12106] Adds a explaination that admin/mods still able to use the boardCrizzo2014-03-101-1/+1
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-12106
* | | | | Merge branch 'develop-olympus' into developNathan Guse2014-03-101-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] Adds language variables Conflicts: phpBB/includes/functions_module.php
| * | | | [ticket/10549] Adds language variablesCrizzo2014-03-101-0/+3
| |/ / / | | | | | | | | | | | | PHPBB3-10549
* | | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-062-1/+4
| | | | | | | | | | | | | | | | PHPBB3-12251
* | | | [ticket/12236] Fix language key name for Yahoo MessangerJoas Schilling2014-03-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12236
* | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-054-7/+0
| | | | | | | | | | | | | | | | PHPBB3-12236
* | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-053-5/+1
| | | | | | | | | | | | | | | | PHPBB3-12237
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-056-23/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html
| * | | | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-044-9/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12235
| * | | | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-034-7/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-032-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-284-7/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12234
| * | | | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-281-0/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages PHPBB3-12233
* | | | Merge pull request #2057 from nickvergessen/ticket/12226Nils Adermann2014-03-052-5/+10
|\ \ \ \ | |_|_|/ |/| | | Ticket/12226 Split language strings to correctly allow multiple plural rules
| * | | [ticket/12227] "X from Y messages" should be "X out of Y messages"Joas Schilling2014-02-241-6/+6
| | | | | | | | | | | | | | | | PHPBB3-12227
| * | | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-242-5/+10
| |/ / | | | | | | | | | PHPBB3-12226
* | | [ticket/11645] Rename .MODs tab in ACP to ExtensionsMatt Friedman2014-03-021-1/+1
|/ / | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-11645 PHPBB3-11645
* | [ticket/12206] Fix mismatched Plupload language vars preventing localization.Cesar G2014-02-171-2/+2
| | | | | | | | PHPBB3-12206
* | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-101-0/+2
| | | | | | | | PHPBB3-12169
* | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-101-2/+0
| | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-2/+0
| | | | | | | | PHPBB3-12115
* | [ticket/12115] Remove old language stringsJoas Schilling2014-02-061-2/+0
| | | | | | | | PHPBB3-12115
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-06 19:01:09 +0000