aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-1217-6/+1720
|\
| * Merge pull request #1708 from EXreaction/ticket/11828David King2013-09-121-4/+4
| |\
| | * [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-121-4/+4
| * | Merge pull request #1690 from EXreaction/ticket/11822David King2013-09-122-2/+37
| |\ \
| | * | [ticket/11822] Use namespace lookup order for asset loadingNathan Guse2013-09-022-2/+37
| * | | [ticket/11835] Fix ucp_auth_link adding in migrationNathan Guse2013-09-101-1/+1
| | |/ | |/|
| * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-101-1219/+0
| |\ \
| * \ \ [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-0666-1590/+2356
| |\ \ \
| * | | | [feature/oauth] More minor changes from reviewJoseph Warner2013-09-023-17/+17
| * | | | [feature/oauth] Fix small bug introduced by update in OAuth libraryJoseph Warner2013-09-021-0/+30
| * | | | [feature/oauth] Fix typo in OAuth logout methodJoseph Warner2013-09-021-1/+1
| * | | | [feature/oauth] Make token storage service ignorantJoseph Warner2013-09-022-26/+17
| * | | | [feature/oauth] Update oauth::logout() to use clearAllTokens()Joseph Warner2013-09-021-4/+2
| * | | | [feature/oauth] Update storage implementation due to inteface changeJoseph Warner2013-09-022-3/+21
| * | | | [feature/oauth] Update comment on oauth service exceptionJoseph Warner2013-08-241-3/+4
| * | | | [feature/oauth] Forgot to remove placeholder commentJoseph Warner2013-08-241-1/+0
| * | | | [feature/oauth] OAuth service exceptionJoseph Warner2013-08-245-6/+32
| * | | | [feature/oauth] A few more minor changesJoseph Warner2013-08-241-1/+1
| * | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-246-43/+39
| * | | | [feature/oauth] Fix redirectsJoseph Warner2013-08-242-8/+23
| * | | | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-4/+2
| * | | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-244-11/+6
| * | | | [feature/oauth] Fix remaining issues with token storageJoseph Warner2013-08-151-2/+55
| * | | | [feature/oauth] Update auth provider interfaceJoseph Warner2013-08-141-0/+20
| * | | | [feature/oauth] Always store session_id with tokenJoseph Warner2013-08-141-5/+1
| * | | | [feature/oauth] Fix small error in method callJoseph Warner2013-08-141-1/+1
| * | | | [feature/oauth] No need for this lineJoseph Warner2013-08-141-3/+0
| * | | | [feature/oauth] Fix errors in oauthJoseph Warner2013-08-141-4/+5
| * | | | [feature/oauth] Implement unlinking in OAuthJoseph Warner2013-08-141-0/+25
| * | | | [feature/oauth] Add unlink_account to auth interfaceJoseph Warner2013-08-142-0/+16
| * | | | [feature/oauth] Document internal functionsJoseph Warner2013-08-141-1/+24
| * | | | [feature/oauth] Fix errors found in testing linkingJoseph Warner2013-08-141-6/+3
| * | | | [feature/oauth] Refactor oauth::link_account for two pathsJoseph Warner2013-08-141-11/+49
| * | | | [feature/oauth] Update link_account to allow for two methods of linkingJoseph Warner2013-08-141-1/+12
| * | | | [feature/oauth] Start implementing link/unlink actionsJoseph Warner2013-08-141-4/+11
| * | | | [feature/oauth] Handle hidden fieldsJoseph Warner2013-08-121-0/+4
| * | | | [feature/oauth] Get the OAuth template in place for ucp_auth_linkJoseph Warner2013-08-121-3/+3
| * | | | [feature/oauth] Build OAuth data for ucp_auth_linkJoseph Warner2013-08-121-0/+43
| * | | | [feature/oauth] More template workJoseph Warner2013-08-091-0/+10
| * | | | [feature/oauth] Add method to return necessary data for auth_linkJoseph Warner2013-08-091-0/+8
| * | | | [feature/oauth] Migration update for new ucp moduleJoseph Warner2013-08-071-1/+16
| * | | | [feature/oauth] Pass users_table as parameter to OAuth in constructJoseph Warner2013-08-021-2/+11
| * | | | [feature/oauth] OAuth clear tokens on logoutJoseph Warner2013-08-021-0/+14
| * | | | [feature/oauth] Fix error caused by previous change in OAuthJoseph Warner2013-08-021-2/+2
| * | | | [feature/oauth] Finish updating interface and related codeJoseph Warner2013-08-021-2/+6
| * | | | [feature/oauth] Add get_login_data to the auth_provider_interfaceJoseph Warner2013-08-023-3/+30
| * | | | [feature/oauth] Clean up OAuth servicesJoseph Warner2013-08-011-1/+1
| * | | | [feature/oauth] Clean up oauth.phpJoseph Warner2013-08-011-13/+17
| * | | | [feature/oauth] Attempt to fix postgres issueJoseph Warner2013-07-311-1/+1
| * | | | [feature/oauth] Clean up documentationJoseph Warner2013-07-303-6/+6