aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5296 from MikelAlejoBR/ticket/15622Marc Alexander2018-10-081-6/+12
|\ | | | | | | [ticket/15622] Fix quoting in PMs when BBCodes are disabled
| * [ticket/15622] Rename function to avoid potential future conflictsMikelAlejoBR2018-09-161-1/+1
| | | | | | | | PHPBB3-15622
| * [ticket/15622] Fix message link generationMikelAlejoBR2018-08-011-1/+10
| | | | | | | | | | | | | | Now the message link is generated in different formats depending on whether BBCodes are allowed or not in the site. PHPBB3-15622
| * [ticket/15622] Extract duplicated codeMikelAlejoBR2018-07-311-23/+1
| | | | | | | | PHPBB3-15622
| * [ticket/15622] Fix quoting in PMs when BBCodes are disabledMikelAlejoBR2018-07-221-1/+20
| | | | | | | | | | | | | | | | | | Before parsing the private message to be loaded a simple BBCode status check is done to verify that BBCodes are enabled. Depending on that option the quote will be formated as BBCode or as plain text, similarly to what is done in posting.php. PHPBB3-15622
* | Merge pull request #5152 from senky/ticket/15579Marc Alexander2018-10-081-2/+40
|\ \ | | | | | | | | | [ticket/15579] Add ucp_front events
| * | [ticket/15579] Add ucp_front eventsJakub Senko2018-09-161-2/+40
| | | | | | | | | | | | PHPBB3-15579
* | | [ticket/15733] Fix undeclared variable concatenationMikelAlejoBR2018-07-291-1/+1
| | | | | | | | | | | | PHPBB3-15733
* | | [ticket/15697] Remove unused variable and corresponding input fieldMikelAlejoBR2018-07-281-2/+0
| | | | | | | | | | | | PHPBB3-15697
* | | [ticket/15697] Remove hard coded time check when sending PMsMikelAlejoBR2018-07-231-1/+1
| |/ |/| | | | | PHPBB3-15697
* | [ticket/15717] Using correct variable for log entryAlex Miles2018-07-041-1/+1
| | | | | | | | PHPBB3-15717
* | [ticket/14972] replace all occurrences of sizeof() with the count()rxu2018-01-0113-86/+86
| | | | | | | | PHPBB3-14972
* | 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
| |\