aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11033] Update string to reflect real requirementsJakub Senko2014-11-221-1/+1
| | | | PHPBB3-11033
* Merge pull request #3093 from nickvergessen/ticket/13241Andreas Fischer2014-10-295-20/+290
|\ | | | | | | | | | | | | | | | | | | | | | | [ticket/13241] Fix pagination of viewforum with global announcements * nickvergessen/ticket/13241: [ticket/13241] Remove sleep() and change flood interval instead [ticket/13241] Remove sleep() since the method takes care of this now [ticket/13241] Sleep for 1 second when posting twice in the same second [ticket/13241] Fix pagination with global announcements [ticket/13241] Correctly ignore announcements from topics list [ticket/13241] Add a functional test for viewforum with global announcement
| * [ticket/13241] Remove sleep() and change flood interval insteadJoas Schilling2014-10-291-3/+22
| | | | | | | | PHPBB3-13241
| * [ticket/13241] Remove sleep() since the method takes care of this nowJoas Schilling2014-10-291-12/+0
| | | | | | | | PHPBB3-13241
| * [ticket/13241] Sleep for 1 second when posting twice in the same secondJoas Schilling2014-10-292-1/+8
| | | | | | | | PHPBB3-13241
| * [ticket/13241] Fix pagination with global announcementsJoas Schilling2014-10-291-2/+2
| | | | | | | | PHPBB3-13241
| * [ticket/13241] Correctly ignore announcements from topics listJoas Schilling2014-10-291-2/+2
| | | | | | | | PHPBB3-13241
| * [ticket/13241] Add a functional test for viewforum with global announcementJoas Schilling2014-10-291-0/+256
| | | | | | | | PHPBB3-13241
* | Merge pull request #3076 from marc1706/ticket/12703Andreas Fischer2014-10-291-19/+25
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12703] Only query database for subscription types once * marc1706/ticket/12703: [ticket/12703] Only query database for subscription types once
| * | [ticket/12703] Only query database for subscription types onceMarc Alexander2014-10-261-19/+25
| | | | | | | | | | | | PHPBB3-12703
* | | Merge pull request #3065 from dhruvgoel92/feature/phantomAndreas Fischer2014-10-2915-0/+339
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [feature/phantom] * dhruvgoel92/feature/phantom: [ticket/12962] Rename setup-phpbb-test [ticket/12962] Use phpVersion in phpunit.xml [ticket/12962] Functional tests run for php <5.3.19 [ticket/12962] Clean up composer.json [ticket/12962] Fix Line Endings in bootstrap [ticket/12962] Load composer test dependencies for php >= 5.3.19 [ticket/12962] bootstrap functional and ui test when php >5.3.19 [ticket/12962] Install test dependencies on travis [ticket/12962] Add facebook/webdriver dependency [ticket/12962] Fix whitespace characters [ticket/12962] Run tests for all databases on Travis [ticket/12962] Force language=en for UI tests installation [ticket/12962] Dump server output to /dev/null [ticket/12962] Start phantomjs on travis in background [ticket/12962] Mark test skipped when phantom server not running [ticket/12962] Add setup-phantomjs-server.sh [ticket/12962] Run UI tests on Travis-mysql [ticket/12962] Add UI tests to phpunit.xml.dist [ticket/12962] Add quick-links JS test [ticket/12962] Add initial class for ui_testing
| * | [ticket/12962] Rename setup-phpbb-testDhruv2014-10-273-1/+2
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Use phpVersion in phpunit.xmlDhruv2014-10-273-3/+3
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Functional tests run for php <5.3.19Dhruv2014-10-261-1/+1
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Clean up composer.jsonDhruv2014-10-261-19/+0
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Fix Line Endings in bootstrapDhruv2014-10-251-40/+40
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Load composer test dependencies for php >= 5.3.19Dhruv2014-10-251-4/+0
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] bootstrap functional and ui test when php >5.3.19Dhruv2014-09-211-2/+6
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Install test dependencies on travisDhruv2014-09-212-0/+21
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Add facebook/webdriver dependencyDhruv2014-09-214-1/+92
| | | | | | | | | | | | | | | | | | | | | Create a new composer.json for tests dir and add facebook/webdriver dependency PHPBB3-12962
| * | [ticket/12962] Fix whitespace charactersDhruv2014-09-211-16/+16
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Run tests for all databases on TravisDhruv2014-09-214-0/+16
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Force language=en for UI tests installationDhruv2014-09-211-1/+1
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Dump server output to /dev/nullDhruv2014-09-211-1/+1
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Start phantomjs on travis in backgroundDhruv2014-09-211-2/+1
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Mark test skipped when phantom server not runningDhruv2014-09-212-3/+7
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Add setup-phantomjs-server.shDhruv2014-09-211-2/+3
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Run UI tests on Travis-mysqlDhruv2014-09-212-0/+5
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Add UI tests to phpunit.xml.distDhruv2014-09-211-0/+4
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Add quick-links JS testDhruv2014-09-213-38/+64
| | | | | | | | | | | | PHPBB3-12962
| * | [ticket/12962] Add initial class for ui_testingDhruv2014-09-211-0/+190
| | | | | | | | | | | | PHPBB3-12962
* | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php
| | * \ \ Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
| | |\ \ \ | | | | | | | | | | | | | | | | | | Ticket/13234
| * | \ \ \ Merge pull request #3091 from Nicofuma/ticket/13234-2Joas Schilling2014-10-281-28/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ticket/13234 2
| | * \ \ \ \ [ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2Tristan Darricau2014-10-280-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13234: [ticket/13234] Fix conditions and CS Conflicts: phpBB/phpbb/session.php PHPBB3-13234
| | | * | | | [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13234
| | * | | | | [ticket/13234-2] Correctly verify that user_id is set in user data arrayNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13234-2
| | * | | | | [ticket/13234-2] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-29/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ascraeus version of 64d97d0787a63b3c646f89237574ac566ed89c50 commit PHPBB3-13234
| | * | | | | Merge branch 'ticket/13234' into ticket/13234-2Nils Adermann2014-10-270-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * ticket/13234: [ticket/13234] Never allow autologin/remember me to modify the userid
| | | * | | | [ticket/13234] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-31/+40
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents admin relogin with forced user id from overwriting remember me cookies PHPBB3-13234
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13232
| | * | | | [ticket/13232] Ensure prune cron job always gets run in prune testNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cron scheduler might pick a different task but we don't want to go through them all to find the one we need. So we just make sure cron is run at all and then manually run the one we want. PHPBB3-13232
| | * | | | Merge pull request #4 from nickvergessen/naderman-ticket/13232Nils Adermann2014-10-272-3/+3
| | |\ \ \ \ | | | | | | | | | | | | | | [ticket/13232] Fix more issues with TTL and global cache file
| | | * | | | [ticket/13232] Fix more issues with TTL and global cache fileJoas Schilling2014-10-282-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13232
| | * | | | [ticket/13232] Fix indentationNils Adermann2014-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13232
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 16:47:30 +0000