aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-131-4/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (21) and others # Via Andreas Fischer (7) and others * 'develop' of github.com:phpbb/phpbb3: (56 commits) [ticket/11015] Move comment in the right place. [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31 [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli. [ticket/11015] Change permission adding in database updater to new style. [ticket/11015] Change more docblocks to phpbb_db_driver. [ticket/11015] Installer still needs 3.0-style dbms name. [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11015] Include functions.php because it is not always included. [ticket/11265] Add assertions for board installation success. [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager [ticket/11015] Convert database drivers to new spelling in post setup sync. [ticket/11015] Convert connect test to the new syntax. [ticket/11015] Restore whitespace to avoid conflict when merging develop. [ticket/10975] Add a test for viewing a profile. [ticket/10975] Test restricting by first character. [ticket/10975] Avoid rewriting global config twice. [ticket/10975] Test memberlist, not user creation. [ticket/10975] Some quick tests to check the memberlist behaviour [ticket/10491] Make recreate_database static. [ticket/11088] Pass required objects in as arguments ... Conflicts: phpBB/install/database_update.php
| * | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-072-4/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-102-32/+35
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | | Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-10-091-1/+1
| |\ \ \ \ \ \
| * | | | | | | [ticket/11103] ACP option to enable/disable notifications output in headerNathan Guse2012-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-12-203-8/+11
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission-rebase * 'develop' of https://github.com/phpbb/phpbb3: (544 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [ticket/11285] Use more granularity in dependency checks in compress test [ticket/10880] The m_approve permisson no longer implies f_noapprove. [ticket/10803] Show failure message until user dismisses it [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [ticket/10954] Miscellaneous coding fixes [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [ticket/10763] Use self when calling get_extension() in filespec class [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events ... Conflicts: phpBB/install/database_update.php phpBB/posting.php
| * | | | | | | [ticket/11088] Changed "file extensions" to "attachment extensions"David King2012-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11088
| * | | | | | | [ticket/11088] Fix the database updater to correctly manipulate the modulesDavid King2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11088
| * | | | | | | [ticket/11088] Removed added spaceDavid King2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11088
| * | | | | | | [ticket/11088] Move style, extension and language pack management to customiseDavid King2012-12-121-5/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of being separated, these related ACP modules are now grouped intuitively. PHPBB3-11088
| * | | | | | [ticket/10679] Add new permission for changing profile field informationJoas Schilling2012-12-061-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The setting is copied from "Can use signature" PHPBB3-10679
| * | | | | [ticket/10771] fix remember me languageDhruv2012-12-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10771
| * | | | | [ticket/10771] use remember me in acpDhruv2012-12-021-4/+4
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-10771
* | | | | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-105-37/+148
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * | | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-0620-300/+410
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
| | * | | | [ticket/11156] Delete "Misc" tab of forum based permissions + move itemsRMcGirr832012-10-291-27/+26
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-11156
| | * | | Merge PR #1004 branch 'develop-olympus' into developOleg Pudeyev2012-10-091-1/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | * develop-olympus: [ticket/11131] Correctly use indefinite article for "warning".
| | | * [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11131
| | * | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Fix the language changes that were lost previously
| | | * | [ticket/11021] Fix the language changes that were lost previouslyNathan Guse2012-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change U_HOME to U_SITE_HOME PHPBB3-11021
| | * | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-1/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
| | | * | [ticket/11021] Better language strings for site home url/textNathan Guse2012-09-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the logo title to be {L_HOME} if {U_HOME} is used. Check if the Home text is instead of just equal to false when outputting it to the template PHPBB3-11021
| | | * | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11021
| | * | | [ticket/10631] Use exceptions for errors. Build action list dynamically.Nathan Guse2012-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Remove references to delete extensionNathan Guse2012-09-011-5/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Make the enable/disable/purge notices more visable.Nathan Guse2012-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Validation for extensionsNathan Guse2012-09-011-20/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Stagger the enable/disable/purge for extensionsNathan Guse2012-09-011-4/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Various tidbits and cleanup on the acp extensions managerNathan Guse2012-09-011-103/+104
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] A few more extension admin changesMichael Cullum2012-09-011-17/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Fixing some items mentioned in PRMichael Cullum2012-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Update extensions language file for some issues foundMichael Cullum2012-09-011-7/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Rename language file to extensions.phpMichael Cullum2012-09-011-0/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Removing ?> at end of customisations language fileMichael Cullum2012-09-011-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Some rewording of extensions admin languageMichael Cullum2012-09-011-13/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| | * | | [ticket/10631] Update extensions admin languageMichael Cullum2012-09-011-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added details page information, added a new line at end of file and removed some whitespace. PHPBB3-10631
| | * | | [ticket/10631] Adding an extensions adminMichael Cullum2012-09-013-0/+102
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [feature/prune-users] Fixed whitespace in language file.Oleg Pudeyev2011-05-081-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | Merge branch 'develop' into feature/prune-usersOleg Pudeyev2011-05-085-6/+43
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (170 commits) [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined. [feature/attachment-management-no-reassignment] Handle privacy and some more. [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable. [ticket/10147] Corrected a typo in includes/functions_template.php. [ticket/10141] Save a hash lookup when value is not in cache. [ticket/10143] Added tests for storing a previously deleted value in db cache. [ticket/10105] Update AIM express link. [ticket/10105] Update AIM application download link. [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN. [ticket/10141] Split double-assignment into conditional and unconditional part. [ticket/10141] Use a cache in $auth->_fill_acl() for better performance. [ticket/9961] Create log entries when users are activated. [ticket/10139] Make signatures of set_atomic() consistent by using $new_value. [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object [ticket/10006] Remove unneeded if statements [ticket/10006] Remove return values [ticket/10006] More testing [ticket/10006] Tweak the tests a bit [ticket/10006] Add phpbb_config::delete [ticket/7941] Added @return to generate_board_url docstring. ...
| * | | | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-081-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust two language strings for ACP prune feature to include descriptions for new features. PHPBB3-9622
* | | | | | [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)Joas Schilling2012-11-031-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderationJoas Schilling2012-10-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Implement the ability to soft-delete and restore postsJosh Woody2012-08-292-0/+7
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | The soft delete feature seems to work. Tests are pending. A real icon is pending. Add the permissions and the interface to soft-delete posts. Also able to restore posts via the MCP queue PHPBB3-9657
* | | | | [ticket/11032] add sphinx errors to error logDhruv2012-08-011-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11032
* | | | | Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into developOleg Pudeyev2012-07-271-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/feature/sphinx-fulltext-search: (57 commits) [feature/sphinx-fulltext-search] add sphinx to Authors file [feature/sphinx-fulltext-search] add sphinxapi.php file [feature/sphinx-fulltext-search] fix auth bug [feature/sphinx-fulltext-search] remove unused property [feature/sphinx-fulltext-search] use 9312 as default port [feature/sphinx-fulltext-search] fix language of host config [feature/sphinx-fulltext-search] fix sphinx for arbitary host [feature/sphinx-fulltext-search] coding changes acc to phbb conventions [feature/sphinx-fulltext-search] fixing comments [feature/sphinx-fulltext-search] add trailing slash in language [feature/sphinx-fulltext-search] improve port option [feature/sphinx-fulltext-search] remove stopwords and config path [feature/sphinx-fulltext-search] makes sql host configurable [feature/sphinx-fulltext-search] use readonly instead of disabled [feature/sphinx-fulltext-search] fix language keys' typo [feature/sphinx-fulltext-search] remove note from db_tools [feature/sphinx-fulltext-search] add support for postgres [feature/sphinx-fulltext-search] add pgsql functionality [feature/sphinx-fulltext-search] use Update in sphinx query [feature/sphinx-fulltext-search] use CASE instead of IF ...
| * | | | | [feature/sphinx-fulltext-search] use 9312 as default portDhruv2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses 9312 instead of 3312 as default port for searchd to listen on according to latest sphinx documentation. Use filename sphinxapi.php instead of old one. PHPBB3-10946
| * | | | | [feature/sphinx-fulltext-search] fix language of host configDhruv2012-07-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10946
| * | | | | [feature/sphinx-fulltext-search] add trailing slash in languageDhruv2012-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10946
| * | | | | [feature/sphinx-fulltext-search] improve port optionDhruv2012-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use listen instead of deprecated port value in sphinx config file. sqlhost uses default $dbhost. PHPBB3-10946
| * | | | | [feature/sphinx-fulltext-search] remove stopwords and config pathDhruv2012-07-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove stopwords and config_path options from ACP. PHPBB3-10946