aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+13
|\
| * Merge pull request #4495 from senky/ticket/14847Marc Alexander2016-11-121-1/+13
| |\ | | | | | | | | | [ticket/14847] Add core.acp_attachments_config_edit_add
| | * [ticket/14847] Add core.acp_attachments_config_edit_addJakub Senko2016-11-021-1/+13
| | | | | | | | | | | | PHPBB3-14847
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+32
|\ \ \ | |/ /
| * | Merge pull request #4481 from senky/ticket/14819Marc Alexander2016-11-121-1/+32
| |\ \ | | | | | | | | | | | | [ticket/14819] Hide soft-deleted posts in topic review
| | * | [ticket/14819] Hide soft-deleted posts in topic reviewJakub Senko2016-10-131-1/+32
| | | | | | | | | | | | | | | | PHPBB3-14819
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-7/+21
|\ \ \ \ | |/ / /
| * | | Merge pull request #4472 from dsinn/ticket/14804Marc Alexander2016-11-121-7/+21
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14804] Add core event to MCP after merging topics
| | * \ \ [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804Daniel Sinn2016-10-034-13/+37
| | |\ \ \ | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1Daniel Sinn2016-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @sinceDaniel Sinn2016-09-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | [ticket/14804] Add core event to MCP after merging topicsDaniel Sinn2016-09-301-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity and to stop overwriting a variable. PHPBB3-14804
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14795] Use maximum topic views instead of adding up views in merge
| * | | | | Merge pull request #4485 from marc1706/ticket/14795Tristan Darricau2016-11-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14795] Use maximum topic views instead of adding up views in merge * github.com:phpbb/phpbb: [ticket/14795] Use maximum topic views instead of adding up views in merge
| | * | | | | [ticket/14795] Use maximum topic views instead of adding up views in mergeMarc Alexander2016-10-161-1/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging topics should not result in topic views being added up but rather in the highest topic view showing up for the merged topic. PHPBB3-14795
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-6/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty
| * | | | | Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-061-6/+11
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11483] Generate user act key if database entry is empty * github.com:phpbb/phpbb: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty
| | * | | | [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-6/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The force reactivation action in the ACP will no longer overwrite the generated activation key in case the key stored in the database is empty. It will also save the generated key back to the database to actually allow the activation by the user. PHPBB3-11483
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-282-18/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4489 from rxu/ticket/14830Marc Alexander2016-10-282-19/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14830] Fix FORM_INVALID error during some ACP setting operations
| | * | | | [ticket/14823] Move check_form_key() inside actual save data stepMarc Alexander2016-10-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14823
| | * | | | [ticket/14830] Fix FORM_INVALID error on cpf settings changingrxu2016-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | | [ticket/14830] Fix FORM_INVALID error on search backend changingrxu2016-10-211-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | | [ticket/14830] Fix link hash checking caserxu2016-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletionrxu2016-10-211-8/+5
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14830
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-241-7/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14818] Optimize generate_board_url function
| * | | | Merge pull request #4487 from gmixo/patch-2Tristan Darricau2016-10-241-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14818] Optimize generate_board_url function * gmixo/patch-2: [ticket/14818] Optimize generate_board_url function
| | * | | | [ticket/14818] Optimize generate_board_url functionMIkhail Gulyaev2016-10-171-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | if $config['force_server_vars'] no need to calculate $request
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-231-9/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4490 from kasimi/ticket/14827Marc Alexander2016-10-231-9/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/14827] Fix adding multiple form keys
| | * | | | [ticket/14827] Possibility to add multiple form keyskasimi2016-10-191-9/+11
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-14827
| * | | | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-10-121-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [prep-release-3.1.10] Update version numbers for 3.1.10Marc Alexander2016-10-021-1/+1
| | | | |
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-031-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options
| * | | | Merge pull request #4471 from dsinn/ticket/14802Tristan Darricau2016-10-031-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14802] Empty/blank lines should not be additional poll options * dsinn/ticket/14802: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options
| | * | | [ticket/14802] Empty/blank lines should not be additional poll optionsDaniel Sinn2016-09-291-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-14802
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-023-13/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| * | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-023-13/+29
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | * prep-release-3.1.10: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| | * | [ticket/14789] Remove obsolete check_form_key() and add missing hashesMarc Alexander2016-09-302-7/+8
| | | | | | | | | | | | | | | | PHPBB3-14789
| | * | [ticket/14789] Move form key checks to where they actually do somethingMarc Alexander2016-09-302-11/+26
| | |/ | | | | | | | | | PHPBB3-14789
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-011-0/+8
|\ \ \ | |/ /
| * | [ticket/14795] Merge topic views when merging topicsJakub Senko2016-09-251-0/+8
| |/ | | | | | | PHPBB3-14795
| * [3.1.x] Increase version for 3.1.11 developmentMarc Alexander2016-09-241-1/+1
| |
| * [prep-release-3.1.10] Update version to 3.1.10-RC1Marc Alexander2016-09-241-1/+1
| |
* | Merge pull request #4265 from Senky/ticket/10809Tristan Darricau2016-09-255-6/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | [ticket/10809] Remove MSSQL support * Senky/ticket/10809: [ticket/10809] Reflect MSSQL removal in docs files [ticket/10809] Remove MSSQL support
| * | [ticket/10809] Remove MSSQL supportJakub Senko2016-08-025-6/+0
| | | | | | | | | | | | PHPBB3-10809
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-8/+30
|\ \ \ | | |/ | |/|
| * | Merge pull request #3527 from Elsensee/ticket/13709Marc Alexander2016-09-241-8/+30
| |\ \ | | | | | | | | | | | | [ticket/13709] Add fallback for email templates used by extensions
| | * | [ticket/13709] Add fallback for email templates used by extensionsOliver Schramm2016-08-211-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a fallback to english for the core like we do it in $user->add_lang() PHPBB3-13709
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:52:46 +0000