aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-08-102-2/+47
|\
| * Merge remote-tracking branch 'github-nicofuma/ticket/8064' into develop-ascraeusNils Adermann2014-08-102-2/+47
| |\
| | * [ticket/8064] Change the collation of topic_first_poster_nameTristan Darricau2014-08-102-2/+47
* | | Merge pull request #2859 from Nicofuma/ticket/12957Marc Alexander2014-08-105-8/+66
|\ \ \
| * | | [ticket/12957] Removed unused useTristan Darricau2014-08-101-3/+0
| * | | [ticket/12957] Update the constructions of the template engineTristan Darricau2014-08-105-5/+66
* | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-101-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #2851 from marc1706/ticket/12949Dhruv Goel2014-08-101-1/+1
| |\ \
| | * | [ticket/12949] Check if mime_content_type is actually callableMarc Alexander2014-08-091-1/+1
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-108-3/+74
|\ \ \ \ | |/ / /
| * | | Merge pull request #2849 from bantu/ticket/12941Tristan Darricau2014-08-108-3/+74
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/12941] Fix remaining Sami complaints.Andreas Fischer2014-08-092-1/+2
| | * | [ticket/12941] Check for Sami parse errors on Travis CI.Andreas Fischer2014-08-094-0/+49
| | * | [ticket/12941] Add sami.conf.php for Travis CI.Andreas Fischer2014-08-092-2/+23
| | |/
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-109-387/+174
|\ \ \ | |/ /
| * | Merge pull request #2691 from dhruvgoel92/ticket/11528Tristan Darricau2014-08-109-387/+174
| |\ \
| | * | [ticket/11528] Revert Mink changesDhruv2014-08-099-387/+174
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-101-2/+5
|\ \ \ \ | |/ / /
| * | | Merge pull request #2854 from bantu/ticket/12954Tristan Darricau2014-08-101-2/+5
| |\ \ \
| | * | | [ticket/12954] Correctly setup PATH_INFO on Travis CI.Andreas Fischer2014-08-091-2/+5
* | | | | 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 developMarc Alexander2014-08-091-6/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2848 from bantu/ticket/12948Marc Alexander2014-08-091-6/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/12948] Remove no longer needed opcache workaround. Travis has 5.5.15.Andreas Fischer2014-08-091-6/+0
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-093-65/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2624 from dhruvgoel92/ticket/12718Tristan Darricau2014-08-093-65/+51
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [ticket/12718] Use a separate variable for sql queryDhruv2014-08-081-3/+4
| | * | | | [ticket/12718] Fix spacing and type castingDhruv2014-08-071-2/+2
| | * | | | [ticket/12718] Fix docblocksDhruv2014-08-071-3/+3
| | * | | | [ticket/12718] Add tests to check user_posts on post deletionDhruv2014-08-071-2/+33
| | * | | | [ticket/12718] Update docblockDhruv2014-08-071-3/+1
| | * | | | [ticket/12718] Use remove_topic_from_statistic() for delete_topicDhruv2014-08-072-58/+14
* | | | | | Merge remote-tracking branch 'github-nicofuma/ticket/11649' into developNils Adermann2014-08-099-46/+193
|\ \ \ \ \ \
| * | | | | | [ticket/11649] Fix coding styleTristan Darricau2014-08-091-7/+9
| * | | | | | [ticket/11649] Expose Twig through the containerTristan Darricau2014-08-099-46/+191
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-091-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'github-nicofuma/ticket/12693' into develop-ascr...Nils Adermann2014-08-091-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/12693] Don't try to check the composer.phar fileTristan Darricau2014-08-091-1/+1
| |/ / / /
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-092-65/+198
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into develop...Nils Adermann2014-08-092-65/+198
| |\ \ \ \
| | * | | | [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