aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10411] Ensure we only get services that do existJoas Schilling2013-02-251-1/+1
| | | | PHPBB3-10411
* [ticket/10411] Add a comment why we left join the group tableJoas Schilling2013-01-151-0/+2
| | | | | | | We left join the group table because we want to check that the group does exist there aswell. PHPBB3-10411
* [ticket/10411] Rename template variable CUR_ to CURRENT_Joas Schilling2012-12-062-2/+2
| | | | PHPBB3-10411
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2012-12-0681-405/+1737
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (204 commits) [ticket/11219] Coding guidelines and naming consistency changes [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP [ticket/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. ... Conflicts: phpBB/config/services.yml phpBB/includes/groupposition/legend.php
| * Merge PR #1053 branch 'develop-olympus' into developOleg Pudeyev2012-12-053-6/+43
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP Conflicts: phpBB/includes/ucp/ucp_prefs.php phpBB/styles/prosilver/template/ucp_prefs_personal.html
| | * [ticket/10841] Revert more whitespace changes.Oleg Pudeyev2012-12-051-2/+2
| | | | | | | | | | | | PHPBB3-10841
| | * [ticket/10841] Revert whitespace changes.Oleg Pudeyev2012-12-052-20/+20
| | | | | | | | | | | | PHPBB3-10841
| | * [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| | | | | | | | | | | | PHPBB3-10841
| | * [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
| | | | | | | | | | | | PHPBB3-10841
| | * [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
| | | | | | | | | | | | | | | | | | this sould reduce load and be faster. Also freeresult functions added PHPBB3-10841
| | * [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-053-28/+62
| | | | | | | | | | | | | | | | | | | | | Commit also deletes all unnecessary blank spaces at the end of the lines in both ucp_prefs_personal.html PHPBB3-10841
| * | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-3/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. Conflicts: phpBB/includes/functions_messenger.php
| | * [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| | | | | | | | | | | | PHPBB3-10602
| | * [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep the last queue run time around, therefore for determining whether enough time has passed since the last run we can simply use this config variable. When there is no queue file we consider a queue run successful. Previously queue.php ("cache file") modification time would be used for determining whether enough time has passed since last queue run. The problem was that modification time would be updated whenever anything was added to the queue, creating a situation where if queue is processed less frequently than it is added to that email would not be sent. PHPBB3-10602
| | * [ticket/11238] Set goutte version to 0.1.0.Oleg Pudeyev2012-12-022-32/+433
| | | | | | | | | | | | PHPBB3-11238
| * | [ticket/11247] Fix wrong property reference in flock class.Oleg Pudeyev2012-12-051-1/+1
| | | | | | | | | | | | PHPBB3-11247
| * | Merge remote-tracking branch 'p/ticket/10103' into developAndreas Fischer2012-12-044-72/+157
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10103: [ticket/10103] New and improved wording. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. [ticket/10103] Try a longer sleep for travis. [ticket/10103] Convert the rest of the tree to flock class. [ticket/10103] Test for flock lock class, with concurrency no less. [ticket/10103] Use flock lock class in messenger. [ticket/10103] Factor out flock lock class.
| | * | [ticket/10103] New and improved wording.Oleg Pudeyev2012-12-041-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10103
| | * | [ticket/10103] $rv had too few characters.Oleg Pudeyev2012-12-041-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10103
| | * | [ticket/10103] Correct flock class documentation.Oleg Pudeyev2012-12-041-4/+13
| | | | | | | | | | | | | | | | PHPBB3-10103
| | * | [ticket/10103] Convert the rest of the tree to flock class.Oleg Pudeyev2012-12-042-8/+16
| | | | | | | | | | | | | | | | PHPBB3-10103
| | * | [ticket/10103] Use flock lock class in messenger.Oleg Pudeyev2012-12-041-6/+8
| | | | | | | | | | | | | | | | PHPBB3-10103
| | * | [ticket/10103] Factor out flock lock class.Oleg Pudeyev2012-12-042-58/+124
| | | | | | | | | | | | | | | | PHPBB3-10103
| * | | [ticket/10091] Bump minimum supported postgresql version to 8.3.Oleg Pudeyev2012-12-044-4/+4
| |/ / | | | | | | | | | PHPBB3-10091
| * | Merge remote-tracking branch 'p/ticket/9983' into developAndreas Fischer2012-12-031-1/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9983: [ticket/9983] Also check generic APC enable/disable. [ticket/9983] Use APC instead of apc in error messages. [ticket/9983] Skip tests if APC is not enabled for CLI. [ticket/9983] Test for apc cache driver. [ticket/9983] Add phpbb prefix to global variables. [ticket/9983] Empty line by request. [ticket/9983] Indeed, it is <?php. [ticket/9983] Add a test for destroy. [ticket/9983] Exercise exists also. [ticket/9983] Add a purge test. [ticket/9983] Rename test methods. [ticket/9983] get/put cache test moved to a base class. [ticket/9983] Create driver in setup in null driver test. [ticket/9983] Split cache test into per-driver files. [ticket/9983] Add redis cache driver tests.
| | * | [ticket/9983] Empty line by request.Oleg Pudeyev2012-12-021-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9983
| | * | [ticket/9983] Add redis cache driver tests.Oleg Pudeyev2012-12-011-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to not overwrite data in default redis store, at least one of redis host or post must be explicitly specified. Redis cache driver constructor has been modified to accept host and port as parameters. This was not added to public API as there are more parameters being passed via global constants. PHPBB3-9983
| * | | [ticket/11238] Set goutte to 0.1.0 in develop.Oleg Pudeyev2012-12-022-104/+68
| | | | | | | | | | | | | | | | PHPBB3-11238
| * | | Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into developOleg Pudeyev2012-12-024-10/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10771: [ticket/10771] fix remember me language [ticket/10771] use remember me in ucp [ticket/10771] use remember me in acp [ticket/10771] changed value in help_faq.php [ticket/10771] Using Remember Me instead of autologin or persistent keys
| | * | | [ticket/10771] fix remember me languageDhruv2012-12-022-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10771
| | * | | [ticket/10771] use remember me in ucpDhruv2012-12-021-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10771
| | * | | [ticket/10771] use remember me in acpDhruv2012-12-021-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10771
| | * | | [ticket/10771] changed value in help_faq.phpHari Sankar R2012-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10771
| | * | | [ticket/10771] Using Remember Me instead of autologin or persistent keysHari Sankar R2012-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed language variable LOG_ME_IN's value to "Remember me" PHPBB3-10771
| * | | | Merge PR #545 branch 'brunoais/ticket/10601' into developOleg Pudeyev2012-12-013-3/+59
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10601: [ticket/10601] The ORDER BY is only taking space there [ticket/10601] New approach in the update algorithm [ticket/10601] Comment to help understanding the code [ticket/10601] Requested code changes [ticket/10601] Cosmetic code changes [ticket/10601] Database updating code v2 [ticket/10601] Database updating code [ticket/10601] Comment explaning the basename applied to categories [ticket/10601] Correctly access class property [ticket/10601]Move Inbox the default in private messages module
| | * | | | [ticket/10601] The ORDER BY is only taking space thereBruno Ais2012-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10601
| | * | | | [ticket/10601] New approach in the update algorithmBruno Ais2012-12-011-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New approach in the database update algorithm PHPBB3-10601
| | * | | | [ticket/10601] Comment to help understanding the codeBruno Ais2012-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10601
| | * | | | [ticket/10601] Requested code changesBruno Ais2012-11-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed the comment to PHPBB3-10601 - Removed backslashes - Traded double quotes into single quotes inside. PHPBB3-10601
| | * | | | [ticket/10601] Cosmetic code changesBruno Ais2012-11-261-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed the double line before the addition - Moved the condition of the WHERE so that both are in the same line - Removed TABs from the black lines - Used double quotes instead of escaped single quotes. PHPBB3-10601
| | * | | | [ticket/10601] Database updating code v2Bruno Ais2012-11-261-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the space after the (int) as requested PHPBB3-10601
| | * | | | [ticket/10601] Database updating codeBruno Ais2012-11-261-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what is needed to update the database to comply with these code changes PHPBB3-10601
| | * | | | [ticket/10601] Comment explaning the basename applied to categoriesBruno Ais2012-11-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain in the code where if (isset($this->module_categories_basenames[$cat_name])) and if (isset($this->module_categories_basenames[$level2_name])) exists, what does it do. PHPBB3-10601
| | * | | | [ticket/10601] Correctly access class propertyDavid King2012-11-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10601
| | * | | | [ticket/10601]Move Inbox the default in private messages moduleBruno Ais2012-11-262-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did exactly as the answer here asked: http://area51.phpbb.com/phpBB/viewtopic.php?p=234111 PHPBB3-10601
| * | | | | Merge PR #1095 branch 'nickvergessen/ticket/11209' into developOleg Pudeyev2012-12-011-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11209: [ticket/11209] Clone disable moving images to allow multiple per page
| | * | | | | [ticket/11209] Clone disable moving images to allow multiple per pageJoas Schilling2012-11-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disable images need to be clone rather then moved, in order to allow multiple disable images per page. We do not have such a case at the moment but it will be required for the new teampage/legend ACP section. PHPBB3-11209
| * | | | | | Merge remote-tracking branch 'p/ticket/11227' into developAndreas Fischer2012-12-0118-24/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11227: [ticket/11227] @return void -> @return null in code sniffer. [ticket/11227] @return void -> @return null, per coding guidelines.
| | * | | | | | [ticket/11227] @return void -> @return null, per coding guidelines.Oleg Pudeyev2012-11-3018-24/+24
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-11227
| * | | | | | Merge PR #893 branch 'develop-olympus' into developOleg Pudeyev2012-12-012-0/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | * develop-olympus: [ticket/10184] Query bots table to get the user_ids of the bots [ticket/10184] Disable receiving pms for bots by default