aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
...
* | | [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
* | | [ticket/14624] Remove no longer existing event argumemtMarc Alexander2016-05-161-1/+0
| | | | | | | | | | | | PHPBB3-14624
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-151-0/+26
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * | [ticket/14624] Remove whitespaceRichard McGirr2016-05-051-2/+2
| | | | | | | | | | | | PHPBB3-14624
| * | [ticket/14624] Fix typo and phpBB versionRichard McGirr2016-05-051-2/+2
| | | | | | | | | | | | PHPBB3-14624
| * | [ticket/14624] Move event so it actually worksRichard McGirr2016-05-051-13/+13
| | | | | | | | | | | | PHPBB3-14624
| * | [ticket/14624] Add event to ucp_profile in signature sectionRichard McGirr2016-05-051-0/+26
| |/ | | | | | | PHPBB3-14624
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-272-1/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14272] Use html5 valid input elements * marc1706/ticket/14272: [ticket/14272] Allow input of floats for filesize [ticket/14272] Use input type number instead of text in avatars [ticket/14272] Assign min and max values for avatar driver settings [ticket/14272] Define min and max values for avatar width and height [ticket/14272] Disable not toggled form elements [ticket/14272] Make sure phpbb_avatar_manager was defined [ticket/14272] Remove useless check [ticket/14272] Fix invalid or missing min/max settings [ticket/14272] Assign min/max for all allowed types [ticket/14272] Only use maxlength and size for allowed input elements
* | \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-272-2/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/acp_icons.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_acp.php phpBB/includes/ucp/ucp_groups.php phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html phpBB/styles/prosilver/template/ucp_avatar_options_remote.html phpBB/styles/subsilver2/template/mcp_topic.html phpBB/styles/subsilver2/template/posting_attach_body.html phpBB/styles/subsilver2/template/posting_body.html phpBB/styles/subsilver2/template/posting_poll_body.html phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
| * | [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-011-0/+8
| | | | | | | | | | | | PHPBB3-14272
| * | [ticket/14272] Define min and max values for avatar width and heightMarc Alexander2015-12-271-0/+7
| | | | | | | | | | | | PHPBB3-14272
| * | [ticket/14272] Make sure phpbb_avatar_manager was definedMarc Alexander2015-12-031-1/+3
| | | | | | | | | | | | PHPBB3-14272
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | * 3.1.x: [ticket/13630] Prevent empty parameter select_single
| * | [ticket/13630] Prevent empty parameter select_singleJakub Senko2016-03-201-1/+1
| | | | | | | | | | | | PHPBB3-13630
* | | [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-241-1/+4
| | | | | | | | | | | | PHPBB3-14530
* | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-0915-46/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13454] Remove unused variables, globals, and parameters * marc1706/ticket/13454: [ticket/13454] Add excessively removed code back [ticket/13454] Remove more unused variables [ticket/13454] Remove double semi-colons [ticket/13454] Remove unused variables [ticket/13454] Fix code sniffer complaints [ticket/13454] Fix a few issues introduced by overdeleting stuff [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables
| * | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-062-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is part 5 and there is more to come. PHPBB3-13454
| * | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-064-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | Part 4 PHPBB3-13454
| * | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454
| * | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-064-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 13:48:50 +0000