aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\
| * Merge pull request #4505 from JimMH/patch-1Marc Alexander2016-11-121-1/+1
| |\ | | | | | | | | | [ticket/14859] Send notifications for PM reports to all users with correct permissions
| | * [ticket/14859] Notifications for PM reports send to users with correct ↵Jim Mossing Holsteyn2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions Tracker ticket (set the ticket ID to your ticket ID): https://tracker.phpbb.com/browse/PHPBB3-14859 This addresses the problem that notifications of new PM reports were not sent out to moderators that weren't global moderators but did have the permission "Can close/delete PM reports". PHPBB3-14859
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-122-2/+14
|\ \ \ | |/ /
| * | Merge pull request #4496 from senky/ticket/14848Marc Alexander2016-11-122-2/+14
| |\ \ | | | | | | | | | | | | [ticket/14848] Add acp_ext_list_disabled/enabled_title_after
| | * | [ticket/14848] Add acp_ext_list_disabled/enabled_title_afterJakub Senko2016-11-022-2/+14
| | | | | | | | | | | | | | | | PHPBB3-14848
* | | | 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-122-1/+36
|\ \ \ \ | |/ / /
| * | | Merge pull request #4481 from senky/ticket/14819Marc Alexander2016-11-122-1/+36
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14819] Hide soft-deleted posts in topic review
| | * | | [ticket/14819] Hide soft-deleted posts in topic reviewJakub Senko2016-10-132-1/+36
| | | | | | | | | | | | | | | | | | | | 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-0310-18/+111
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4507 from nickvergessen/ticket-14788Marc Alexander2016-11-121-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14788] Farewell my friendz
| | * | | | | | [ticket/14788] FarewellJoas Schilling2016-11-121-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | PHPBB3-14788
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4506 from lavigor/ticket/14860Marc Alexander2016-11-121-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/14860] Broken link on subscriptions page on mobile devices
| | * | | | | [ticket/14860] Broken link on subscriptions page on mobile deviceslavigor2016-11-081-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14860
* | | | | | 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-062-6/+54
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 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-062-6/+54
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add tests for generating user act key on force reactivateMarc Alexander2016-11-061-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11483
| | * | | | [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 remote-tracking branch 'nicofuma/ticket/14814' into 3.2.xMarc Alexander2016-11-053-8/+22
|\ \ \ \ \
| * | | | | [ticket/14814] Fix reparser cronTristan Darricau2016-11-023-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14814
* | | | | | Merge pull request #4494 from JoshyPHP/ticket/14846Máté Bartus2016-11-024-5/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14846] Updated s9e\TextFormatter
| * | | | | | [ticket/14846] Updated s9e\TextFormatterJoshyPHP2016-11-024-5/+35
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14846
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-283-32/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4489 from rxu/ticket/14830Marc Alexander2016-10-283-33/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [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 testsrxu2016-10-241-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-212-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830
| | * | | | | [ticket/14830] Fix ACP search control functional testsrxu2016-10-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.xTristan Darricau2016-10-243-15/+181
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14831] Optimize code construction [ticket/14831] Add more tests against UCP modules [ticket/14831] Add more tests, better name for $e placeholder [ticket/14831] Do not throw exception on the module existence checking [ticket/14831] Fix module migrator tool
| * | | | | | | Merge pull request #4491 from rxu/ticket/14831Tristan Darricau2016-10-243-15/+181
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14831] Fix extension modules installation issues * rxu/ticket/14831: [ticket/14831] Optimize code construction [ticket/14831] Add more tests against UCP modules [ticket/14831] Add more tests, better name for $e placeholder [ticket/14831] Do not throw exception on the module existence checking [ticket/14831] Fix module migrator tool
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-26 12:25:07 +0000