| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3040 from nickvergessen/ticket/13138-asc | Joas Schilling | 2014-10-20 | 3 | -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 usage | Joas Schilling | 2014-10-17 | 1 | -0/+5 |
| | | | | | | | | | PHPBB3-13138 | ||||
| | * | [ticket/13138] Fix the session key tests | Joas Schilling | 2014-10-17 | 1 | -6/+13 |
| | | | | | | | | | PHPBB3-13138 | ||||
| | * | Merge branch 'ticket/13138-2' into ticket/13138-asc | Joas Schilling | 2014-10-16 | 1 | -26/+29 |
| | |\ | | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php | ||||
| * | \ | Merge pull request #3048 from naderman/ticket/13188 | Nils Adermann | 2014-10-20 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | [ticket/13188] Add missing where clause to post_id query in sphinx index | ||||
| | * | | | [ticket/13188] Correctly format string concatenation | Nils Adermann | 2014-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13188 | ||||
| | * | | | [ticket/13188] Add missing where clause to post_id query in sphinx index | Nils Adermann | 2014-10-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13188 | ||||
| * | | | | Merge branch 'develop-olympus' into develop-ascraeus | Nils Adermann | 2014-10-20 | 1 | -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/13138 | Nils Adermann | 2014-10-20 | 1 | -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_id | Joas Schilling | 2014-10-16 | 1 | -28/+31 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-13138 | ||||
| * | | | | Merge pull request #3046 from Elsensee/ticket/13187 | Joas Schilling | 2014-10-20 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13187] Fix HTML validity of INSTALL.html | ||||
| | * | | | | [ticket/13187] Fix HTML validity of INSTALL.html | Oliver Schramm | 2014-10-20 | 1 | -1/+2 |
| |/ / / / | | | | | | | | | | | | | PHPBB3-13187 | ||||
| * | | | | Merge pull request #2960 from prototech/ticket/12568 | Joas Schilling | 2014-10-20 | 4 | -46/+46 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/12568] Update user docs | ||||
| | * | | | | [ticket/12568] Fix awkward use of "phpBB Limited." | Cesar G | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568 | ||||
| | * | | | | [ticket/12568] The "Purge cache" option in the Customise tab no longer exists. | Cesar G | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568 | ||||
| | * | | | | [ticket/12568] Update GitHub link. | Cesar G | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568 | ||||
| | * | | | | [ticket/12568] Fix typo - "directorie" -> "directories" | Cesar G | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568 | ||||
| | * | | | | [ticket/12568] Remove various unnecessary references to phpBB3. | Cesar G | 2014-10-16 | 4 | -35/+35 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568 | ||||
| | * | | | | [ticket/12568] Update style installation instructions. | Cesar G | 2014-10-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568 | ||||
| | * | | | | [ticket/12568] Update path to language pack installation page. | Cesar G | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12568 | ||||
| | * | | | | [ticket/12568] Replace modifications explanation with extensions. | Cesar G | 2014-10-16 | 1 | -6/+6 |
| | | |/ / | |/| | | | | | | | | | | PHPBB3-12568 | ||||
| * | | | | Merge pull request #3045 from Elsensee/ticket/13186 | Joas Schilling | 2014-10-20 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13186] Don't show link on post count when search disabled | ||||
| | * | | | | [ticket/13186] Don't show link on post count when search disabled | Oliver Schramm | 2014-10-20 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | PHPBB3-13186 | ||||
| * | | | | Merge pull request #3030 from Senky/ticket/13164 | Marc Alexander | 2014-10-18 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility | ||||
| | * | | | | [ticket/13164] Fix syntax error | Jakub Senko | 2014-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164 | ||||
| | * | | | | [ticket/13164] Add post_visibility to core.submit_post_end event | Jakub Senko | 2014-10-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164 | ||||
| | * | | | | [ticket/13164] Update post_visibility before event is triggered | Jakub Senko | 2014-10-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164 | ||||
| * | | | | | Merge pull request #3041 from nickvergessen/ticket/13171 | Marc Alexander | 2014-10-18 | 1 | -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 MCP | Joas Schilling | 2014-10-17 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13171 | ||||
| * | | | | | | Merge pull request #3042 from naderman/ticket/13181 | Dhruv Goel | 2014-10-19 | 2 | -3/+3 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | [ticket/13181] Replace database credentials with placeholders in sphinx conf | ||||
| | * | | | | | [ticket/13181] Replace database credentials with placeholders in sphinx conf | Nils Adermann | 2014-10-18 | 2 | -3/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | PHPBB3-13181 | ||||
| * | | | | | Merge remote-tracking branch 'PayBas/ticket/12796' into develop-ascraeus | Cesar G | 2014-10-16 | 5 | -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 vars | PayBas | 2014-10-15 | 4 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12796 | ||||
| | * | | | | | [ticket/12796] Use & in path | PayBas | 2014-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12796 | ||||
| | * | | | | | [ticket/12796] Add view own profile to UCP (and vice versa) | PayBas | 2014-10-14 | 3 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12796 | ||||
| * | | | | | | Merge remote-tracking branch 'PayBas/ticket/13163' into develop-ascraeus | Cesar G | 2014-10-16 | 2 | -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 images | PayBas | 2014-10-15 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13163 | ||||
| | * | | | | | [ticket/13163] Terminate timely when no data-last links exist | PayBas | 2014-10-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13163 | ||||
| | * | | | | | [ticket/13163] Fix responsive link lists | PayBas | 2014-10-13 | 2 | -125/+121 |
| | |/ / / / | | | | | | | | | | | | | | | | PHPBB3-13163 | ||||
| * | | | | | Merge pull request #3038 from prototech/ticket/12530 | Joas Schilling | 2014-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | [ticket/12530] Move style and class to parent <a>. | ||||
| | * | | | | [ticket/12530] Move style and class to parent <a>. | Cesar G | 2014-10-15 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | PHPBB3-12530 | ||||
| * | | | | Merge pull request #3037 from PayBas/ticket/13169 | Joas Schilling | 2014-10-15 | 1 | -0/+16 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13169] Fix RTL forms in responsive mode | ||||
| | * | | | | [ticket/13169] Fix RTL forms in responsive mode | PayBas | 2014-10-15 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13169 | ||||
| * | | | | | Merge pull request #2938 from PayBas/ticket/12530 | Joas Schilling | 2014-10-15 | 4 | -17/+35 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/12530] Fix captcha challange image breaking responsive layout | ||||
| | * | | | | | [ticket/12530] Combine logo and TOS link into one | PayBas | 2014-10-15 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12530 | ||||
| | * | | | | | [ticket/12530] Show logo and policy in responsive | PayBas | 2014-10-07 | 4 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12530 | ||||
| | * | | | | | [ticket/12530] Fix captcha challange image breaking responsive layout | PayBas | 2014-10-07 | 4 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12530 | ||||
| * | | | | | | Merge pull request #3024 from marc1706/ticket/13124 | Joas Schilling | 2014-10-15 | 3 | -9/+36 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13124] Also trim spaces in front of comments except for first line | ||||
| | * | | | | | | [ticket/13124] Add another test case as requested | Marc Alexander | 2014-10-09 | 2 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13124 | ||||
| | * | | | | | | [ticket/13124] Fix tests for event exporter | Marc Alexander | 2014-10-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13124 | ||||
