aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12924] Make meta tags self-closingJakub Senko2014-11-2210-14/+14
* Merge pull request #3093 from nickvergessen/ticket/13241Andreas Fischer2014-10-295-20/+290
|\
| * [ticket/13241] Remove sleep() and change flood interval insteadJoas Schilling2014-10-291-3/+22
| * [ticket/13241] Remove sleep() since the method takes care of this nowJoas Schilling2014-10-291-12/+0
| * [ticket/13241] Sleep for 1 second when posting twice in the same secondJoas Schilling2014-10-292-1/+8
| * [ticket/13241] Fix pagination with global announcementsJoas Schilling2014-10-291-2/+2
| * [ticket/13241] Correctly ignore announcements from topics listJoas Schilling2014-10-291-2/+2
| * [ticket/13241] Add a functional test for viewforum with global announcementJoas Schilling2014-10-291-0/+256
* | Merge pull request #3076 from marc1706/ticket/12703Andreas Fischer2014-10-291-19/+25
|\ \
| * | [ticket/12703] Only query database for subscription types onceMarc Alexander2014-10-261-19/+25
* | | Merge pull request #3065 from dhruvgoel92/feature/phantomAndreas Fischer2014-10-2915-0/+339
|\ \ \ | |_|/ |/| |
| * | [ticket/12962] Rename setup-phpbb-testDhruv2014-10-273-1/+2
| * | [ticket/12962] Use phpVersion in phpunit.xmlDhruv2014-10-273-3/+3
| * | [ticket/12962] Functional tests run for php <5.3.19Dhruv2014-10-261-1/+1
| * | [ticket/12962] Clean up composer.jsonDhruv2014-10-261-19/+0
| * | [ticket/12962] Fix Line Endings in bootstrapDhruv2014-10-251-40/+40
| * | [ticket/12962] Load composer test dependencies for php >= 5.3.19Dhruv2014-10-251-4/+0
| * | [ticket/12962] bootstrap functional and ui test when php >5.3.19Dhruv2014-09-211-2/+6
| * | [ticket/12962] Install test dependencies on travisDhruv2014-09-212-0/+21
| * | [ticket/12962] Add facebook/webdriver dependencyDhruv2014-09-214-1/+92
| * | [ticket/12962] Fix whitespace charactersDhruv2014-09-211-16/+16
| * | [ticket/12962] Run tests for all databases on TravisDhruv2014-09-214-0/+16
| * | [ticket/12962] Force language=en for UI tests installationDhruv2014-09-211-1/+1
| * | [ticket/12962] Dump server output to /dev/nullDhruv2014-09-211-1/+1
| * | [ticket/12962] Start phantomjs on travis in backgroundDhruv2014-09-211-2/+1
| * | [ticket/12962] Mark test skipped when phantom server not runningDhruv2014-09-212-3/+7
| * | [ticket/12962] Add setup-phantomjs-server.shDhruv2014-09-211-2/+3
| * | [ticket/12962] Run UI tests on Travis-mysqlDhruv2014-09-212-0/+5
| * | [ticket/12962] Add UI tests to phpunit.xml.distDhruv2014-09-211-0/+4
| * | [ticket/12962] Add quick-links JS testDhruv2014-09-213-38/+64
| * | [ticket/12962] Add initial class for ui_testingDhruv2014-09-211-0/+190
* | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-0/+10
|\ \ \
| * | | [prep-release-3.1.0] Update changelog with final changesJoas Schilling2014-10-281-0/+10
* | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-28/+37
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into prep-release-3.1.0Joas Schilling2014-10-280-0/+0
| |\ \ \
| | * \ \ Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
| | |\ \ \
| * | \ \ \ Merge pull request #3091 from Nicofuma/ticket/13234-2Joas Schilling2014-10-281-28/+37
| |\ \ \ \ \
| | * \ \ \ \ [ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2Tristan Darricau2014-10-280-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| | * | | | | [ticket/13234-2] Correctly verify that user_id is set in user data arrayNils Adermann2014-10-271-2/+2
| | * | | | | [ticket/13234-2] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-29/+38
| | * | | | | Merge branch 'ticket/13234' into ticket/13234-2Nils Adermann2014-10-270-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | [ticket/13234] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-31/+40
| | | |/ / /
* | | | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-285-7/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-285-7/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/13232] Fix spaces vs tabsJoas Schilling2014-10-281-2/+2
| | * | | | [ticket/13232] Ensure prune cron job always gets run in prune testNils Adermann2014-10-271-2/+2
| | * | | | Merge pull request #4 from nickvergessen/naderman-ticket/13232Nils Adermann2014-10-272-3/+3
| | |\ \ \ \
| | | * | | | [ticket/13232] Fix more issues with TTL and global cache fileJoas Schilling2014-10-282-3/+3
| | |/ / / /
| | * | | | [ticket/13232] Fix indentationNils Adermann2014-10-271-2/+2