aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | [ticket/12937] Do not return false. Return null for get and array() for all.Andreas Fischer2014-08-081-27/+12
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-12937
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-081-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12738] Pass $this->config in content_visibility constructor
| * | | | Merge pull request #2838 from dhruvgoel92/ticket/12738Joas Schilling2014-08-081-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/12738] Pass $this->config in content_visibility constructor * dhruvgoel92/ticket/12738: [ticket/12738] Pass $this->config in content_visibility constructor
| | * | | [ticket/12738] Pass $this->config in content_visibility constructorDhruv2014-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12738
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-083-373/+215
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12789] Move duplicated functions to the base class [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge() Conflicts: phpBB/phpbb/cache/driver/file.php phpBB/phpbb/cache/driver/memory.php
| * | | | [ticket/12789] Move duplicated functions to the base classTristan Darricau2014-08-083-417/+215
| | | | | | | | | | | | | | | | | | | | PHPBB3-12789
| * | | | [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()Tristan Darricau2014-08-081-13/+57
| | |/ / | |/| | | | | | | | | | PHPBB3-12789
* | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-071-21/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | # By jeroendedauw # Via Andreas Fischer (1) and Dhruv Goel (1) * develop-ascraeus: [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version
| * | | [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_versionjeroendedauw2014-08-071-21/+0
| | |/ | |/| | | | | | | PHPBB3-12903
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-072-1/+39
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12873] Add migration to rename the index [ticket/12873] Don not touch the existing migrations [ticket/12873] Test the good identifier in \phpbb\db\tools
| * | Merge pull request #2761 from Nicofuma/ticket/12873Joas Schilling2014-08-072-1/+39
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12873] Test the correct identifier in \phpbb\db\tools * Nicofuma/ticket/12873: [ticket/12873] Add migration to rename the index [ticket/12873] Don not touch the existing migrations [ticket/12873] Test the good identifier in \phpbb\db\tools
| | * | [ticket/12873] Add migration to rename the indexTristan Darricau2014-08-071-0/+38
| | | | | | | | | | | | | | | | PHPBB3-12873
| | * | [ticket/12873] Don not touch the existing migrationsTristan Darricau2014-08-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12873
| | * | [ticket/12873] Test the good identifier in \phpbb\db\toolsTristan Darricau2014-07-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to rename the index key because with the default prefix (phpbb_) this key has a length of 31. And because we don't accept the keys longer than 30 characters we should ensure that by default no key is longer than 30 characters. PHPBB3-12873
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-071-10/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12738] Update constructor docblock [ticket/12738] Add $config to constructor in notification test [ticket/12738] Fix tests with new config object injection [ticket/12738] Inject config object into content_visibility class [ticket/11528] Move related code from functions_posting to function
| * | | Merge pull request #2623 from dhruvgoel92/ticket/12738Tristan Darricau2014-08-071-10/+31
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12738] Move related code from functions_posting to function * dhruvgoel92/ticket/12738: [ticket/12738] Update constructor docblock [ticket/12738] Add $config to constructor in notification test [ticket/12738] Fix tests with new config object injection [ticket/12738] Inject config object into content_visibility class [ticket/11528] Move related code from functions_posting to function
| | * | [ticket/12738] Update constructor docblockDhruv2014-07-211-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12738
| | * | [ticket/12738] Inject config object into content_visibility classDhruv2014-06-201-5/+12
| | | | | | | | | | | | | | | | PHPBB3-12738
| | * | [ticket/11528] Move related code from functions_posting to functionDhruv2014-06-191-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related code from functions_posting to remove_post_from_statistic() in content_visibility.php PHPBB3-11528
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12826] Add optional root namespace indicator for consistency. [ticket/12826] Add mandatory root namespace indicator to exception catching.
| * | | Merge pull request #2812 from bantu/ticket/12826Joas Schilling2014-08-071-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12826] Add root namespace indicator to exception catching. * bantu/ticket/12826: [ticket/12826] Add optional root namespace indicator for consistency. [ticket/12826] Add mandatory root namespace indicator to exception catching.
| | * | | [ticket/12826] Add mandatory root namespace indicator to exception catching.Andreas Fischer2014-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12826
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-9/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12838] Simplify normal special rank array creation [ticket/12838] Update RC2 to RC3 [ticket/12838] Update events.md to RC3 [ticket/12838] Allow for extra columns in cache obtain_ranks() [ticket/12838] Add raw row-data to acp_ranks core event [ticket/12838] Simplify special rank template conditional [ticket/12838] Add core events to acp_ranks.php [ticket/12838] Update events.md [ticket/12838] Add _before versions [ticket/12838] Add template events to acp_ranks.html
| * | | | Merge pull request #2720 from PayBas/ticket/12838Joas Schilling2014-08-071-9/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12838] Add ACP events to acp_ranks * PayBas/ticket/12838: [ticket/12838] Simplify normal special rank array creation [ticket/12838] Update RC2 to RC3 [ticket/12838] Update events.md to RC3 [ticket/12838] Allow for extra columns in cache obtain_ranks() [ticket/12838] Add raw row-data to acp_ranks core event [ticket/12838] Simplify special rank template conditional [ticket/12838] Add core events to acp_ranks.php [ticket/12838] Update events.md [ticket/12838] Add _before versions [ticket/12838] Add template events to acp_ranks.html
| | * | | | [ticket/12838] Simplify normal special rank array creationPayBas2014-08-071-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | [ticket/12838] Allow for extra columns in cache obtain_ranks()PayBas2014-07-101-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-0/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12920] Add missing comma [ticket/12920] Update composer.lock file after update nothing [ticket/12920] Fix sh syntax error in post-update-cmd script [ticket/12920] Remove incorrect @ from self.version reference in composer.json [ticket/12920] Output warning message about vendor cleaning target [ticket/12920] Turn phpBB composer.json into publishable full version [ticket/12920] Add require for minimum php version [ticket/12920] Add composer.json for phpbb/phpbb-core library
| * | | | | [ticket/12920] Add missing commaNils Adermann2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | [ticket/12920] Add require for minimum php versionNils Adermann2014-08-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | [ticket/12920] Add composer.json for phpbb/phpbb-core libraryNils Adermann2014-08-071-0/+24
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-12920
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-073-0/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12847] Allow the extensions to say if they can be enabled
| * | | | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-073-0/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabled * Nicofuma/ticket/12847: [ticket/12847] Allow the extensions to say if they can be enabled
| | * | | | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-133-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12847
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-0747-60/+125
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
| * | | | | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-0747-60/+125
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Sami for ascraeus * n-aleha/ticket/12557ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
| | * | | | | [ticket/12557] Fix php file descriptionn-aleha2014-08-0718-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix post data description for notificationsn-aleha2014-08-078-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix pass by reference doc blocksn-aleha2014-08-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block in extension base classn-aleha2014-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block in mimetype guessern-aleha2014-08-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-032-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-034-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| | * | | | | [ticket/12557] Template fixesn-aleha2014-08-034-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Search, cron and profilefields fixesn-aleha2014-08-037-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Notification fixesn-aleha2014-08-0314-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block errors found by Sami pt1n-aleha2014-08-037-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| | * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
* | | | | | | Merge pull request #2637 from Nicofuma/ticket/12387Joas Schilling2014-08-0713-149/+257
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12387] Cleanup *_free_result call and remove @ on that call * Nicofuma/ticket/12387: [ticket/12387] Fix a call to sql_freeresult in full_text_native [ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult [ticket/12387] Use the hash as query_id for caching [ticket/12387] Remove unnecessary checks [ticket/12387] mssql_query return true if a select query returns 0 row [ticket/12387] Cleanup *_free_result call and remove @ on that call