aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631Unknown Bliss2012-09-011-1/+1
|\ | | | | | | | | | | Conflicts: phpBB/common.php phpBB/download/file.php
| * Merge branch 'develop-olympus' into developNils Adermann2012-09-011-1/+1
| |\ | | | | | | | | | | | | * develop-olympus: [ticket/10873] Change language for notice about undelivered, deleted PM.
| | * [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/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
* | Merge remote-tracking branch 'Fyorl/feature/attach-dl' into developAndreas Fischer2012-08-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/feature/attach-dl: (75 commits) [feature/attach-dl] Removed the use of some abbreviations [feature/attach-dl] Changed $files_added checks [feature/attach-dl] Renamed $post_id to $post_msg_id [feature/attach-dl] Fixed a comment [feature/attach-dl] Optimised an sql query [feature/attach-dl] Fixed the logic in an sql statement [feature/attch-dl] $forum_id cast to int [feature/attach-dl] Fixed $file_added to $files_added [feature/attach-dl] Moved definition of $archive_name [feature/attach-dl] Swapped the order of an if statement [feature/attach-dl] Cast variables to int [feature/attach-dl] Added $archive_path [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma [feature/attach-dl] Renamed $count to $files_added [feature/attach-dl] Removed sprintf() use [feature/attach-dl] Removed need for array_keys() [feature/attach-dl] Added multiple attachment downloads to PMs [feature/attach-dl] Removed reliance on current($row) [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth [feature/attach-dl] Moved PM authentication handling into own function ...
| * | [feature/attach-dl] Removed the use of some abbreviationsFyorl2012-08-201-1/+1
| | | | | | | | | | | | PHPBB3-11042
| * | [feature/attach-dl] Added links to the templatesFyorl2012-08-021-0/+2
| | | | | | | | | | | | PHPBB3-11042
* | | [ticket/11032] fix language of error displayedDhruv2012-08-151-2/+2
| | | | | | | | | | | | | | | | | | Language of the error displayed is modified. PHPBB3-11032
* | | [ticket/11032] trigger error in case search failsDhruv2012-08-101-0/+2
| | | | | | | | | | | | | | | | | | | | | Admins are shown actual error while users are shown a search failed error in case sphinx search fails. PHPBB3-11032
* | | [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
| * | [feature/sphinx-fulltext-search] makes sql host configurableDhruv2012-07-221-0/+2
| | | | | | | | | | | | | | | | | | | | | The SQL server host which sphinx connects to index the posts is now configurable via ACP. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] fix language keys' typoDhruv2012-07-221-4/+4
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] add pgsql functionalityDhruv2012-07-191-1/+1
| | | | | | | | | | | | PHPBB3-10946
| * | [feature/sphinx-fulltext-search] modify language keysDhruv2012-07-191-6/+4
| | | | | | | | | | | | | | | | | | | | | Modify language keys according to what the config setting actually does. Remove references to autoconf. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] display config file in ACPDhruv2012-07-191-0/+3
| | | | | | | | | | | | | | | | | | | | | sphinx config file is generated and displayed in the ACP for user to use it to start sphinx search daemon. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] remove bin_pathDhruv Goel2012-07-191-3/+0
| | | | | | | | | | | | | | | | | | fulltext_sphinx_bin_path from ACP as it is no longer required. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] remove recent search queriesDhruv Goel2012-07-191-11/+1
| | | | | | | | | | | | | | | | | | | | | remove recent search queries from the stats as they can't be retreived and remove other language keys being used no more. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] integrate sphinx language keys with coreDhruv Goel2012-07-122-65/+30
| | | | | | | | | | | | | | | | | | | | | Language keys removed from mods folder and added to language/en/acp/search.php PHPBB3-10946
| * | [feature/sphinx-fulltext-search] minor fixes in formattingDhruv Goel2012-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Add a newline at the end of files. Update License information in package docbloc. PHPBB3-10946
| * | [feature/sphinx-fulltext-search] MOD by naderman installed in phpbbDhruv Goel2012-07-121-0/+65
| | | | | | | | | | | | PHPBB3-10946
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value Conflicts: phpBB/includes/acp/acp_profile.php
| * | [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
* | | Merge pull request #914 from EXreaction/ticket/10990Nils Adermann2012-07-221-1/+1
|\ \ \ | | | | | | | | Ticket/10990
| * | | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10990
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into developNils Adermann2012-07-211-0/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/11002: [ticket/11002] Use translating option to rename the Etc/GMT options
| * | | | [ticket/11002] Use translating option to rename the Etc/GMT optionsJoas Schilling2012-07-211-0/+29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | They have the invers offset of their name. So GMT+2 has the offset -7200. To avoid additional confusion, we simply overwrite their name. PHPBB3-11002
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-07-211-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| * | [ticket/10950] Delete PMs for users that have not yet read the pmJoas Schilling2012-07-201-1/+1
| | | | | | | | | | | | PHPBB3-10950
* | | [feature/new-tz-handling] Remove additional marking of selected itemsJoas Schilling2012-07-181-1/+0
| | | | | | | | | | | | PHPBB3-9558
* | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-183-5/+22
|\ \ \ | | |/ | |/| | | | feature/new-tz-handling
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 17:05:12 +0000