aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge remote-tracking branch 'github-nicofuma/ticket/11649' into developNils Adermann2014-08-092-30/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nicofuma/ticket/11649: [ticket/11649] Fix coding style [ticket/11649] Expose Twig through the container
| * | | | | | [ticket/11649] Fix coding styleTristan Darricau2014-08-091-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11649
| * | | | | | [ticket/11649] Expose Twig through the containerTristan Darricau2014-08-092-30/+39
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11649
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-091-59/+192
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12710] Fix missing closing bracket [ticket/12710] Prefix column so it does not start with a number [ticket/12710] Pass the original column data to the create function [ticket/12710] Fix foreach generation [ticket/12710] Compare to uppercase version [ticket/12710] Do not try to match the uniqueness in the query [ticket/12710] Remove table_name from index_name before deleting and recreating them [ticket/12710] Can not use upper in oracles where claus [ticket/12710] Correctly select index name and compare to column name [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle [ticket/12710] Fix problems with creating unique indexes on oracle [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL [ticket/12710] Fix changing the column type on oracle [ticket/12710] Prepare get_existing_indexes() for other DBMS
| * | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into ↵Nils Adermann2014-08-091-59/+192
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12710: [ticket/12710] Fix missing closing bracket [ticket/12710] Prefix column so it does not start with a number [ticket/12710] Pass the original column data to the create function [ticket/12710] Fix foreach generation [ticket/12710] Compare to uppercase version [ticket/12710] Do not try to match the uniqueness in the query [ticket/12710] Remove table_name from index_name before deleting and recreating them [ticket/12710] Can not use upper in oracles where claus [ticket/12710] Correctly select index name and compare to column name [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle [ticket/12710] Fix problems with creating unique indexes on oracle [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL [ticket/12710] Fix changing the column type on oracle [ticket/12710] Prepare get_existing_indexes() for other DBMS
| | * | | | | [ticket/12710] Fix missing closing bracketJoas Schilling2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Prefix column so it does not start with a numberJoas Schilling2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Pass the original column data to the create functionJoas Schilling2014-08-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Fix foreach generationJoas Schilling2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Compare to uppercase versionJoas Schilling2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Do not try to match the uniqueness in the queryJoas Schilling2014-08-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Remove table_name from index_name before deleting and ↵Joas Schilling2014-08-091-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recreating them PHPBB3-12710
| | * | | | | [ticket/12710] Can not use upper in oracles where clausJoas Schilling2014-08-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Correctly select index name and compare to column nameJoas Schilling2014-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Fix problems with creating unique indexes on oracleJoas Schilling2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Correctly fetch unique and normal indexes only in MSSQLJoas Schilling2014-08-091-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Fix changing the column type on oracleJoas Schilling2014-08-071-47/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12710
| | * | | | | [ticket/12710] Prepare get_existing_indexes() for other DBMSJoas Schilling2014-08-071-73/+112
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12710
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-091-1/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2841 from nickvergessen/ticket/security-155Marc Alexander2014-08-091-1/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/security-155] Cast the types of string values in the controller routes
| | * | | | | [ticket/security-155] Fix spelling error in commentJoas Schilling2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-155
| | * | | | | [ticket/security-155] Cast the types of string values in the controller routesJoas Schilling2014-08-081-1/+17
| | | |_|/ / | | |/| | | | | | | | | | | | | | | SECURITY-155
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-081-27/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12937] Do not return false. Return null for get and array() for all.
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/12937' into develop-ascraeusNils Adermann2014-08-081-27/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * github-bantu/ticket/12937: [ticket/12937] Do not return false. Return null for get and array() for all.
| | * | | | [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