aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5035 from kasimi/ticket/15440Derky2017-12-171-5/+27
|\ | | | | | | [ticket/15440] Added core.ucp_register_agreement_modify_template_data
| * [ticket/15440] State deprecated version for core.ucp_register_agreementDerky2017-12-171-1/+1
| | | | | | | | PHPBB3-15440
| * [ticket/15440] Added core.ucp_register_agreement_modify_template_datakasimi2017-12-171-5/+27
| | | | | | | | PHPBB3-15440
* | Merge pull request #5022 from kasimi/ticket/15431Derky2017-12-031-6/+31
|\ \ | | | | | | | | | [ticket/15431] Add event core.ucp_register_modify_template_data
| * | [ticket/15431] Moved phpbb_timezone_select() before the eventkasimi2017-12-031-6/+3
| | | | | | | | | | | | PHPBB3-15431
| * | [ticket/15431] Split up $template_varskasimi2017-12-031-6/+11
| | | | | | | | | | | | PHPBB3-15431
| * | [ticket/15431] Removed $page_titlekasimi2017-11-291-4/+0
| | | | | | | | | | | | PHPBB3-15431
| * | [ticket/15431] Fixed event argument descriptionkasimi2017-11-081-1/+1
| | | | | | | | | | | | PHPBB3-15431
| * | [ticket/15431] Add event core.ucp_register_modify_template_datakasimi2017-10-311-7/+34
| |/ | | | | | | PHPBB3-15431
* | Merge pull request #4984 from senky/ticket/15111Marc Alexander2017-11-011-0/+30
|\ \ | |/ |/| | | [ticket/15111] Fix the typo in ucp_pm_view_messsage
| * [ticket/15111] Fix the typo in ucp_pm_view_messsageJakub Senko2017-10-031-0/+30
| | | | | | | | PHPBB3-15111
* | [ticket/15362] Fix colspan in notification options tableJakub Senko2017-10-021-1/+1
|/ | | | PHPBB3-15362
* [ticket/15328] Disable checkbox if notification method isn't supportedkasimi2017-08-241-3/+5
| | | | PHPBB3-15328
* Merge branch 'prep-release-3.1.11' into prep-release-3.2.1Marc Alexander2017-07-161-0/+7
|\
| * [ticket/security/208] Add form key to password reset formMarc Alexander2017-06-181-0/+7
| | | | | | | | SECURITY-208
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-261-0/+11
|\ \ | |/
| * Merge pull request #4671 from senky/ticket/13605Marc Alexander2017-04-261-0/+11
| |\ | | | | | | | | | [ticket/13605] Add core.ucp_pm_compose_predefined_message event
| | * [ticket/13605] Add core.ucp_pm_compose_predefined_message eventJakub Senko2017-01-231-0/+11
| | | | | | | | | | | | PHPBB3-13605
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-112-3/+3
|\ \ \ | |/ /
* | | [ticket/14945] Parse signature preview with generate_text_for_display()Marc Alexander2017-01-041-7/+2
| | | | | | | | | | | | PHPBB3-14945
* | | Merge pull request #4599 from VSEphpbb/ticket/14945Marc Alexander2017-01-041-1/+3
|\ \ \ | | | | | | | | | | | | [ticket/14945] Fix bbcode flags in user sig previews
| * | | [ticket/14945] Send bbcode flags in user sig previewsMatt Friedman2016-12-281-1/+3
| | | | | | | | | | | | | | | | PHPBB3-14945
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-021-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * 3.1.x: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
| * | | [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql queryMarc Alexander2017-01-021-1/+1
| | |/ | |/| | | | | | | PHPBB3-14953
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-181-1/+10
|\ \ \ | |/ /
| * | Merge pull request #4536 from senky/ticket/13845Marc Alexander2016-12-181-1/+10
| |\ \ | | | | | | | | | | | | [ticket/13845] Add core.ucp_profile_avatar_sql
| | * | [ticket/13845] Add core.ucp_profile_avatar_sqlJakub Senko2016-11-211-1/+10
| | | | | | | | | | | | | | | | PHPBB3-13845
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-181-0/+22
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #4533 from senky/ticket/14524Marc Alexander2016-12-181-0/+22
| |\ \ | | | | | | | | | | | | [ticket/14524] Add core.ucp_register_requests_after
| | * | [ticket/14524] Add core.ucp_register_requests_afterJakub Senko2016-11-211-0/+22
| | |/ | | | | | | | | | PHPBB3-14524
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-171-5/+25
|\ \ \ | |/ /
| * | Merge pull request #4526 from senky/ticket/14239Marc Alexander2016-12-171-5/+25
| |\ \ | | | | | | | | | | | | [ticket/14239] Add core.ucp_remind_modify_select_sql
| | * | [ticket/14239] Add core.ucp_remind_modify_select_sqlJakub Senko2016-12-131-5/+25
| | |/ | | | | | | | | | PHPBB3-14239
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-171-9/+58
|\ \ \ | |/ /
| * | [ticket/14870] Add events to ucp_pm_viewfolder:get_pm_fromJakub Senko2016-12-161-9/+58
| |/ | | | | | | PHPBB3-14870
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-6/+123
|\ \ | |/
| * [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-032-0/+64
| |\
| * | [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
* | | [ticket/10961] Send HTTP 403 when applicableJakub Senko2016-09-017-0/+14
| | | | | | | | | | | | PHPBB3-10961
* | | [ticket/14660] Remove redundant empty line in ucp_profile.phprxu2016-06-201-1/+0
| | | | | | | | | | | | PHPBB3-14660
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+11
|\ \ \ | | |/ | |/| | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * | Merge pull request #4331 from Senky/ticket/13978Marc Alexander2016-06-191-0/+10
| |\ \ | | | | | | | | | | | | [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
| | * | [ticket/13978] Add core.ucp_profile_modify_signature_sql_aryJakub Senko2016-05-241-0/+10
| | | | | | | | | | | | | | | | PHPBB3-13978
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_pm_compose.php
| * | | Merge pull request #4316 from rmcgirr83/ticket_14630Marc Alexander2016-06-191-0/+28
| |\ \ \ | | |/ / | |/| | | | | | [ticket/14630] Add event to modify pm message
| | * | [ticket/14630] Rename core eventRichard McGirr2016-06-021-3/+3
| | | | | | | | | | | | | | | | PHPBB3-14630
| | * | [ticket/14630] Change event name and fix capitalizationRichard McGirr2016-05-161-3/+3
| | | | | | | | | | | | | | | | PHPBB3-14630
| | * | [ticket/14630] Add event to modify pm messageRichard McGirr2016-05-061-0/+28
| | |/ | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14630 PHPBB3-14630
* | | [ticket/14649] Add preview variable back to ucp_profile for eventRichard McGirr2016-05-261-1/+3
| | | | | | | | | | | | PHPBB3-14649