aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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.
| * [ticket/security-161] Add form token to styles management form.Cesar G2014-10-221-5/+14
| | | | | | | | SECURITY-161
* | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-224-1/+44
|\ \ | | | | | | | | | [ticket/13205] Add a mark all messages read link to PM folders
| * | [ticket/13205] Explicitly cast ids to integers and reformat SQLNils Adermann2014-10-222-5/+5
| | | | | | | | | | | | PHPBB3-13205
| * | [ticket/13205] Remove superfluous newlineNils Adermann2014-10-221-1/+0
| | | | | | | | | | | | PHPBB3-13205
| * | [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-224-1/+45
| | | | | | | | | | | | PHPBB3-13205
* | | 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 UCP
| * | [ticket/security-159] Only show first 8 characters of login keys in UCPMarc Alexander2014-10-221-2/+7
|/ / | | | | | | SECURITY-159
* | Merge pull request #3056 from marc1706/ticket/13203Nils Adermann2014-10-2214-14/+58
|\ \ | | | | | | [ticket/13203] Use constant time comparison method for comparing password hashes
| * | [ticket/13203] Fix passwords manager testsMarc Alexander2014-10-221-1/+1
| | | | | | | | | | | | PHPBB3-13203
| * | [ticket/13203] Use string_compare method in passwords driversMarc Alexander2014-10-2212-13/+19
| | | | | | | | | | | | PHPBB3-13203
| * | [ticket/13203] Add method for byte by byte comparison to drivers helperMarc Alexander2014-10-222-0/+38
|/ / | | | | | | PHPBB3-13203
* | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-10-211-1/+1
|\ \ | | | | | | | | | | | | Conflicts: phpBB/docs/AUTHORS
| * \ Merge pull request #3051 from nickvergessen/ticket/12120Marc Alexander2014-10-211-1/+1
| |\ \ | | | | | | | | | | | | [ticket/12120] Remove EXreaction from active authors
| | * | [ticket/12120] Remove EXreaction from active authorsJoas Schilling2014-10-211-1/+1
| |/ / | | | | | | | | | PHPBB3-12120
* | | Merge pull request #3053 from Senky/ticket/13194Marc Alexander2014-10-211-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/13194] BBCode isn't parsed when issuing a warning for a post
| * | | [ticket/13194] Use correct array to access bbcode_bitfieldJakub Senko2014-10-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13194
* | | | Merge pull request #3052 from VSEphpbb/ticket/13041Marc Alexander2014-10-211-32/+44
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13041] Help_faq.php language file needs to be revised
| * | | | [ticket/13041] Final grammar and language changes to help_faqMatt Friedman2014-10-211-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
| * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-181-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improper english in some sentences. - Improper use of singular/plural in some sentences - Replace "the board administrator" by "a board administrator" - Update the category "Posting Issues" and "Subscriptions and Bookmarks" PHPBB3-13041
| * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added the changes reported by VSE. PHPBB3-13041
| * | | | [ticket/13041] Added multiple changesMario Skouat2014-10-081-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "phpBB3" replaced by "phpBB" - Added the changes suggested by VSE. - "Subscriptions and Bookmarks" reviewed - Added trailing comma on modified lines PHPBB3-13041
| * | | | [ticket/13041] Updating "Topic Subscriptions and Bookmarks"Mario Skouat2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
| * | | | [ticket/13041] Updating "phpBB3 Issues"Mario Skouat2014-10-021-2/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
| * | | | [ticket/13041] Updating "Searching the Forums"Mario Skouat2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
| * | | | [ticket/13041] Updating "Posting Issues"Mario Skouat2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
| * | | | [ticket/13041] Updating "Login and Registration Issues"Mario Skouat2014-10-021-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
| * | | | [ticket/13041] Updating "User Preferences and settings"Mario Skouat2014-10-011-4/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
| * | | | [ticket/13041] Reordering "Login and Registration Issues"Mario Skouat2014-09-211-17/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-13041
* | | | | Merge pull request #3049 from marc1706/ticket/13189Nils Adermann2014-10-212-26/+14
|\ \ \ \ \ | | | | | | | | | | | | [ticket/13189] Do not use confirm box for marking all notifications read
| * | | | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-202-26/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* | | | | | 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.
| * | | | | [ticket/13070] Adjust template hook name to match that provided in the class.Cesar G2014-10-201-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-13070
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-10-201-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| * | | | Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility * Elsensee/ticket/13168: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| | * | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13168
* | | | | | Merge pull request #3040 from nickvergessen/ticket/13138-ascJoas Schilling2014-10-203-15/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [3.1] Ticket/13138 Only use cookie data when we do not force a user_id Conflicts: phpBB/phpbb/session.php
| * | | | | | [ticket/13138] Type hint the variables for IDE usageJoas Schilling2014-10-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13138
| * | | | | | [ticket/13138] Fix the session key testsJoas Schilling2014-10-171-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13138
| * | | | | | Merge branch 'ticket/13138-2' into ticket/13138-ascJoas Schilling2014-10-161-26/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php
* | \ \ \ \ \ \ Merge pull request #3048 from naderman/ticket/13188Nils Adermann2014-10-201-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13188] Add missing where clause to post_id query in sphinx index
| * | | | | | | | [ticket/13188] Correctly format string concatenationNils Adermann2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13188
| * | | | | | | | [ticket/13188] Add missing where clause to post_id query in sphinx indexNils Adermann2014-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13188
* | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-10-201-26/+29
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13138] Do not use cookie data and autologin while forcing a user_id Conflicts: phpBB/phpbb/session.php
| * | | | | | | | Merge pull request #3039 from nickvergessen/ticket/13138Nils Adermann2014-10-201-28/+31
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | | [ticket/13138] Only use cookie data when we do not force a user_id
| | * | | | | | [ticket/13138] Do not use cookie data and autologin while forcing a user_idJoas Schilling2014-10-161-28/+31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13138
* | | | | | | Merge pull request #3046 from Elsensee/ticket/13187Joas Schilling2014-10-201-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13187] Fix HTML validity of INSTALL.html