aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/soft-delete] Split deleting soft-deleted posts from unapproving postsJoas Schilling2012-12-202-10/+61
| | | | PHPBB3-9657
* [feature/soft-delete] Split up on the initial switch instead of a second oneJoas Schilling2012-12-201-41/+30
| | | | | | Also fixing some documentation issues PHPBB3-9657
* [feature/soft-delete] Fix a problem with "delete topics" in mcpJoas Schilling2012-12-181-1/+2
| | | | PHPBB3-9657
* [feature/soft-delete] Add delete information to approve deatils pageJoas Schilling2012-12-181-0/+31
| | | | PHPBB3-9657
* [feature/soft-delete] Add "Restore" to the mcp forum quick moderationJoas Schilling2012-12-181-1/+2
| | | | PHPBB3-9657
* [feature/soft-delete] Fix a problem with the "only softdeleted posts" logicJoas Schilling2012-12-181-5/+5
| | | | PHPBB3-9657
* Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-1081-639/+2456
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * [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 colon from language in ucp_pm_compose.php where possible.Andreas Fischer2012-11-101-2/+2
| | | | | | | | PHPBB3-10780
| * 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
| * | | | [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
| * | | | Merge remote-tracking branch 'github-p/ticket/11174' into developNils Adermann2012-11-091-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/ticket/11174: [ticket/11174] Check common words, fix array equality assertion. [ticket/11174] Test for common words. [ticket/11174] More tests. [ticket/11174] Clarify why that is the way it is. [ticket/11174] Started on search tests - keyword splitting.
| | * | | | [ticket/11174] Started on search tests - keyword splitting.Oleg Pudeyev2012-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11174
| * | | | | Merge remote-tracking branch 'github-p/feature/prune-users' into developNils Adermann2012-11-094-149/+275
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/prune-users: (21 commits) [feature/prune-users] $author_id_sql is no longer needed here. [feature/prune-users] Move quote to the correct line. [feature/prune-users] Split one line into two lines for readability. [feature/prune-users] Use empty for checking array size. [feature/prune-users] Fix issues with queries pointed out by bantu. [feature/prune-users] Add spaces inside brackets. [feature/prune-users] Use a map instead of performing array scans. [feature/prune-users] Fix incorrect condition when deleting log entries. [feature/prune-users] Non-cosmetic changes per bantu's review. [feature/prune-users] Cosmetic changes per bantu's review. [feature/prune-users] Minor UI adjustment and bug fixes [feature/prune_users] Moved set_config_count out of user loop. [feature/prune-users] Fixed user id check in undelivered users loop. [feature/prune-users] Call sql_is_set once for author ids in user_delete. [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids. [feature/prune-users] Call sql_is_set for user ids once in user_delete. [feature/prune-users] Fixed whitespace in language file. [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b. [feature/prune-users] Adjust some language strings for new features [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5. ...
| | * | | | | [feature/prune-users] $author_id_sql is no longer needed here.Oleg Pudeyev2012-11-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-06246-9046/+18021
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | [feature/prune-users] Move quote to the correct line.Oleg Pudeyev2012-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Split one line into two lines for readability.Oleg Pudeyev2012-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Use empty for checking array size.Oleg Pudeyev2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Fix issues with queries pointed out by bantu.Oleg Pudeyev2012-04-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Use a map instead of performing array scans.Oleg Pudeyev2012-04-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Fix incorrect condition when deleting log entries.Oleg Pudeyev2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original commit incorrectly replaced reportee_id with user_id. Change it back to reportee_id. The comment was correct. PHPBB3-9622
| | * | | | | | [feature/prune-users] Non-cosmetic changes per bantu's review.Oleg Pudeyev2012-04-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Cosmetic changes per bantu's review.Oleg Pudeyev2012-03-252-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Minor UI adjustment and bug fixesjellydoughnut2012-01-061-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded hidden fields in confirmation page. Do not show group prune dropdown if there are no groups, etc. PHPBB3-9622
| | * | | | | | [feature/prune_users] Moved set_config_count out of user loop.Oleg Pudeyev2011-05-081-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| | * | | | | | [feature/prune-users] Fixed user id check in undelivered users loop.Oleg Pudeyev2011-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now $user_ids instead of one $user_id. PHPBB3-9622
| | * | | | | | [feature/prune-users] Call sql_is_set once for author ids in user_delete.Oleg Pudeyev2011-05-081-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 04:26:55 +0000