aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-09-281-0/+1
|\ | | | | | | | | * prep-release-3.1.10: [ticket/14799] purge_notifications() should not leave open transactions.
| * Merge pull request #4468 from markshawtoronto/ticket/14799Tristan Darricau2016-09-284-3/+4
| |\ | | | | | | | | | | | | | | | | | | | | | [ticket/14799] purge_notifications() should not leave open transactions. * markshawtoronto/ticket/14799: [ticket/14799] purge_notifications() should not leave open transactions. [3.1.x] Increase version for 3.1.11 development
| | * [ticket/14799] purge_notifications() should not leave open transactions.markshawtoronto2016-09-271-0/+1
| |/ |/| | | | | | | | | | | | | | | When running purge_notifications(), if a notification type does not exist then a db transaction is started but never completed. On an error in get_notification_type_id(), end the transaction. PHPBB3-14799
* | [3.1.x] Increase version for 3.1.11 developmentMarc Alexander2016-09-243-3/+3
| |
* | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-09-248-9/+127
|\ \ | |/
| * [prep-release-3.1.10] Add changelog for 3.1.10-RC1Marc Alexander2016-09-241-1/+83
| |
| * [prep-release-3.1.10] Add migration for 3.1.10-RC1Marc Alexander2016-09-241-0/+36
| |
| * [prep-release-3.1.10] Update version to 3.1.10-RC1Marc Alexander2016-09-246-8/+8
|/
* Merge pull request #4461 from marc1706/ticket/14785Marc Alexander2016-09-242-0/+16
|\ | | | | | | [ticket/14785] Add template event overall_header_headerbar_after/before
| * [ticket/14785] Add template event overall_header_headerbar_after/beforeGerB2016-09-242-0/+16
| | | | | | | | PHPBB3-14785
* | Merge pull request #4462 from marc1706/ticket/14796Marc Alexander2016-09-241-1/+1
|\ \ | | | | | | | | | [ticket/14796] Use log_table class member instead of table constant
| * | [ticket/14796] Use log_table class member instead of table constantForumhulp.com2016-09-241-1/+1
| | | | | | | | | | | | | | | | | | Was still using the old LOG_TABLE constant in the delete method. PHPBB3-14796
* | | Merge pull request #4394 from marc1706/ticket/14484Tristan Darricau2016-09-243-35/+399
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14484] Add possibility to use extensions in UI tests * marc1706/ticket/14484: [ticket/14484] Properly enable extensions in UI tests [ticket/14484] Move facebook/webdriver back to tests dir composer.json [ticket/14484] Move facebook webdriver to main composer.json
| * | | [ticket/14484] Properly enable extensions in UI testsMarc Alexander2016-07-311-9/+18
| | | | | | | | | | | | | | | | PHPBB3-14484
| * | | [ticket/14484] Move facebook/webdriver back to tests dir composer.jsonMarc Alexander2016-07-316-47/+87
| | | | | | | | | | | | | | | | | | | | | | | | This will make sure we don't try to install it to incompatible PHP 5.3.3. PHPBB3-14484
| * | | [ticket/14484] Move facebook webdriver to main composer.jsonMarc Alexander2016-07-277-95/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated ui test case file to have same feature set as the 3.2.x version. PHPBB3-14484
* | | | 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
* | | | Merge pull request #4432 from Senky/ticket/14762Marc Alexander2016-09-241-4/+14
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14762] Add core event to session.php
| * | | | [ticket/14762] Add core event to session.phpJakub Senko2016-09-181-4/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-14762
* | | | | Merge pull request #4433 from Senky/ticket/14747Marc Alexander2016-09-241-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | [ticket/14747] Add post_data to core.modify_posting_auth
| * | | | [ticket/14747] Add post_data to core.modify_posting_authJakub Senko2016-09-031-0/+3
| |/ / / | | | | | | | | | | | | PHPBB3-14747
* | | | Merge pull request #4460 from marc1706/ticket/14784Marc Alexander2016-09-241-2/+11
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14784] missing rewrite for lighttpd
| * | | | [ticket/14784] missing rewrite for lighttpdTobi Schäfer2016-09-241-2/+11
|/ / / / | | | | | | | | | | | | PHPBB3-14784
* | | | Merge pull request #4392 from ErnadoO/PHPBB3-14592Marc Alexander2016-09-221-0/+42
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14592] [PHP] core.search_backend_search_after
| * | | | [ticket/14592] Fix variable typeErwan Nader2016-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14592
| * | | | [ticket/14592] Fixed docblock from unit testsErwan Nader2016-07-241-16/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-14592
| * | | | [ticket/14592] Fixed syntax errors from unit testsErwan Nader2016-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14592
| * | | | [ticket/14592] [PHP] core.search_backend_search_afterErwan Nader2016-07-241-0/+42
| | | | | | | | | | | | | | | | | | | | PHPBB3-14592
* | | | | Merge pull request #4454 from rxu/tcket/14787-1Marc Alexander2016-09-221-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14787] Add more parameters to the core.search_modify_url_parameters
| * | | | | [ticket/14787] Add more parameters to the core.search_modify_url_parametersrxu2016-09-191-1/+3
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14787
* | | | | Merge pull request #4450 from rxu/ticket/14787Tristan Darricau2016-09-181-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14787] Add more parameters to the core.search_modify_url_pameters * rxu/ticket/14787: [ticket/14787] Add more parameters to the core.search_modify_url_parameters
| * | | | | [ticket/14787] Add more parameters to the core.search_modify_url_parametersrxu2016-09-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14787
* | | | | | Merge pull request #4452 from marc1706/ticket/14789Tristan Darricau2016-09-189-17/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14789] Further harden ACP link and form checks * marc1706/ticket/14789: [ticket/14789] Add form tokens to tests and uncomment add_form_key [ticket/14789] Add link hashes and form tokens to all acp links/buttons
| * | | | | | [ticket/14789] Add form tokens to tests and uncomment add_form_keyMarc Alexander2016-09-182-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14789
| * | | | | | [ticket/14789] Add link hashes and form tokens to all acp links/buttonsMarc Alexander2016-09-188-17/+111
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will further harden the ACP security by adding link hashes to links and form tokens to forms that did not have these yet and result in modified settings or write action on the filesystem or database. These few links and forms were still relying on the global ACP protection, mainly due to them not posing further risks of compromising data. After this change these will now also be properly protected against tampering. PHPBB3-14789
* | | | | | Merge pull request #4451 from marc1706/ticket/14788Tristan Darricau2016-09-181-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14788] Update CREDITS.txt * marc1706/ticket/14788: [ticket/14788] Update CREDITS.txt
| * | | | | | [ticket/14788] Update CREDITS.txtMarc Alexander2016-09-181-4/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14788
* | | | | | Merge pull request #4442 from rxu/ticket/14781Marc Alexander2016-09-181-1/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/14781] Add core event to the function group_user_attributes()
| * | | | | [ticket/14781] Add core event to the function group_user_attributes()rxu2016-09-121-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14781
* | | | | | Merge pull request #4398 from wesleyfok/ticket/14638-3.1.xMarc Alexander2016-09-171-6/+123
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ticket/14638 3.1.x New UCP hooks for subscriptions
| * | | | | | [ticket/14638] Rollback changes from 3.2.x versionWesley Fok2016-08-031-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mistakenly brought in the modified 3.2.x version verbatim instead of diffing against the 3.1.x version of ucp_main.php. Removed any changes I didn't explicitly make. PHPBB3-14638
| * | | | | | Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.xWesley Fok2016-08-0354-687/+545
| |\ \ \ \ \ \
| * | | | | | | [ticket/14638] New UCP hooks for subscriptionsWesley Fok2016-08-031-15/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds various event hooks to the Manage subscriptions page of the User Control Panel. core.ucp_subscribed_post_data allows us to handle additional post data from the form that unwatches subscriptions. core.ucp_main_subscribed_forums_modify_query, core.ucp_main_topiclist_count_modify_query and core.ucp_main_topiclist_modify_query all modify the queries used to get the list of subscribed forums and subscribed/bookmarked topics. core.ucp_main_subscribed_forum_modify_template_vars and core.ucp_main_topiclist_topic_modify_template_vars modify the template variable array associated with each subscribed forum and topic row. This is a backport to 3.1.x of the code in PR #4318. PHPBB3-14638
* | | | | | | | Merge pull request #4403 from rxu/ticket/14738Marc Alexander2016-09-173-11/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14738] Add core events to improve modifying forum lists
| * | | | | | | | [ticket/14738] Add core events to improve modifying forum listsrxu2016-08-073-11/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14738
* | | | | | | | | Merge pull request #4406 from rmcgirr83/ticket/14581Marc Alexander2016-09-171-4/+108
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14581] Add core events to content_visibility
| * | | | | | | | | [ticket/14581] Add core events to content_visibilityRichard McGirr2016-08-101-4/+108
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events added for both changing the content visibility for both posts and topics, executing right before and after the SQL UPDATE query for setting the visibillity. https://tracker.phpbb.com/browse/PHPBB3-14581 PHPBB3-14581