aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/auth
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11700] Fix some more incorrectly changed commentsNils Adermann2013-09-192-3/+3
| | | | PHPBB3-11700
* [ticket/11700] Get functional tests running after develop mergeNils Adermann2013-09-171-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Fix leftover backslashes in commentsNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Fix a few more commentsNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] The word "them" in a comment is not a classNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Actually "one" in comments is not a classNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Fix authentication acp after develop mergeNils Adermann2013-09-165-23/+31
| | | | PHPBB3-11700
* [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-163-40/+46
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1611-0/+1590
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [feature/oauth] More minor changes from reviewJoseph Warner2013-09-023-17/+17
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix small bug introduced by update in OAuth libraryJoseph Warner2013-09-021-0/+30
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix typo in OAuth logout methodJoseph Warner2013-09-021-1/+1
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Make token storage service ignorantJoseph Warner2013-09-022-26/+17
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Update oauth::logout() to use clearAllTokens()Joseph Warner2013-09-021-4/+2
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Update storage implementation due to inteface changeJoseph Warner2013-09-022-3/+21
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Update comment on oauth service exceptionJoseph Warner2013-08-241-3/+4
| | | | | | | | PHPBB3-16673
| * [feature/oauth] Forgot to remove placeholder commentJoseph Warner2013-08-241-1/+0
| | | | | | | | PHPBB3-11673
| * [feature/oauth] OAuth service exceptionJoseph Warner2013-08-245-6/+32
| | | | | | | | PHPBB3-11673
| * [feature/oauth] A few more minor changesJoseph Warner2013-08-241-1/+1
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Changes due to code reviewJoseph Warner2013-08-246-43/+39
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix redirectsJoseph Warner2013-08-242-8/+23
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-4/+2
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Clean up TODOsJoseph Warner2013-08-244-11/+6
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix remaining issues with token storageJoseph Warner2013-08-151-2/+55
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Update auth provider interfaceJoseph Warner2013-08-141-0/+20
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Always store session_id with tokenJoseph Warner2013-08-141-5/+1
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix small error in method callJoseph Warner2013-08-141-1/+1
| | | | | | | | PHPBB3-11673
| * [feature/oauth] No need for this lineJoseph Warner2013-08-141-3/+0
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix errors in oauthJoseph Warner2013-08-141-4/+5
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Implement unlinking in OAuthJoseph Warner2013-08-141-0/+25
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Add unlink_account to auth interfaceJoseph Warner2013-08-142-0/+16
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Document internal functionsJoseph Warner2013-08-141-1/+24
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix errors found in testing linkingJoseph Warner2013-08-141-6/+3
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Refactor oauth::link_account for two pathsJoseph Warner2013-08-141-11/+49
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Update link_account to allow for two methods of linkingJoseph Warner2013-08-141-1/+12
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Start implementing link/unlink actionsJoseph Warner2013-08-141-4/+11
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Handle hidden fieldsJoseph Warner2013-08-121-0/+4
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Get the OAuth template in place for ucp_auth_linkJoseph Warner2013-08-121-3/+3
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Build OAuth data for ucp_auth_linkJoseph Warner2013-08-121-0/+43
| | | | | | | | PHPBB3-11673
| * [feature/oauth] More template workJoseph Warner2013-08-091-0/+10
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Add method to return necessary data for auth_linkJoseph Warner2013-08-091-0/+8
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Pass users_table as parameter to OAuth in constructJoseph Warner2013-08-021-2/+11
| | | | | | | | PHPBB3-11673
| * [feature/oauth] OAuth clear tokens on logoutJoseph Warner2013-08-021-0/+14
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Fix error caused by previous change in OAuthJoseph Warner2013-08-021-2/+2
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Finish updating interface and related codeJoseph Warner2013-08-021-2/+6
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Add get_login_data to the auth_provider_interfaceJoseph Warner2013-08-023-3/+30
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Clean up OAuth servicesJoseph Warner2013-08-011-1/+1
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Clean up oauth.phpJoseph Warner2013-08-011-13/+17
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Clean up documentationJoseph Warner2013-07-303-6/+6
| | | | | | | | PHPBB3-11673
| * [feature/oauth] Consolidate repeated query into one functionJoseph Warner2013-07-301-28/+28
| | | | | | | | PHPBB3-11673