aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3624 from VSEphpbb/ticket/13861Marc Alexander2015-05-221-3/+3
|\ | | | | | | [ticket/13861] Fix undefined variables in style update migration
| * [ticket/13861] Fix undefined variables in style update migrationMatt Friedman2015-05-211-3/+3
| | | | | | | | PHPBB3-13861
* | Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
|\ \ | | | | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
| * | [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| | | | | | | | | | | | PHPBB3-13827
| * | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
| | | | | | | | | | | | PHPBB3-13827
* | | [ticket/13838] Fix coding styleNicofuma2015-05-146-9/+19
| |/ |/| | | | | PHPBB3-13838
* | Merge pull request #3598 from VSEphpbb/ticket/13822Marc Alexander2015-05-081-1/+2
|\ \ | | | | | | | | | [ticket/13822] Correctly display softdelete and post detail perms
| * | [ticket/13822] Correctly display softdelete and post detail permsMatt Friedman2015-05-071-1/+2
| |/ | | | | | | PHPBB3-13822
* | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-062-10/+159
|\ \ | |/ |/| | | Ticket/13807 Allow building changesets for the event list
| * [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-022-5/+30
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | | | | | | | PHPBB3-13807
| * [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-021-4/+101
| | | | | | | | PHPBB3-13807
* | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-031-0/+32
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
| | |
* | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-031-0/+37
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | * prep-release-3.1.4: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml
| * Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
* | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
|\ \ | |/ | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-291-0/+32
| |
* | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-0/+37
|\ \ | |/ | | | | | | | | | | * prep-release-3.1.4: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| * Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-281-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
* | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
| | | | | | | | PHPBB3-13772
* | [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
|/ | | | PHPBB3-13756
* [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
|
* Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-061-0/+6
|\ | | | | | | [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 itMarc Alexander2015-02-111-0/+6
| | | | | | | | PHPBB3-13493
* | 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 #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-061-31/+31
|\ \ \ | | | | | | | | | | | | [ticket/13522] Remove empty answers from possible answers in Q&A
| * | | [ticket/13522] Remove unneeded variables and correctly output input on errorMarc Alexander2015-02-211-9/+5
| | | | | | | | | | | | | | | | 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 #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
* | | | | [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
* | | | [ticket/13550] Check that the Plupload temp directory is writable before movingCesar G2015-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a PHP warning from being issued that results in an invalid JSON response being returned to the user. PHPBB3-13550
* | | | [ticket/13674] Missing space after "if"brunoais2015-03-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13674
* | | | [ticket/13674] Change MySQL native total search results calculationbrunoais2015-03-061-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes how the native FULLTEXT search calculates the total match number for MySQL. This should improve performance as there is one less query being made and it is being searched using the technique mentioned in the manual PHPBB3-13674
* | | | Merge pull request #3453 from RMcGirr83/ticket/13477Marc Alexander2015-03-051-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13477] Update file cache driver for extension paths
| * | | | [ticket/13477] rename function and fix doc blocksRMcGirr832015-03-041-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-13477
| * | | | [ticket/13477] Update file cache driver for filenamesRMcGirr832015-03-031-0/+14
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Replace slashes on file name PHPBB3-13477
* | | | Merge pull request #3444 from naderman/ticket/13617-ascraeusJoas Schilling2015-02-271-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13617] Enforce column size limit for session_forum_id
| * | | | [ticket/13617] Document magic number for forum_idNils Adermann2015-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13617
| * | | | [ticket/13617] Use request->variable instead of request_varNils Adermann2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13617
| * | | | Merge branch 'ticket/13617' into ticket/13617-ascraeusNils Adermann2015-02-251-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13617: [ticket/13617] Enforce column size limit for session_forum_id Conflicts: phpBB/phpbb/session.php