aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/soft-delete] Add delete information to approve deatils pageJoas Schilling2012-12-182-0/+38
| | | | PHPBB3-9657
* [feature/soft-delete] Add "Restore" to the mcp forum quick moderationJoas Schilling2012-12-182-1/+3
| | | | PHPBB3-9657
* [feature/soft-delete] Fix a problem with the "only softdeleted posts" logicJoas Schilling2012-12-181-5/+5
| | | | PHPBB3-9657
* [feature/soft-delete] Use new custom template system for AJAX confirm_boxJoas Schilling2012-12-181-0/+29
| | | | PHPBB3-9657
* [feature/soft-delete] Remove the "Deleted by" message when restoring a postJoas Schilling2012-12-102-1/+10
| | | | PHPBB3-9567
* [feature/soft-delete]Fix the rest of unit tests failuresJoas Schilling2012-11-107-6/+24
| | | | PHPBB3-9567
* Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-10384-2092/+6295
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 PR #1045 branch 'bantu/ticket/10780' into developOleg Pudeyev2012-11-09205-1075/+1076
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10780: [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/10780] Use L_COLON on LDAP page.Andreas Fischer2012-11-101-8/+8
| | | | | | | | | | | | PHPBB3-10780
| | * [ticket/10780] Use L_COLON on search backend ACP pages.Andreas Fischer2012-11-104-13/+13
| | | | | | | | | | | | PHPBB3-10780
| | * [ticket/10780] Use L_COLON for "download all attachments".Andreas Fischer2012-11-102-3/+3
| | | | | | | | | | | | PHPBB3-10780
| | * [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.Andreas Fischer2012-11-101-2/+2
| | | | | | | | | | | | PHPBB3-10780
| | * [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.Andreas Fischer2012-11-101-13/+13
| | | | | | | | | | | | PHPBB3-10780
| | * [ticket/10780] Replace colon usage in adm template output with {L_COLON}Nathan Guse2012-11-1052-368/+368
| | | | | | | | | | | | | | | | | | Same as 46a7940a976ec1f54078f803ec949aa2bfbf6316, but for ACP templates PHPBB3-10780
| | * [ticket/10780] Replace colon usage in template output with {L_COLON}Nathan Guse2012-11-10146-668/+669
| | | | | | | | | | | | | | | | | | | | | Replace all the instances (I could find) where the colon is displayed to the user with {L_COLON} so it can be localised. PHPBB3-10780
| * | Merge PR #1052 branch 'develop-olympus' into developOleg Pudeyev2012-11-091-66/+85
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files [ticket/10865] Phrase change for visiting with browser [ticket/10865] Grammar corrections for the entire document [ticket/10865] Typo and phrasing change [ticket/10865] Updates and additions to /docs/INSTALL.html Conflicts: phpBB/docs/INSTALL.html
| | * Merge PR #1052 branch 'p/ticket/10865' into develop-olympusOleg Pudeyev2012-11-091-68/+87
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10865: [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files [ticket/10865] Phrase change for visiting with browser [ticket/10865] Grammar corrections for the entire document [ticket/10865] Typo and phrasing change [ticket/10865] Updates and additions to /docs/INSTALL.html
| | | * [ticket/10865] Use code tags for install/database_update.php.Oleg Pudeyev2012-11-091-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10865
| | | * [ticket/10865] Should have been a slash.Oleg Pudeyev2012-11-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10865
| | | * [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode filesPatrick Webster2012-08-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10865
| | | * [ticket/10865] Phrase change for visiting with browserPatrick Webster2012-06-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10865
| | | * [ticket/10865] Grammar corrections for the entire documentPatrick Webster2012-06-221-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed more grammatical issues, changed some phrasings, added a link for offline conversions, and other corrections. PHPBB3-10865
| | | * [ticket/10865] Typo and phrasing changePatrick Webster2012-06-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10865
| | | * [ticket/10865] Updates and additions to /docs/INSTALL.htmlOyabun12012-06-191-31/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added anti-spam section. Changed www.mydomain.com/tld to www.example.com. Updated update section to mention third party styles. Reworded several sentences for clarity. Made file name/path formatting more consistent. Corrected update archive type availabilities. Changed PHP version listing to be less redundant. PHPBB3-10865 PHPBB3-10918
| * | | Merge remote-tracking branch 'github-igorw/ticket/11181' into developNils Adermann2012-11-097-12/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/11181: [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
| | * | | [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)Igor Wiedler2012-11-098-13/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11181
| * | | | Merge branch 'develop-olympus' into developNils Adermann2012-11-091-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * develop-olympus: [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
| | * | | Merge remote-tracking branch 'github-igorw/ticket/11181-olympus' into ↵Nils Adermann2012-11-091-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-igorw/ticket/11181-olympus: [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) [develop-olympus]Igor Wiedler2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11181
| * | | | | Merge PR #1043 branch 'dhruvgoel92/ticket/11177' into developOleg Pudeyev2012-11-091-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11177: [ticket/11177] return no results when query has only negation
| | * | | | | [ticket/11177] return no results when query has only negationDhruv2012-11-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If search query has only -foo then instead of displaying all results that do not have foo, should display no results found. PHPBB3-11177
| * | | | | | Merge PR #949 branch 'dhruvgoel92/ticket/11050' into developOleg Pudeyev2012-11-094-22/+259
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11050: [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 [ticket/11050] add missing @var in native search [ticket/11050] replace user by phpbb_user [ticket/11050] fix minor comment/docblocks issues [ticket/11050] add access specifiers to native search properties [ticket/11050] fix docblocks with description before @var [ticket/11050] add missing @var [ticket/11050] remove common_words property from sphinx [ticket/11050] add access specifiers to sphinx search properties [ticket/11050] add access specifiers to mysql search properties [ticket/11050] add access specifiers to pgsql search properties
| | * | | | | | [ticket/11050] make all properties protected in all search backendsDhruv2012-11-094-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-11050
| | * | | | | | [ticket/11050] get_common_words() returns empty array for sphinxDhruv2012-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-11050
| | * | | | | | [ticket/11050] fix tidied search query docblock languageDhruv2012-11-094-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] fix min/max length docblock languageDhruv2012-11-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] multi sentences separated by period in docblocksDhruv2012-11-093-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting of each sentence should be capitalized. PHPBB3-11050
| | * | | | | | [ticket/11050] fix separated spelling in docblockDhruv2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] fix split words doc block languageDhruv2012-11-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] remove class word from docblocksDhruv2012-11-094-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] add missing @var in native searchDhruv2012-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] replace user by phpbb_userDhruv2012-11-094-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] fix minor comment/docblocks issuesDhruv2012-11-094-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No comments should end with a period. All occurences like PostgreSQL should have proper case. PHPBB3-11050
| | * | | | | | [ticket/11050] add access specifiers to native search propertiesDhruv2012-11-091-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] fix docblocks with description before @varDhruv2012-11-093-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] add missing @varDhruv2012-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] remove common_words property from sphinxDhruv2012-11-091-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | common_words property is never used in sphinx class hence removed. PHPBB3-11050
| | * | | | | | [ticket/11050] add access specifiers to sphinx search propertiesDhruv2012-11-091-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] add access specifiers to mysql search propertiesDhruv2012-11-091-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| | * | | | | | [ticket/11050] add access specifiers to pgsql search propertiesDhruv2012-11-091-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050