aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12957] Removed unused useTristan Darricau2014-08-101-3/+0
* [ticket/12957] Update the constructions of the template engineTristan Darricau2014-08-102-0/+6
* Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-101-1/+0
|\
| * Merge pull request #2849 from bantu/ticket/12941Tristan Darricau2014-08-101-1/+0
| |\
| | * [ticket/12941] Fix remaining Sami complaints.Andreas Fischer2014-08-091-1/+0
* | | Merge branch 'develop-ascraeus' into developDhruv2014-08-097-67/+41
|\ \ \ | |/ /
| * | Merge pull request #2840 from marc1706/ticket/12742Dhruv Goel2014-08-097-67/+41
| |\ \
| | * | [ticket/12742] Add sorting back to bookmark notification list of usersMarc Alexander2014-08-091-1/+1
| | * | [ticket/12742] Add sort options for notification types requiring sortingMarc Alexander2014-08-093-3/+9
| | * | [ticket/12742] Remove unneeded sort of usersMarc Alexander2014-08-091-1/+0
| | * | [ticket/12742] Replace authenticated with authorisedMarc Alexander2014-08-097-9/+9
| | * | [ticket/12742] Add check for empty $users and add method to fitting methodsMarc Alexander2014-08-087-67/+13
| | * | [ticket/12742] Add method for getting authenticated recipientsMarc Alexander2014-08-081-0/+23
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-091-52/+17
|\ \ \ \ | |/ / /
| * | | Merge pull request #2624 from dhruvgoel92/ticket/12718Tristan Darricau2014-08-091-52/+17
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/12718] Fix docblocksDhruv2014-08-071-3/+3
| | * | [ticket/12718] Update docblockDhruv2014-08-071-3/+1
| | * | [ticket/12718] Use remove_topic_from_statistic() for delete_topicDhruv2014-08-071-46/+13
* | | | Merge remote-tracking branch 'github-nicofuma/ticket/11649' into developNils Adermann2014-08-092-30/+41
|\ \ \ \
| * | | | [ticket/11649] Fix coding styleTristan Darricau2014-08-091-7/+9
| * | | | [ticket/11649] Expose Twig through the containerTristan Darricau2014-08-092-30/+39
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-091-59/+192
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into develop...Nils Adermann2014-08-091-59/+192
| |\ \ \
| | * | | [ticket/12710] Fix missing closing bracketJoas Schilling2014-08-091-1/+1
| | * | | [ticket/12710] Prefix column so it does not start with a numberJoas Schilling2014-08-091-1/+1
| | * | | [ticket/12710] Pass the original column data to the create functionJoas Schilling2014-08-091-2/+3
| | * | | [ticket/12710] Fix foreach generationJoas Schilling2014-08-091-1/+1
| | * | | [ticket/12710] Compare to uppercase versionJoas Schilling2014-08-091-1/+1
| | * | | [ticket/12710] Do not try to match the uniqueness in the queryJoas Schilling2014-08-091-4/+6
| | * | | [ticket/12710] Remove table_name from index_name before deleting and recreati...Joas Schilling2014-08-091-3/+15
| | * | | [ticket/12710] Can not use upper in oracles where clausJoas Schilling2014-08-091-3/+3
| | * | | [ticket/12710] Correctly select index name and compare to column nameJoas Schilling2014-08-091-2/+2
| | * | | [ticket/12710] Fix problems with creating unique indexes on oracleJoas Schilling2014-08-091-1/+1
| | * | | [ticket/12710] Correctly fetch unique and normal indexes only in MSSQLJoas Schilling2014-08-091-9/+6
| | * | | [ticket/12710] Fix changing the column type on oracleJoas Schilling2014-08-071-47/+129
| | * | | [ticket/12710] Prepare get_existing_indexes() for other DBMSJoas Schilling2014-08-071-73/+112
| | |/ /
* | | | 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] Fix spelling error in commentJoas Schilling2014-08-091-1/+1
| | * | | [ticket/security-155] Cast the types of string values in the controller routesJoas Schilling2014-08-081-1/+17
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-081-27/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-bantu/ticket/12937' into develop-ascraeusNils Adermann2014-08-081-27/+12
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/12937] Do not return false. Return null for get and array() for all.Andreas Fischer2014-08-081-27/+12
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-081-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2838 from dhruvgoel92/ticket/12738Joas Schilling2014-08-081-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/12738] Pass $this->config in content_visibility constructorDhruv2014-08-081-0/+1
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-083-373/+215
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12789] Move duplicated functions to the base classTristan Darricau2014-08-083-417/+215
| * | | | [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()Tristan Darricau2014-08-081-13/+57
| | |/ / | |/| |
* | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-071-21/+0
|\ \ \ \ | |/ / /