aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-127-19/+139
|\
| * [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| * [ticket/11824] Reorganize test fileDavid King2013-09-121-18/+17
| * [ticket/11824] Update language string for board settingsDavid King2013-09-121-1/+1
| * [ticket/11824] Revert changes to functions_content.phpDavid King2013-09-121-2/+2
| * [ticket/11824] Add tests for urls with mod_rewrite enabledDavid King2013-09-061-3/+48
| * [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| * [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| * [ticket/11824] Remove unused globalsDavid King2013-09-061-1/+1
| * [ticket/11824] Fix smiliesDavid King2013-09-061-2/+2
| * [ticket/11824] Fix logicDavid King2013-09-062-3/+3
| * [ticket/11824] Add option for mod_rewriteDavid King2013-09-038-33/+109
* | [ticket/11832] Fix build_url and the S_LOGIN_ACTIONNathan Guse2013-09-121-16/+18
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1252-43/+3073
|\ \
| * \ Merge pull request #1707 from EXreaction/ticket/11835David King2013-09-101-1/+1
| |\ \
| | * | [ticket/11835] Fix ucp_auth_link adding in migrationNathan Guse2013-09-101-1/+1
| |/ /
| * | Merge remote-tracking branch 'Hardolaf/feature/oauth' into developDavid King2013-09-1051-42/+3073
| |\ \
| | * \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-1021-169/+253
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-101-1/+0
| |\ \ \
| | * \ \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-101-1/+0
| | |\ \ \
| | | * | | [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.Andreas Fischer2013-09-101-1/+0
| | | | * | [feature/oauth] Fix tabindexJoseph Warner2013-09-091-5/+5
| | | | * | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-06239-5469/+5282
| | | | |\ \ | | | | | |/
| | | | * | [feature/oauth] Fix bug on ucp_auth_link related to error displayJoseph Warner2013-09-021-0/+1
| | | | * | [feature/oauth] More small fixesJoseph Warner2013-09-024-8/+8
| | | | * | [feature/oauth] More minor changes from reviewJoseph Warner2013-09-025-21/+22
| | | | * | [feature/oauth] Fix small bug introduced by update in OAuth libraryJoseph Warner2013-09-021-0/+30
| | | | * | [feature/oauth] Fix small issues on ucp pagesJoseph Warner2013-09-022-2/+3
| | | | * | [feature/oauth] Fix typo in OAuth logout methodJoseph Warner2013-09-021-1/+1
| | | | * | [feature/oauth] Make token storage service ignorantJoseph Warner2013-09-023-48/+39
| | | | * | [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 lusitanian/oauth to stable branchJoseph Warner2013-09-022-17/+27
| | | | * | [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-242-1/+14
| | | | * | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-2410-67/+62
| | | | * | [feature/oauth] Fix redirectsJoseph Warner2013-08-243-8/+25
| | | | * | [feature/oauth] Fix issues on ucp_login_link from reviewJoseph Warner2013-08-241-3/+38
| | | | * | [feature/oauth] Fix indentation on new language constantsJoseph Warner2013-08-241-7/+7
| | | | * | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-242-4/+4
| | | | * | [feature/oauth] Clean up TODOsJoseph Warner2013-08-246-12/+8
| | | | * | [feature/oauth] Subsilver2 ucp_login_linkJoseph Warner2013-08-241-0/+74
| | | | * | [feature/oauth] Subsilver2 ucp_auth_link templatesJoseph Warner2013-08-242-0/+51
| | | | * | [feature/oauth] Subsilver 2 login_body updatesJoseph Warner2013-08-222-0/+10
| | | | * | [feature/oauth] Add newline at end of fileJoseph Warner2013-08-221-1/+1
| | | | * | [feature/oauth] Fix remaining issues with token storageJoseph Warner2013-08-152-12/+70
| | | | * | [feature/oauth] Refactor test to provide for easier to read testsJoseph Warner2013-08-141-12/+17
| | | | * | [feature/oauth] Fix template not refreshing issueJoseph Warner2013-08-141-0/+3