aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.0' into develop-ascraeusAndreas Fischer2014-10-258-43/+46
|\
| * Merge pull request #3059 from nickvergessen/ticket/13208Marc Alexander2014-10-231-1/+1
| |\
| | * [ticket/13208] Add security issues to the final changelogJoas Schilling2014-10-231-1/+1
| |/ |/|
| * [prep-release-3.1.0] Prepare ChangelogJoas Schilling2014-10-231-34/+37
| * [prep-release-3.1.0] Update version to 3.1.0Joas Schilling2014-10-236-8/+8
|/
* Merge branch 'prep-release-3.1.0-RC6' into develop-ascraeusJoas Schilling2014-10-238-43/+112
|\
| * [prep-release-3.1.0-RC6] Update phpBB Version for RC7 developmentJoas Schilling2014-10-233-5/+5
| * [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6Joas Schilling2014-10-231-0/+35
| * [prep-release-3.1.0-RC6] Prepare ChangelogJoas Schilling2014-10-231-33/+36
| * [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6Joas Schilling2014-10-231-0/+31
| * [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6Joas Schilling2014-10-236-8/+8
|/
* Merge pull request #3 from phpbb/ticket/security-161Joas Schilling2014-10-231-5/+14
|\
| * [ticket/security-161] Add form token to styles management form.Cesar G2014-10-221-5/+14
* | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-224-1/+44
|\ \
| * | [ticket/13205] Explicitly cast ids to integers and reformat SQLNils Adermann2014-10-222-5/+5
| * | [ticket/13205] Remove superfluous newlineNils Adermann2014-10-221-1/+0
| * | [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-224-1/+45
* | | Merge pull request #3057 from marc1706/ticket/security-159Nils Adermann2014-10-221-2/+7
|\ \ \ | |/ / |/| |
| * | [ticket/security-159] Only show first 8 characters of login keys in UCPMarc Alexander2014-10-221-2/+7
|/ /
* | Merge pull request #3056 from marc1706/ticket/13203Nils Adermann2014-10-2214-14/+58
|\ \
| * | [ticket/13203] Fix passwords manager testsMarc Alexander2014-10-221-1/+1
| * | [ticket/13203] Use string_compare method in passwords driversMarc Alexander2014-10-2212-13/+19
| * | [ticket/13203] Add method for byte by byte comparison to drivers helperMarc Alexander2014-10-222-0/+38
|/ /
* | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-10-211-1/+1
|\ \
| * \ Merge pull request #3051 from nickvergessen/ticket/12120Marc Alexander2014-10-211-1/+1
| |\ \
| | * | [ticket/12120] Remove EXreaction from active authorsJoas Schilling2014-10-211-1/+1
| |/ /
* | | Merge pull request #3053 from Senky/ticket/13194Marc Alexander2014-10-211-1/+1
|\ \ \
| * | | [ticket/13194] Use correct array to access bbcode_bitfieldJakub Senko2014-10-211-1/+1
* | | | Merge pull request #3052 from VSEphpbb/ticket/13041Marc Alexander2014-10-211-32/+44
|\ \ \ \
| * | | | [ticket/13041] Final grammar and language changes to help_faqMatt Friedman2014-10-211-9/+9
| * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-181-9/+9
| * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-111-2/+2
| * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-081-21/+25
| * | | | [ticket/13041] Updating "Topic Subscriptions and Bookmarks"Mario Skouat2014-10-021-1/+1
| * | | | [ticket/13041] Updating "phpBB3 Issues"Mario Skouat2014-10-021-2/+6
| * | | | [ticket/13041] Updating "Searching the Forums"Mario Skouat2014-10-021-1/+1
| * | | | [ticket/13041] Updating "Posting Issues"Mario Skouat2014-10-021-1/+1
| * | | | [ticket/13041] Updating "Login and Registration Issues"Mario Skouat2014-10-021-4/+4
| * | | | [ticket/13041] Updating "User Preferences and settings"Mario Skouat2014-10-011-4/+8
| * | | | [ticket/13041] Reordering "Login and Registration Issues"Mario Skouat2014-09-211-17/+17
* | | | | Merge pull request #3049 from marc1706/ticket/13189Nils Adermann2014-10-212-26/+14
|\ \ \ \ \
| * | | | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-202-26/+14
* | | | | | Merge pull request #3050 from prototech/ticket/13070Marc Alexander2014-10-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/13070] Adjust template hook name to match that provided in the class.Cesar G2014-10-201-1/+1
|/ / / / /
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-10-201-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
| |\ \ \ \
| | * | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
* | | | | | Merge pull request #3040 from nickvergessen/ticket/13138-ascJoas Schilling2014-10-203-15/+27
|\ \ \ \ \ \
| * | | | | | [ticket/13138] Type hint the variables for IDE usageJoas Schilling2014-10-171-0/+5
| * | | | | | [ticket/13138] Fix the session key testsJoas Schilling2014-10-171-6/+13