aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-101-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12941] Fix remaining Sami complaints. [ticket/12941] Check for Sami parse errors on Travis CI. [ticket/12941] Add sami.conf.php for Travis CI.
| * | | | | | Merge pull request #2849 from bantu/ticket/12941Tristan Darricau2014-08-101-1/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12941] Check for Sami parse errors on Travis CI. * bantu/ticket/12941: [ticket/12941] Fix remaining Sami complaints. [ticket/12941] Check for Sami parse errors on Travis CI. [ticket/12941] Add sami.conf.php for Travis CI.
| | * | | | | [ticket/12941] Fix remaining Sami complaints.Andreas Fischer2014-08-091-1/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12941
* | | | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-097-67/+41
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Dhruv Goel (1) and Marc Alexander (1) * develop-ascraeus: [ticket/12742] Add sorting back to bookmark notification list of users [ticket/12742] Add sort options for notification types requiring sorting [ticket/12742] Remove unneeded sort of users [ticket/12742] Replace authenticated with authorised [ticket/12742] Add check for empty $users and add method to fitting methods [ticket/12742] Add method for getting authenticated recipients
| * | | | | Merge pull request #2840 from marc1706/ticket/12742Dhruv Goel2014-08-097-67/+41
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/12742] Put duplicated code into one method in notifications base
| | * | | | | [ticket/12742] Add sorting back to bookmark notification list of usersMarc Alexander2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12742
| | * | | | | [ticket/12742] Add sort options for notification types requiring sortingMarc Alexander2014-08-093-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12742
| | * | | | | [ticket/12742] Remove unneeded sort of usersMarc Alexander2014-08-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't matter which user will get the notification first so we shouldn't sort the users array. PHPBB3-12742
| | * | | | | [ticket/12742] Replace authenticated with authorisedMarc Alexander2014-08-097-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12742
| | * | | | | [ticket/12742] Add check for empty $users and add method to fitting methodsMarc Alexander2014-08-087-67/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method might now return an empty array in case of an empty users array, too. The notification types then check if the returned array is empty and return this if it is empty and if the notification types would otherwise carry out other operations afterwards. PHPBB3-12742
| | * | | | | [ticket/12742] Add method for getting authenticated recipientsMarc Alexander2014-08-081-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12742
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-091-52/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12718] Use a separate variable for sql query [ticket/12718] Fix spacing and type casting [ticket/12718] Fix docblocks [ticket/12718] Add tests to check user_posts on post deletion [ticket/12718] Update docblock [ticket/12718] Use remove_topic_from_statistic() for delete_topic
| * | | | | | Merge pull request #2624 from dhruvgoel92/ticket/12718Tristan Darricau2014-08-091-52/+17
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12718] Use remove_topic_from_statistic() for delete_topic * dhruvgoel92/ticket/12718: [ticket/12718] Use a separate variable for sql query [ticket/12718] Fix spacing and type casting [ticket/12718] Fix docblocks [ticket/12718] Add tests to check user_posts on post deletion [ticket/12718] Update docblock [ticket/12718] Use remove_topic_from_statistic() for delete_topic
| | * | | | | [ticket/12718] Fix docblocksDhruv2014-08-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12718
| | * | | | | [ticket/12718] Update docblockDhruv2014-08-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12718
| | * | | | | [ticket/12718] Use remove_topic_from_statistic() for delete_topicDhruv2014-08-071-46/+13
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-12718
* | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 08:25:39 +0000