aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/compiled-dic] Remove redundant method callDavid King2012-11-101-1/+0
| | | | PHPBB3-11152
* [feature/compiled-dic] Split if() over multiple lines for improved readabilityDavid King2012-11-102-2/+10
| | | | PHPBB3-11152
* [feature/compiled-dic] Compile the DI Container into a cached classDavid King2012-11-1020-274/+693
| | | | PHPBB3-11152
* Merge PR #1044 branch 'develop-olympus' into developOleg Pudeyev2012-11-091-2/+0
|\ | | | | | | | | * develop-olympus: [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
| * Merge PR #1044 branch 'bantu/ticket/11178' into develop-olympusOleg Pudeyev2012-11-091-2/+0
| |\ | | | | | | | | | | | | * bantu/ticket/11178: [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
| | * [ticket/11178] Do not set error_reporting to E_ALL in database_updater.phpAndreas Fischer2012-11-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Take whatever startup.php sets instead. This especially takes care of E_STRICT messages that are generated because of PHP4 compatibility. PHPBB3-11178
* | | Merge PR #1042 branch 'develop-olympus' into developOleg Pudeyev2012-11-092-11/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10897] Combine bot updates and bot delete. [ticket/10897] Use same code/query for deleting. [ticket/10897] Make sure the user we're fetching is a bot. [ticket/10897] Do not handle IP address. There is no need. [ticket/10897] Update by user_id instead of bot_name. [ticket/10897] Move bot delete data to the relevant foreach loop. [ticket/10897] Add comment about what's going on. [ticket/10897] Remove unnecessary string casting. [ticket/10897] Add space after foreach. [ticket/10897] Update bots during phpBB update [ticket/10897] Bot list updated
| * | Merge PR #1042 branch 'bantu/ticket/10897' into develop-olympusOleg Pudeyev2012-11-092-11/+60
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10897: [ticket/10897] Combine bot updates and bot delete. [ticket/10897] Use same code/query for deleting. [ticket/10897] Make sure the user we're fetching is a bot. [ticket/10897] Do not handle IP address. There is no need. [ticket/10897] Update by user_id instead of bot_name. [ticket/10897] Move bot delete data to the relevant foreach loop. [ticket/10897] Add comment about what's going on. [ticket/10897] Remove unnecessary string casting. [ticket/10897] Add space after foreach. [ticket/10897] Update bots during phpBB update [ticket/10897] Bot list updated
| | * [ticket/10897] Combine bot updates and bot delete.Andreas Fischer2012-11-091-40/+31
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Use same code/query for deleting.Andreas Fischer2012-11-091-9/+6
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Make sure the user we're fetching is a bot.Andreas Fischer2012-11-091-2/+3
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Do not handle IP address. There is no need.Andreas Fischer2012-11-091-13/+7
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Update by user_id instead of bot_name.Andreas Fischer2012-11-091-7/+8
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Move bot delete data to the relevant foreach loop.Andreas Fischer2012-11-091-9/+9
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Add comment about what's going on.Andreas Fischer2012-11-091-0/+1
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Remove unnecessary string casting.Andreas Fischer2012-11-091-2/+2
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Add space after foreach.Andreas Fischer2012-11-091-2/+2
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Update bots during phpBB updateCarlo2012-11-091-0/+70
| | | | | | | | | | | | PHPBB3-10897
| | * [ticket/10897] Bot list updatedCarlo2012-11-091-11/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Baidu [Spider]' updated. 'Bing [Bot]' fixed only identation. 'Exabot [Bot]' changed because there is used also 'Exabot-Thumbnails' user agent. 'NG-Search [Bot]' no longer exists. 'Nutch/CVS [Bot]' is the same of 'Nutch [Bot]'. 'OmniExplorer [Bot]' no longer exists. 'Seekport [Bot]' no longer exists. 'Synoo [Bot]' no longer exists. 'Voyager [Bot]' updated. 'W3C [Validator]' corrected (there was a *). 'WiseNut [Bot]' no longer exists. PHPBB3-10897
* | Merge remote-tracking branch 'github-p/ticket/11174' into developNils Adermann2012-11-093-0/+233
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * 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] Check common words, fix array equality assertion.Oleg Pudeyev2012-11-081-11/+43
| | | | | | | | | | | | PHPBB3-11174
| * | [ticket/11174] Test for common words.Oleg Pudeyev2012-11-082-0/+26
| | | | | | | | | | | | PHPBB3-11174
| * | [ticket/11174] More tests.Oleg Pudeyev2012-11-081-0/+24
| | | | | | | | | | | | PHPBB3-11174
| * | [ticket/11174] Clarify why that is the way it is.Oleg Pudeyev2012-11-081-0/+1
| | | | | | | | | | | | PHPBB3-11174
| * | [ticket/11174] Started on search tests - keyword splitting.Oleg Pudeyev2012-11-083-0/+150
| | | | | | | | | | | | PHPBB3-11174
* | | Merge remote-tracking branch 'github-p/feature/prune-users' into developNils Adermann2012-11-097-167/+328
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-061002-18436/+35335
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Add spaces inside brackets.Oleg Pudeyev2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by nickvergessen. 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-062-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids.Oleg Pudeyev2011-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | [feature/prune-users] Call sql_is_set for user ids once in user_delete.Oleg Pudeyev2011-05-081-7/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | [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-08139-2312/+3902
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. ...
| * \ \ \ \ Merge commit 'ee0db1a1d5f0150016d0971057f889f2366f9856' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit 'ee0db1a1d5f0150016d0971057f889f2366f9856':
| * \ \ \ \ \ Merge commit '904bcb86a054ab6256da565098eb9bd8ab20414b' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '904bcb86a054ab6256da565098eb9bd8ab20414b': [ticket/7834] Topic time didn't update when first post was deleted
| * | | | | | | [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.Oleg Pudeyev2011-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in PHPBB3-7834. PHPBB3-9622
| * | | | | | | Merge commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5': [ticket/9872] Removed some useless code that broke delete_posts These changes have already been applied in an earlier commit. Therefore this commit is empty. Merge was done using 'ours' strategy.
| * \ \ \ \ \ \ \ Merge commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9' into feature/prune-usersOleg Pudeyev2011-05-081-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9': [ticket/9997] Fixed an inconsistency in the Moderator Control Panel