aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-11-0217-20/+216
|\
| * Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-0221-26/+223
| |\
| | * Merge remote-tracking branch 'github-security/ticket/security-164-alt' into p...Nils Adermann2014-11-022-1/+4
| | |\
| | | * [ticket/security-164] Correctly format page_nameMarc Alexander2014-11-011-1/+1
| | | * [ticket/security-164] Sanitize all global variables in symfony_request classMarc Alexander2014-11-011-0/+3
| | * | Merge branch 'ticket/13271' into prep-release-3.1.1Nils Adermann2014-11-023-1/+5
| | |\ \
| | | * | [ticket/13271] Disable CC sender feature for anonymous usersNils Adermann2014-11-023-1/+5
| | * | | [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 prep-release...Nils Adermann2014-11-011-0/+136
| | |\ \ \
| | | * | | [ticket/13263] Make sure default style exists and clean up codeMarc Alexander2014-11-011-47/+12
| | | * | | [ticket/13263] Only install/set prosilver if no style availableMarc Alexander2014-11-011-28/+24
| | | * | | [ticket/13263] Use prosilver as default style if user's style doesn't existMarc Alexander2014-11-011-0/+175
| | | |/ /
| | * | | [ticket/13248] Correctly pass provider nameMarc Alexander2014-11-011-1/+1
| | * | | [ticket/13248] Always use provider collection for getting providerMarc Alexander2014-11-013-7/+8
| | * | | [ticket/13248] Allow specifying different auth provider in provider collectionMarc Alexander2014-11-011-3/+5
| | * | | [ticket/13248] Use auth provider collection for getting providerMarc Alexander2014-11-011-3/+3
| | * | | Merge branch 'ticket/13262' into prep-release-3.1.1Nils Adermann2014-11-011-2/+2
| | |\ \ \
| | | * | | [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1Matt Friedman2014-11-011-2/+2
| | | | |/ | | | |/|
| | * | | Merge branch 'ticket/13267' into prep-release-3.1.1Nils Adermann2014-11-012-2/+2
| | |\ \ \
| | | * | | [ticket/13267] Update Automatic Update instructions to include vendor directoryPatrick Webster2014-11-012-2/+2
| | | |/ /
| | * | | [ticket/13268] Properly append ternary result in get_existing_indexes()Patrick Webster2014-11-011-2/+2
| | |/ /
| | * | [prep-release-3.1.1] Update version number to 3.1.1Nils Adermann2014-11-015-7/+7
| | |/
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-011-2/+2
|\ \ \ | |/ /
| * | 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.1Matt Friedman2014-10-311-2/+2
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-011-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/13253] Fix MCP queue link in active topics search.Cesar G2014-10-301-1/+1
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-291-4/+4
|\ \ \ \ | |/ / /
| * | | Merge pull request #3093 from nickvergessen/ticket/13241Andreas Fischer2014-10-291-4/+4
| |\ \ \
| | * | | [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
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-291-19/+25
|\ \ \ \ | |/ / /
| * | | 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 branch 'develop-ascraeus' into developJoas Schilling2014-10-281-0/+10
|\ \ \ \ | |/ / /
| * | | 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 'develop-ascraeus' into developJoas Schilling2014-10-281-28/+37
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-281-28/+37
| |\ \ \ | | |/ /
| | * | Merge pull request #3091 from Nicofuma/ticket/13234-2Joas Schilling2014-10-281-28/+37
| | |\ \
| | | * | [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 'develop-ascraeus' into developJoas Schilling2014-10-284-5/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusJoas Schilling2014-10-284-5/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-284-5/+6
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [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
| | | * | [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasksNils Adermann2014-10-272-3/+4
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-272-1/+22
|\ \ \ \ \ | |/ / / /