Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/12156] Add missing passwords manager to oauth | Marc Alexander | 2014-02-03 | 1 | -2/+11 |
| | | | | PHPBB3-12156 | ||||
* | Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords | Marc Alexander | 2013-12-29 | 14 | -121/+10 |
|\ | | | | | | | | | Conflicts: phpBB/config/services.yml | ||||
| * | [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files. | Andreas Fischer | 2013-10-30 | 14 | -112/+0 |
| | | | | | | | | PHPBB3-11980 | ||||
| * | [ticket/11981] Fix code sniffer complaints | Marc Alexander | 2013-10-28 | 3 | -9/+8 |
| | | | | | | | | PHPBB3-11981 | ||||
| * | [ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception. | Andreas Fischer | 2013-10-11 | 1 | -1/+3 |
| | | | | | | | | PHPBB3-11908 | ||||
* | | [feature/passwords] Fix indentation in auth providers | Marc Alexander | 2013-12-28 | 2 | -2/+2 |
| | | | | | | | | PHPBB3-11610 | ||||
* | | [feature/passwords] Integrate convert_flag with db auth provider | Marc Alexander | 2013-10-25 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11610 | ||||
* | | [feature/passwords] Inject passwords manager into auth providers | Marc Alexander | 2013-10-02 | 3 | -18/+44 |
|/ | | | | | | | The passwords manager will replace the old method of using the functions phpbb_hash() and phpbb_check_hash(). PHPBB3-11610 | ||||
* | [ticket/11700] Fix some more incorrectly changed comments | Nils Adermann | 2013-09-19 | 2 | -3/+3 |
| | | | | PHPBB3-11700 | ||||
* | [ticket/11700] Get functional tests running after develop merge | Nils Adermann | 2013-09-17 | 1 | -1/+1 |
| | | | | PHPBB3-11700 | ||||
* | [ticket/11700] Fix leftover backslashes in comments | Nils Adermann | 2013-09-16 | 1 | -1/+1 |
| | | | | PHPBB3-11700 | ||||
* | [ticket/11700] Fix a few more comments | Nils Adermann | 2013-09-16 | 1 | -1/+1 |
| | | | | PHPBB3-11700 | ||||
* | [ticket/11700] The word "them" in a comment is not a class | Nils Adermann | 2013-09-16 | 1 | -1/+1 |
| | | | | PHPBB3-11700 | ||||
* | [ticket/11700] Actually "one" in comments is not a class | Nils Adermann | 2013-09-16 | 1 | -1/+1 |
| | | | | PHPBB3-11700 | ||||
* | [ticket/11700] Fix authentication acp after develop merge | Nils Adermann | 2013-09-16 | 5 | -23/+31 |
| | | | | PHPBB3-11700 | ||||
* | [ticket/11700] Fix tests after merging new develop code | Nils Adermann | 2013-09-16 | 3 | -40/+46 |
| | | | | PHPBB3-11700 | ||||
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 | Nils Adermann | 2013-09-16 | 11 | -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 review | Joseph Warner | 2013-09-02 | 3 | -17/+17 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Fix small bug introduced by update in OAuth library | Joseph Warner | 2013-09-02 | 1 | -0/+30 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Fix typo in OAuth logout method | Joseph Warner | 2013-09-02 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Make token storage service ignorant | Joseph Warner | 2013-09-02 | 2 | -26/+17 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Update oauth::logout() to use clearAllTokens() | Joseph Warner | 2013-09-02 | 1 | -4/+2 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Update storage implementation due to inteface change | Joseph Warner | 2013-09-02 | 2 | -3/+21 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Update comment on oauth service exception | Joseph Warner | 2013-08-24 | 1 | -3/+4 |
| | | | | | | | | PHPBB3-16673 | ||||
| * | [feature/oauth] Forgot to remove placeholder comment | Joseph Warner | 2013-08-24 | 1 | -1/+0 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] OAuth service exception | Joseph Warner | 2013-08-24 | 5 | -6/+32 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] A few more minor changes | Joseph Warner | 2013-08-24 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Changes due to code review | Joseph Warner | 2013-08-24 | 6 | -43/+39 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Fix redirects | Joseph Warner | 2013-08-24 | 2 | -8/+23 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Finish cleaning up TODOs | Joseph Warner | 2013-08-24 | 1 | -4/+2 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Clean up TODOs | Joseph Warner | 2013-08-24 | 4 | -11/+6 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Fix remaining issues with token storage | Joseph Warner | 2013-08-15 | 1 | -2/+55 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Update auth provider interface | Joseph Warner | 2013-08-14 | 1 | -0/+20 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Always store session_id with token | Joseph Warner | 2013-08-14 | 1 | -5/+1 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Fix small error in method call | Joseph Warner | 2013-08-14 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] No need for this line | Joseph Warner | 2013-08-14 | 1 | -3/+0 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Fix errors in oauth | Joseph Warner | 2013-08-14 | 1 | -4/+5 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Implement unlinking in OAuth | Joseph Warner | 2013-08-14 | 1 | -0/+25 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Add unlink_account to auth interface | Joseph Warner | 2013-08-14 | 2 | -0/+16 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Document internal functions | Joseph Warner | 2013-08-14 | 1 | -1/+24 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Fix errors found in testing linking | Joseph Warner | 2013-08-14 | 1 | -6/+3 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Refactor oauth::link_account for two paths | Joseph Warner | 2013-08-14 | 1 | -11/+49 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Update link_account to allow for two methods of linking | Joseph Warner | 2013-08-14 | 1 | -1/+12 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Start implementing link/unlink actions | Joseph Warner | 2013-08-14 | 1 | -4/+11 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Handle hidden fields | Joseph Warner | 2013-08-12 | 1 | -0/+4 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Get the OAuth template in place for ucp_auth_link | Joseph Warner | 2013-08-12 | 1 | -3/+3 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Build OAuth data for ucp_auth_link | Joseph Warner | 2013-08-12 | 1 | -0/+43 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] More template work | Joseph Warner | 2013-08-09 | 1 | -0/+10 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Add method to return necessary data for auth_link | Joseph Warner | 2013-08-09 | 1 | -0/+8 |
| | | | | | | | | PHPBB3-11673 | ||||
| * | [feature/oauth] Pass users_table as parameter to OAuth in construct | Joseph Warner | 2013-08-02 | 1 | -2/+11 |
| | | | | | | | | PHPBB3-11673 |