aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/10271] AJAXified the styles tab in the ACP.Callum Macrae2012-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10271
| * | | | | [ticket/10271] AJAXified various deletions in the ACP.Callum Macrae2012-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following places have had deletion AJAXified: * Smilies and icons * Word censors * BBCodes * Attachment groups * Groups * Admin / User / Moderator / Forum roles * Report / denial reasons * Module management * Custom profile fields PHPBB3-10271
| * | | | | Merge branch 'develop-olympus' into developDavid King2012-03-292-10/+10
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/language/en/acp/common.php
| | * | | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> ↵HTF2012-03-242-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions language file as per ticket. PHPBB3-10129
* | | | | | [feature/merging-style-components] Changing acp_styles textVjacheslav Trushkin2012-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing acp styles welcome message a little bit. PHPBB3-10632
* | | | | | [feature/merging-style-components] Adding new language variablesVjacheslav Trushkin2012-03-142-38/+28
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Adding new language variables for acp_styles and removing some unused variables PHPBB3-10632
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-091-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/7432] Explain what users are inactive in more detail.
| * | | | Merge remote-tracking branch 'p/ticket/7432' into develop-olympusAndreas Fischer2012-03-091-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/7432: [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/7432] Explain what users are inactive in more detail.
| | * | | | [ticket/7432] Delete redundant reference to "appropriate menu item".Oleg Pudeyev2012-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7432
| | * | | | [ticket/7432] Explain what users are inactive in more detail.Oleg Pudeyev2011-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7432
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-061-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10563] Show deactivated styles below active styles in acp
| * | | | | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-021-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Separates active and deactivated styles in styles list in acp PHPBB3-10563
* | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-3119-38/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-9916
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-081-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10511] Fix a grammar defect in permissions language.
| * | | | Merge remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10511: [ticket/10511] Fix a grammar defect in permissions language.
| | * | | | [ticket/10511] Fix a grammar defect in permissions language.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10511
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-081-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9876] Distinctly name user and forum roles for newly registered users.
| * | | | | [ticket/9876] Distinctly name user and forum roles for newly registered users.Oleg Pudeyev2011-12-031-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9876
* | | | | [ticket/10345] Remove more useless 0-casesJoas Schilling2011-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10345
* | | | | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-253-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
* | | | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-1/+5
| |/ / / |/| | | | | | | | | | | PHPBB3-10345
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| * | | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10239: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| | * | | [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10239
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-171-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10157] Add notification to update cpfs when installing a language.
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-171-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10157: [ticket/10157] Add notification to update cpfs when installing a language.
| | * | | | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-171-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently just copy the language-strings from the default language. But the admin should be reminded to change them. PHPBB3-10157
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-151-0/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| * | | | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10419: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| | * | | | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10419
| | * | | | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10419
| | * | | | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10419
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10087] Organize bans in acp_baninto optgroups
| * | | | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-131-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * igorw/ticket/10087: [ticket/10087] Organize bans in acp_baninto optgroups
| | * | | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-111-0/+3
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-10087
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-011-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10410: [ticket/10410] Add option to display users in their first teampage group
| * | | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10410
* | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-201-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10390: [ticket/10390] Revert back to escaped script tags inside document.write [ticket/10390] Fix wording: fallback should be fall back [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback [ticket/10390] Drop http protocol for Microsoft's CDN option [ticket/10390] Reword the language for jQuery host/server options [ticket/10390] Fix a type-o - captialize AJAX [ticket/10390] Improve the jQuery CDN url generation function [ticket/10390] Move jQuery version definition [ticket/10390] Allow option for jQuery to be hosted by a remote CDN Conflicts: phpBB/install/database_update.php
| * | | | | | [ticket/10390] Fix wording: fallback should be fall backMatt Friedman2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10390
| * | | | | | [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACPMatt Friedman2011-09-271-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jQuery will now be available via remote CDN from Google. Microsoft and jQuery CDNs have been removed, so we can simplify this option for the user. Default mode is NO so the copy of jQuery included with phpBB is served by default. PHPBB3-10390
| * | | | | | [ticket/10390] Reword the language for jQuery host/server optionsMatt Friedman2011-09-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword some of the language used for the description and pull-down options to try and make it more clear to users that they have the option to use jQuery from their own server with the copy included with phpBB, or from one of the remote CDN servers. PHPBB3-10390
| * | | | | | [ticket/10390] Fix a type-o - captialize AJAXMatt Friedman2011-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AJAX should be capitalized where it appears in the ACP as the option: "Google AJAX API CDN" PHPBB3-10390
| * | | | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to the ACP so admins can choose to host jQuery from the local version shipped with phpBB, or via a popular CDN. PHPBB3-10390
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-171-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | * develop-olympus: [ticket/9525] Minimum post length 0 is accepted but not working.
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-171-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9525: [ticket/9525] Minimum post length 0 is accepted but not working.
| | * | | | | [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-141-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-9525
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * develop-olympus: [ticket/8094] Remove ambiguity of "phpBB has no categories"
| * | | | [ticket/8094] Remove ambiguity of "phpBB has no categories"Igor Wiedler2011-10-131-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-8094
* | | | [feature/remove-db-styles] Update language to reflect removal of db storage.Chris Smith2011-09-201-18/+6
| | | | | | | | | | | | | | | | PHPBB3-9741
* | | | [feature/remove-db-styles] Mark log entrys as deprecated.Chris Smith2011-09-201-0/+6
| | | | | | | | | | | | | | | | PHPBB3-9741