aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3523 from Nicofuma/ticket/13747Joas Schilling2015-04-061-0/+9
|\ | | | | | | [ticket/13747] Add assertions to test_validate_path_linux
| * [ticket/13747] Add assertions to test_validate_path_linuxTristan Darricau2015-04-061-0/+9
|/ | | | PHPBB3-13747
* Merge pull request #3458 from nickvergessen/ticket/8494Tristan Darricau2015-04-061-6/+4
|\ | | | | | | [ticket/8494] Ignore errors from the database schema preparation
| * [ticket/8494] Ignore errors from the database schema preparationJoas Schilling2015-03-011-6/+4
| | | | | | | | | | | | | | This allows installing phpBB twice in the same database with a different prefix PHPBB3-8494
* | Merge pull request #3437 from marc1706/ticket/12368Joas Schilling2015-04-061-1/+23
|\ \ | | | | | | | | | [ticket/12368] Correctly check if avatars migration is installed
| * | [ticket/12368] Fix comment in docblockMarc Alexander2015-03-261-1/+1
| | | | | | | | | | | | PHPBB3-12368
| * | [ticket/12368] Correctly check if avatars migration is installedMarc Alexander2015-02-241-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/11424Joas Schilling2015-04-061-0/+25
|\ \ \ | | | | | | | | | | | | [ticket/11424] Quick-Mod Tools race condition results in NO_MODE
| * | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11424
| * | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
| | | | | | | | | | | | | | | | PHPBB3-11424
* | | | Merge pull request #3402 from brunoais/ticket/13621Joas Schilling2015-04-061-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 returnbrunoais2015-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepend $where_sql and postpend closing parentheses on statements with return PHPBB3-13621
* | | | | Merge pull request #3333 from marc1706/ticket/13522Joas Schilling2015-04-062-31/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13522] Remove empty answers from possible answers in Q&A
| * | | | | [ticket/13522] Fix QA tests for request_var() useMarc Alexander2015-02-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Add captcha to test file class nameMarc Alexander2015-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Remove unneeded variables and correctly output input on errorMarc Alexander2015-02-211-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Add tests for acp_get_question_input and set/get nameMarc Alexander2015-02-211-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Add test file for Q&A captchaMarc Alexander2015-02-211-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Use acp_get_question_input() for retrieving input dataMarc Alexander2015-02-211-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Trim array elements before processing furtherMarc Alexander2015-02-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Remove unused variables and unexpected returnsMarc Alexander2015-01-241-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| * | | | | [ticket/13522] Remove empty answers from possible answers in Q&AMarc Alexander2015-01-241-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
* | | | | | Merge pull request #3284 from Elsensee/ticket/13469Joas Schilling2015-04-062-25/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13469] Fall back to soft_delete if no permissions for delete
| * | | | | | [ticket/13469] Extract test to new methodOliver Schramm2015-04-021-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13469
| * | | | | | [ticket/13469] Add testsOliver Schramm2015-03-221-21/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13469
| * | | | | | [ticket/13469] Fall back to soft_delete if no permissions for deleteOliver Schramm2015-01-111-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13469
* | | | | | | Merge pull request #3520 from rxu/ticket/13743Tristan Darricau2015-04-051-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php
| * | | | | | | [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.phprxu2015-04-051-0/+13
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message_parser.php performs include of bbcode.php at the very start using $phpbb_root_path and $phpEx vars, so there's a possibility those can be undefined at that point, especially when message_parser.php is being included in event listener or another extension file where $phpbb_root_path and $phpEx don't exist. This can be fixed by adding the appropriate vars definitions. PHPBB3-13743
* | | | | | | Merge pull request #3518 from marc1706/ticket/13703Marc Alexander2015-04-041-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
| * | | | | | | [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATHKevin Roy2015-04-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the uploaded avatars use the PHPBB_USE_BOARD_URL_PATH constant, which is needed when trying to use the get_user_avatar() function in a listener for index changes. PHPBB3-13703
* | | | | | | | Merge pull request #3519 from marc1706/ticket/13742Marc Alexander2015-04-041-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | [ticket/13742] Use correct avatar path for local avatar
| * | | | | | | [ticket/13742] Use correct avatar path for local avatarKevin Roy2015-04-031-1/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, the path might have been incorrect when using PHPBB_USE_BOARD_URL_PATH. PHPBB3-13742
* | | | | | | Merge pull request #3515 from cyberalien/ticket/13741Joas Schilling2015-04-034-20/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13741 Remove outdated comments and references in css files
| * | | | | | | [ticket/13741] Remove outdated references to tweaks.csscyberalien2015-04-033-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13741
| * | | | | | | [ticket/13741] Remove reference to unused body font-size declarationcyberalien2015-04-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove reference to font-size declaration that is no longer used in prosilver PHPBB3-13741
| * | | | | | | [ticket/13741] Remove reference to oudated rollover code that no longer existscyberalien2015-04-032-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rollover code referenced in that comment has been removed in 3.1 PHPBB3-13741
* | | | | | | | Merge branch '3.0.x' into 3.1.xJoas Schilling2015-04-031-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #3512 from bantu/ticket/13738Joas Schilling2015-04-031-5/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13738] Use new branch names in sami-all.conf.php.
| | * | | | | | | | [ticket/13738] Use new branch names in sami-all.conf.php.Andreas Fischer2015-04-021-5/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13738
* | | | | | | | | Merge pull request #3467 from dragosvr92/patch-5Marc Alexander2015-04-033-2/+10
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | [ticket/13602] Adding a new event overall_header_navbar_before
| * | | | | | | | [ticket/13602] Adding event overall_header_navbar_beforeDragos-Valentin Radulescu2015-03-063-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13602
* | | | | | | | | Merge pull request #3508 from cyberalien/ticket/13726Marc Alexander2015-04-021-3/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13726] Fix function that calculates responsive breadcrumbs width
| * | | | | | | | | [ticket/13726] Fix function that calculates responsive breadcrumbs widthcyberalien2015-03-281-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not calculate width of hidden elements. Set minimum width to make sure breadcrumbs are always shown. PHPBB3-13726
* | | | | | | | | | Merge pull request #3509 from cyberalien/ticket/13727Marc Alexander2015-04-021-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13727] Fix JS that resizes breadcrumbs
| * | | | | | | | | | [ticket/13727] Fix JS that resizes breadcrumbscyberalien2015-03-281-1/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13727
* | | | | | | | | | Merge pull request #3513 from bantu/ticket/13736Andreas Fischer2015-04-021-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13736] Missing four colon in Contact us page * bantu/ticket/13736: [ticket/13736] Missing four colon in Contact us page
| * | | | | | | | | | [ticket/13736] Missing four colon in Contact us pageRaphaƫl M2015-04-021-4/+4
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing of four ```:``` with four {L_COLON} in Contact us page. PHPBB3-13736
* | | | | | | | | | Merge pull request #3510 from Nicofuma/ticket/13732Marc Alexander2015-04-011-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13732] Update composer to be php7 compliant
| * | | | | | | | | | [ticket/13732] Update composer to be php7 compliantTristan Darricau2015-03-301-0/+0
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated to Composer version 1.0-dev (f10c71475167a4661225b14560ca0a400d730829) 2015-03-29 14:37:42 PHPBB3-13732
* | | | | | | | | | Merge branch '3.0.x' into 3.1.xNicofuma2015-03-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |