| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3546 from brunoais/ticket/13772 | Andreas Fischer | 2015-04-22 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() * brunoais/ticket/13772: [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() | ||||
| | * | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() | brunoais | 2015-04-21 | 1 | -1/+1 |
| |/ | | | | PHPBB3-13772 | ||||
| * | Merge pull request #3537 from RMcGirr83/ticket/13763 | Andreas Fischer | 2015-04-16 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | [ticket/13763] Fix typo in extension lang file * RMcGirr83/ticket/13763: [ticket/13763] Fix typo in extension lang file | ||||
| | * | [ticket/13763] Fix typo in extension lang file | Richard McGirr | 2015-04-15 | 1 | -1/+1 |
| |/ | | | | PHPBB3-13763 | ||||
| * | Merge pull request #3533 from Elsensee/ticket/13756 | Dhruv Goel | 2015-04-14 | 2 | -2/+55 |
| |\ | | | | | [ticket/13756] Fix resize after upload with plupload | ||||
| | * | [ticket/13756] Add test for generate_resize_string() | Oliver Schramm | 2015-04-12 | 1 | -0/+53 |
| | | | | | | | | | PHPBB3-13756 | ||||
| | * | [ticket/13756] Fix resize after upload with plupload | Oliver Schramm | 2015-04-11 | 1 | -2/+2 |
| |/ | | | | PHPBB3-13756 | ||||
| * | [3.1.x] Update development version to 3.1.5-dev | Joas Schilling | 2015-04-10 | 3 | -3/+3 |
| | | |||||
| * | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-04-10 | 8 | -9/+155 |
| |\ | |||||
| | * | [prep-release-3.1.4] Add changelog for 3.1.4-RC1 | Joas Schilling | 2015-04-09 | 1 | -1/+116 |
| | | | |||||
| | * | [prep-release-3.1.4] Add migration for 3.1.4-RC1 | Joas Schilling | 2015-04-09 | 1 | -0/+31 |
| | | | |||||
| | * | Update version to 3.1.4-RC1 | Joas Schilling | 2015-04-09 | 6 | -8/+8 |
| |/ | |||||
| * | Merge pull request #3525 from marc1706/ticket/13749 | Oliver Schramm | 2015-04-06 | 1 | -1/+1 |
| |\ | | | | | | | [ticket/13749] Add missing slash to base uri in helper route tests | ||||
| | * | [ticket/13749] Add missing slash to base uri in helper route tests | Marc Alexander | 2015-04-06 | 1 | -1/+1 |
| |/ | | | | PHPBB3-13749 | ||||
| * | Merge pull request #3392 from marc1706/ticket/13493 | Joas Schilling | 2015-04-06 | 3 | -1/+55 |
| |\ | | | | | | | [ticket/13493] Append page name to base url if it doesn't contain it | ||||
| | * | [ticket/13493] Append page name to base url if it doesn't contain it | Marc Alexander | 2015-02-11 | 3 | -1/+55 |
| | | | | | | | | | PHPBB3-13493 | ||||
| * | | Merge pull request #3492 from RMcGirr83/ticket/13710 | Joas Schilling | 2015-04-06 | 3 | -1/+30 |
| |\ \ | | | | | | | | | | [ticket/13710] Allow template events near smilies display | ||||
| | * | | [ticket/13710] Allow template events near smilies display | RMcGirr83 | 2015-03-19 | 3 | -1/+30 |
| | | | | | | | | | | | | | PHPBB3-13710 | ||||
| * | | | Merge pull request #3488 from Crizz0/ticket/13701 | Joas Schilling | 2015-04-06 | 2 | -0/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13701] Adds two new events to posting_pm_layout.html Conflicts: phpBB/docs/events.md | ||||
| | * | | | [ticket/13701] Adds two new events to posting_pm_layout.html | Crizzo | 2015-03-13 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events wrap the includes of posting_pm_header.html to add some content before and after it. PHPBB3-13701 | ||||
| * | | | | Merge pull request #3517 from Wolfsblvt/ticket/13739 | Joas Schilling | 2015-04-06 | 3 | -1/+12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13739] Add template core event posting_poll_body_options_after | ||||
| | * | | | | [ticket/13739] Add template core event posting_poll_body_options_after | Wolfsblvt | 2015-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing order of if statement and event PHPBB3-13739 | ||||
| | * | | | | [ticket/13739] Add template core event posting_poll_body_options_after | Wolfsblvt | 2015-04-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing if else construct in prosilver so that the event is placed correctly PHPBB3-13739 | ||||
| | * | | | | [ticket/13739] Add template core event posting_poll_body_options_after | Wolfsblvt | 2015-04-03 | 3 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template event added for the poll options while posting a topic so that you may add additional options for polls. PHPBB3-13739 | ||||
| * | | | | | Merge pull request #3523 from Nicofuma/ticket/13747 | Joas Schilling | 2015-04-06 | 1 | -0/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13747] Add assertions to test_validate_path_linux | ||||
| | * | | | | | [ticket/13747] Add assertions to test_validate_path_linux | Tristan Darricau | 2015-04-06 | 1 | -0/+9 |
| |/ / / / / | | | | | | | | | | | | | | | | PHPBB3-13747 | ||||
| * | | | | | Merge pull request #3458 from nickvergessen/ticket/8494 | Tristan Darricau | 2015-04-06 | 1 | -6/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/8494] Ignore errors from the database schema preparation | ||||
| | * | | | | | [ticket/8494] Ignore errors from the database schema preparation | Joas Schilling | 2015-03-01 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows installing phpBB twice in the same database with a different prefix PHPBB3-8494 | ||||
| * | | | | | | Merge pull request #3437 from marc1706/ticket/12368 | Joas Schilling | 2015-04-06 | 1 | -1/+23 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/12368] Correctly check if avatars migration is installed | ||||
| | * | | | | | | [ticket/12368] Fix comment in docblock | Marc Alexander | 2015-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12368 | ||||
| | * | | | | | | [ticket/12368] Correctly check if avatars migration is installed | Marc Alexander | 2015-02-24 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to set the avatar type to string value to check if new avatar types are supported. PHPBB3-12368 | ||||
| * | | | | | | | Merge pull request #3409 from Senky/ticket/11424 | Joas Schilling | 2015-04-06 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11424] Quick-Mod Tools race condition results in NO_MODE | ||||
| | * | | | | | | | [ticket/11424] Add space between control flow keywords and parenthesis | Jakub Senko | 2015-02-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11424 | ||||
| | * | | | | | | | [ticket/11424] Handle race condition properly for Quick-Mod Tools | Jakub Senko | 2015-02-16 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11424 | ||||
| * | | | | | | | | Merge pull request #3402 from brunoais/ticket/13621 | Joas Schilling | 2015-04-06 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return | ||||
| | * | | | | | | | | [ticket/13621] Prepend $where_sql and postpend closing parentheses on return | brunoais | 2015-02-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepend $where_sql and postpend closing parentheses on statements with return PHPBB3-13621 | ||||
| * | | | | | | | | | Merge pull request #3333 from marc1706/ticket/13522 | Joas Schilling | 2015-04-06 | 2 | -31/+125 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13522] Remove empty answers from possible answers in Q&A | ||||
| | * | | | | | | | | | [ticket/13522] Fix QA tests for request_var() use | Marc Alexander | 2015-02-21 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Add captcha to test file class name | Marc Alexander | 2015-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Remove unneeded variables and correctly output input on error | Marc Alexander | 2015-02-21 | 1 | -9/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Add tests for acp_get_question_input and set/get name | Marc Alexander | 2015-02-21 | 1 | -1/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Add test file for Q&A captcha | Marc Alexander | 2015-02-21 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Use acp_get_question_input() for retrieving input data | Marc Alexander | 2015-02-21 | 1 | -12/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Trim array elements before processing further | Marc Alexander | 2015-02-21 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Remove unused variables and unexpected returns | Marc Alexander | 2015-01-24 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | * | | | | | | | | | [ticket/13522] Remove empty answers from possible answers in Q&A | Marc Alexander | 2015-01-24 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| * | | | | | | | | | | Merge pull request #3284 from Elsensee/ticket/13469 | Joas Schilling | 2015-04-06 | 2 | -25/+117 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13469] Fall back to soft_delete if no permissions for delete | ||||
| | * | | | | | | | | | | [ticket/13469] Extract test to new method | Oliver Schramm | 2015-04-02 | 1 | -5/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13469 | ||||
| | * | | | | | | | | | | [ticket/13469] Add tests | Oliver Schramm | 2015-03-22 | 1 | -21/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13469 | ||||
| | * | | | | | | | | | | [ticket/13469] Fall back to soft_delete if no permissions for delete | Oliver Schramm | 2015-01-11 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13469 | ||||
