aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13280] Properly format the current page and add sanitizer to testsMarc Alexander2014-11-032-11/+18
| | | | PHPBB3-13280
* Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-0223-29/+245
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.1: [ticket/13271] Disable CC sender feature for anonymous users [prep-release-3.1.1] Add 3.1.1 CHANGELOG [prep-release-3.1.1] Add 3.1.1 migration file [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class [ticket/13248] Use functional framework login method in tests [ticket/13248] Correctly pass provider name [ticket/13248] Always use provider collection for getting provider [ticket/13248] Allow specifying different auth provider in provider collection [ticket/13248] Use auth provider collection for getting provider [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 [ticket/13267] Update Automatic Update instructions to include vendor directory [ticket/13268] Properly append ternary result in get_existing_indexes() [prep-release-3.1.1] Update version number to 3.1.1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * Merge remote-tracking branch 'github-security/ticket/security-164-alt' into ↵Nils Adermann2014-11-022-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.1 * github-security/ticket/security-164-alt: [ticket/security-164] Correctly format page_name [ticket/security-164] Sanitize all global variables in symfony_request class
| | * [ticket/security-164] Correctly format page_nameMarc Alexander2014-11-011-1/+1
| | | | | | | | | | | | SECURITY-164
| | * [ticket/security-164] Sanitize all global variables in symfony_request classMarc Alexander2014-11-011-0/+3
| | | | | | | | | | | | SECURITY-164
| * | Merge branch 'ticket/13271' into prep-release-3.1.1Nils Adermann2014-11-023-1/+5
| |\ \ | | | | | | | | | | | | | | | | * ticket/13271: [ticket/13271] Disable CC sender feature for anonymous users
| | * | [ticket/13271] Disable CC sender feature for anonymous usersNils Adermann2014-11-023-1/+5
| | | | | | | | | | | | | | | | PHPBB3-13271
| * | | [prep-release-3.1.1] Add 3.1.1 CHANGELOGNils Adermann2014-11-021-0/+19
| | | |
| * | | [prep-release-3.1.1] Add 3.1.1 migration fileNils Adermann2014-11-021-0/+32
| | | |
| * | | Merge remote-tracking branch 'github-marc1706/ticket/13263' into ↵Nils Adermann2014-11-011-0/+136
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.1.1 * github-marc1706/ticket/13263: [ticket/13263] Make sure default style exists and clean up code [ticket/13263] Only install/set prosilver if no style available [ticket/13263] Use prosilver as default style if user's style doesn't exist
| | * | | [ticket/13263] Make sure default style exists and clean up codeMarc Alexander2014-11-011-47/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13263
| | * | | [ticket/13263] Only install/set prosilver if no style availableMarc Alexander2014-11-011-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users that have a nonexistent style selectd will revert back to the default style. PHPBB3-13263
| | * | | [ticket/13263] Use prosilver as default style if user's style doesn't existMarc Alexander2014-11-011-0/+175
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | If prosilver is not installed for whatever reason, it will be installed by the newly added migration. PHPBB3-13263
| * | | Merge pull request #3104 from marc1706/ticket/13248-altNils Adermann2014-11-016-13/+35
| |\ \ \ | | | | | | | | | | [ticket/13248] Login functions need to use provider collection for retrieving provider
| | * | | [ticket/13248] Use functional framework login method in testsMarc Alexander2014-11-011-7/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| | * | | [ticket/13248] Correctly pass provider nameMarc Alexander2014-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| | * | | [ticket/13248] Always use provider collection for getting providerMarc Alexander2014-11-013-7/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| | * | | [ticket/13248] Allow specifying different auth provider in provider collectionMarc Alexander2014-11-011-3/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13248
| | * | | [ticket/13248] Use auth provider collection for getting providerMarc Alexander2014-11-012-3/+27
| |/ / / | | | | | | | | | | | | PHPBB3-13248
| * | | Merge branch 'ticket/13262' into prep-release-3.1.1Nils Adermann2014-11-011-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/13262: [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
| | * | | [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1Matt Friedman2014-11-011-2/+2
| | | |/ | | |/| | | | | | | | | PHPBB3-13262
| * | | Merge branch 'ticket/13267' into prep-release-3.1.1Nils Adermann2014-11-012-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/13267: [ticket/13267] Update Automatic Update instructions to include vendor directory
| | * | | [ticket/13267] Update Automatic Update instructions to include vendor directoryPatrick Webster2014-11-012-2/+2
| | |/ / | | | | | | | | | | | | PHPBB3-13267
| * | | Merge branch 'ticket/13268' into prep-release-3.1.1Nils Adermann2014-11-011-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | * ticket/13268: [ticket/13268] Properly append ternary result in get_existing_indexes()
| | * | [ticket/13268] Properly append ternary result in get_existing_indexes()Patrick Webster2014-11-011-2/+2
| |/ / | | | | | | | | | PHPBB3-13268
| * | [prep-release-3.1.1] Update version number to 3.1.1Nils Adermann2014-11-016-10/+10
| |/
* | Merge pull request #3098 from VSEphpbb/ticket/13262Marc Alexander2014-11-011-2/+2
|\ \ | | | | | | | | | [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
| * | [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1Matt Friedman2014-10-311-2/+2
| | | | | | | | | | | | PHPBB3-13262
* | | Merge pull request #3097 from prototech/ticket/13253Marc Alexander2014-11-011-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/13253] Fix MCP queue link in active topics search.
| * | | [ticket/13253] Fix MCP queue link in active topics search.Cesar G2014-10-301-1/+1
|/ / / | | | | | | | | | PHPBB3-13253
* | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 10:40:59 +0000