aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-24/+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 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-201-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [3.1] Ticket/13138 Only use cookie data when we do not force a user_id Conflicts: phpBB/phpbb/session.php
| * \ \ 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
| * | | | [ticket/13138] Do not use cookie data and autologin while forcing a user_idJoas Schilling2014-10-161-28/+31
| | |_|/ | |/| | | | | | | | | | PHPBB3-13138
| * | | Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-061-2/+14
| |\ \ \ | | | | | | | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined
* | | | | [ticket/13187] Fix HTML validity of INSTALL.htmlOliver Schramm2014-10-201-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13187
* | | | | Merge pull request #2960 from prototech/ticket/12568Joas Schilling2014-10-204-46/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12568] Update user docs
| * | | | | [ticket/12568] Fix awkward use of "phpBB Limited."Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568
| * | | | | [ticket/12568] The "Purge cache" option in the Customise tab no longer exists.Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568
| * | | | | [ticket/12568] Update GitHub link.Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568
| * | | | | [ticket/12568] Fix typo - "directorie" -> "directories"Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568
| * | | | | [ticket/12568] Remove various unnecessary references to phpBB3.Cesar G2014-10-164-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568
| * | | | | [ticket/12568] Update style installation instructions.Cesar G2014-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568
| * | | | | [ticket/12568] Update path to language pack installation page.Cesar G2014-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568
| * | | | | [ticket/12568] Replace modifications explanation with extensions.Cesar G2014-10-161-6/+6
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-12568
* | | | | [ticket/13186] Don't show link on post count when search disabledOliver Schramm2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13186
* | | | | Merge pull request #3030 from Senky/ticket/13164Marc Alexander2014-10-181-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility
| * | | | | [ticket/13164] Fix syntax errorJakub Senko2014-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
| * | | | | [ticket/13164] Add post_visibility to core.submit_post_end eventJakub Senko2014-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
| * | | | | [ticket/13164] Update post_visibility before event is triggeredJakub Senko2014-10-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
* | | | | | Merge pull request #3041 from nickvergessen/ticket/13171Marc Alexander2014-10-181-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13171] Check the correct (soft)delete permission when deleting in MCP
| * | | | | | [ticket/13171] Check the correct (soft)delete permission when deleting in MCPJoas Schilling2014-10-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13171
* | | | | | | [ticket/13181] Replace database credentials with placeholders in sphinx confNils Adermann2014-10-182-3/+3
| |_|/ / / / |/| | | | | | | | | | | | | | | | | PHPBB3-13181
* | | | | | Merge remote-tracking branch 'PayBas/ticket/12796' into develop-ascraeusCesar G2014-10-165-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12796: [ticket/12796] Use dedicated lang vars [ticket/12796] Use & in path [ticket/12796] Add view own profile to UCP (and vice versa)
| * | | | | | [ticket/12796] Use dedicated lang varsPayBas2014-10-154-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12796
| * | | | | | [ticket/12796] Use & in pathPayBas2014-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12796
| * | | | | | [ticket/12796] Add view own profile to UCP (and vice versa)PayBas2014-10-143-1/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12796
* | | | | | Merge remote-tracking branch 'PayBas/ticket/13163' into develop-ascraeusCesar G2014-10-162-125/+128
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/13163: [ticket/13163] Check for images [ticket/13163] Terminate timely when no data-last links exist [ticket/13163] Fix responsive link lists
| * | | | | [ticket/13163] Check for imagesPayBas2014-10-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13163
| * | | | | [ticket/13163] Terminate timely when no data-last links existPayBas2014-10-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13163
| * | | | | [ticket/13163] Fix responsive link listsPayBas2014-10-132-125/+121
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13163
* | | | | [ticket/12530] Move style and class to parent <a>.Cesar G2014-10-151-1/+1
| |_|_|/ |/| | | | | | | | | | | PHPBB3-12530
* | | | Merge pull request #3037 from PayBas/ticket/13169Joas Schilling2014-10-151-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13169] Fix RTL forms in responsive mode
| * | | | [ticket/13169] Fix RTL forms in responsive modePayBas2014-10-151-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-13169
* | | | | Merge pull request #2938 from PayBas/ticket/12530Joas Schilling2014-10-154-17/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12530] Fix captcha challange image breaking responsive layout
| * | | | | [ticket/12530] Combine logo and TOS link into onePayBas2014-10-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12530
| * | | | | [ticket/12530] Show logo and policy in responsivePayBas2014-10-074-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12530
| * | | | | [ticket/12530] Fix captcha challange image breaking responsive layoutPayBas2014-10-074-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12530
* | | | | | Merge pull request #3024 from marc1706/ticket/13124Joas Schilling2014-10-151-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13124] Also trim spaces in front of comments except for first line
| * | | | | | [ticket/13124] Also trim spaces in front of comments except for first lineMarc Alexander2014-10-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13124
* | | | | | | [ticket/13177] Fix display of post count-based ranks in viewtopic.Cesar G2014-10-141-1/+1
| |_|/ / / / |/| | | | | | | | | | | | | | | | | PHPBB3-13177
* | | | | | [ticket/13174] Add missing closing </div> to ucp_pm_viewmessagePayBas2014-10-141-0/+1
| |_|/ / / |/| | | | | | | | | | | | | | PHPBB3-13174
* | | | | [prep-release-3.1.0-RC5] Update phpBB Version for RC6 developmentJoas Schilling2014-10-072-2/+2
| | | | |