aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-201-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the move to soft-delete, the topic_replies column no longer exists in the topics table. Instead, the column topic_posts_approved should be used. PHPBB3-11717
| * | | | [feature/oauth] Fix bug on ucp_auth_link related to error displayJoseph Warner2013-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] More small fixesJoseph Warner2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] More minor changes from reviewJoseph Warner2013-09-022-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix small issues on ucp pagesJoseph Warner2013-09-022-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] A few more minor changesJoseph Warner2013-08-241-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-242-19/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix issues on ucp_login_link from reviewJoseph Warner2013-08-241-3/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix template not refreshing issueJoseph Warner2013-08-141-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix bug found in testingJoseph Warner2013-08-141-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Implement unlinking in OAuthJoseph Warner2013-08-141-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix errors found in testing linkingJoseph Warner2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Refactor oauth::link_account for two pathsJoseph Warner2013-08-141-1/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Update link_account to allow for two methods of linkingJoseph Warner2013-08-142-1/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix errors in ucp_auth_linkJoseph Warner2013-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Start implementing link/unlink actionsJoseph Warner2013-08-141-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Handle hidden fieldsJoseph Warner2013-08-121-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Get the OAuth template in place for ucp_auth_linkJoseph Warner2013-08-121-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Error handling on pageJoseph Warner2013-08-121-4/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] More template workJoseph Warner2013-08-091-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Add method to return necessary data for auth_linkJoseph Warner2013-08-091-1/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-09 10:10:37 +0000