aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-042-2/+2
| | | | PHPBB3-11842
* Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-212-28/+0
|\ | | | | [ticket/12005] Remove code responsible for PM popup completely
| * [ticket/12005] Remove PM popup UCP moduleLukasz2013-11-082-28/+0
| | | | | | | | PHPBB3-12005
* | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-211-1/+0
|\ \ | | | | | | [ticket/10810] Move color swatches from popup windows to inline blocks.
| * | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-131-1/+0
| |/ | | | | | | PHPBB3-10810
* | Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-191-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11896: [ticket/11896] Use $form_time and fix out of bounds $form_time [ticket/11896] Correctly document return of null in docblocks [ticket/11896] Minor code improvements in phpbb_functional_test_case [ticket/11896] Add functional tests for marking all notifications read [ticket/11896] Add ability to define expected message after posting [ŧicket/11896] Set form_time with time() when marking all notifications read
| * | [ticket/11896] Use $form_time and fix out of bounds $form_timeMarc Alexander2013-11-141-2/+3
| | | | | | | | | | | | PHPBB3-11896
| * | [ŧicket/11896] Set form_time with time() when marking all notifications readMarc Alexander2013-11-091-1/+1
| |/ | | | | | | | | | | | | | | | | | | form_time is only set if is passed via the form. Since the mark notifications read link does not use the form, it will default to 0 causing the mark notifications logic to only mark notifications read if their time is smaller or equal to 0. This patch will change ucp_notifications to correctly set form_time for the confirm_box. PHPBB3-11896
* | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-132-2/+2
|\ \ | |/ |/| [ticket/11525] Only remove group or user prefix from given avatar data
| * [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | Until now, the user data had both user_id and group_id keys in the avatar data. As both group_ and user_ prefixes were removed the group_id was collapsed onto the user_id and therefore all users in the same group had the same prefix for their uploaded avatars. This patch will make sure that the correct id is used depending on whether it's a group's or user's avatar data. PHPBB3-11525
* | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-022-35/+13
|\ \ | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-261-1/+1
| | | | | | | | | | | | PHPBB3-11746
| * | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-242-35/+13
| |/ | | | | | | PHPBB3-11746
* | [ticket/11983] Add missing argument to docblock in ucp_notificationsMarc Alexander2013-11-021-0/+1
| | | | | | | | | | | | | | The argument $subscriptions was not documented in the docblock of the method output_notification_types() until now. PHPBB3-11983
* | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-301-1/+1
| | | | | | | | PHPBB3-11980
* | Merge remote-tracking branch 'marc1706/ticket/11981' into developAndreas Fischer2013-10-291-6/+6
|\ \ | | | | | | | | | | | | * marc1706/ticket/11981: [ticket/11981] Fix code sniffer complaints
| * | [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-281-6/+6
| |/ | | | | | | PHPBB3-11981
* | Merge pull request #1784 from nickvergessen/ticket/11924Nils Adermann2013-10-281-1/+1
|\ \ | |/ |/| [Ticket/11924] Add a script to export the events in wiki format
| * [ticket/11924] Fix some minor issues with the php event docsJoas Schilling2013-10-161-1/+1
| | | | | | | | PHPBB3-11924
* | [ticket/11923] Attempt to translate errors only if user can change avatar.Cesar G2013-10-171-3/+3
| | | | | | | | PHPBB3-11923
* | [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-161-1/+1
|/ | | | PHPBB3-11921
* [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-111-1/+9
| | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929
* Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-031-2/+2
|\ | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-237-38/+579
| |\
| * | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixed some PHPDoc errors I noticed while working on the karma extension. Mostly spacing issues or omitted characters, though there was one description that made no sense at all. PHPBB3-11786
* | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-262-6/+6
| | | | | | | | | | | | PHPBB3-11868
* | | [ticket/11700] Correct ucp_auth_link request interface referencesNils Adermann2013-09-191-3/+3
| | | | | | | | | | | | PHPBB3-11700
* | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-169-68/+590
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-121-31/+0
| |\ \ | | | | | | | | [ticket/11744] Group join request notification
| | * | [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-261-7/+0
| | | | | | | | | | | | | | | | PHPBB3-11744
| | * | [ticket/11744] Group join request notificationNathan Guse2013-07-261-29/+5
| | | | | | | | | | | | | | | | PHPBB3-11744
| * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-101-1/+76
| |\ \ \
| | * \ \ Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-051-1/+76
| | |\ \ \ | | | | | | | | | | | | [ticket/11747] UCP Prefs Core and Template Events
| | | * | | [ticket/11747] ucp_prefs_post core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11747
| | | * | | [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11747
| | | * | | [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11747
| | | * | | [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-11747
| * | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-065-30/+13
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | * | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * develop-olympus: [ticket/11799] Send anti abuse headers in "new password" emails.
| | | * | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11799
| | * | | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11655: [ticket/11653] Use $parse_flags [ticket/11653] Missing ";" [ticket/11655] Use $parse_flags [ticket/11655] wrong var names for the uid and for the bitfield [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
| | | * | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| | | * | | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| | | * | | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| | | * | | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| | | * | | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| | * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-311-0/+3
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10037] Fix table in subsilver2 [ticket/10037] Apply attached patch with a few changes
| | | * | | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10037
| | * | | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
| | |\ \ \ \ | | | |_|_|/ | | |/| | | [ticket/11723] Correctly redirect user to agreement page and let him leave
| | | * | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch consists of two changes. The first one will make sure that $agree is correctly reset to 0 and the user redirected back to the agreement page after changing the display language. Secondly, by reseting 'change_lang', the user will be able to agree to the terms on the agreement page again. The changed language will still be kept, as this is correctly saved in the 'lang' field that is passed to the ucp_register page. The variable $agree has also been changed to be boolean. It is not used as an integer anywere in the ucp_register file. PHPBB3-11723
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-14 18:54:11 +0000