aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1622 from EXreaction/ticket/11373David King2013-09-123-2/+94
|\
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-1277-1584/+2842
| |\
| * | [ticket/11373] Use inheritdocNathan Guse2013-08-281-13/+3
| * | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-273-5/+107
* | | Merge pull request #1689 from EXreaction/ticket/11727David King2013-09-122-7/+165
|\ \ \ | |_|/ |/| |
| * | [ticket/11727] Fix indentationNathan Guse2013-09-121-1/+1
| * | [ticket/11727] Fix indentationNathan Guse2013-09-121-9/+9
| * | [ticket/11727] Template loader support for safe directories to load files fromNathan Guse2013-09-022-7/+165
* | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-122-2/+122
|\ \ \
| * | | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-121-2/+4
| * | | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-0/+118
* | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-123-7/+247
|\ \ \ \
| * | | | [ticket/11744] Cast to intNathan Guse2013-07-281-1/+1
| * | | | [ticket/11744] InheritdocNathan Guse2013-07-281-54/+7
| |/ / /
| * | | [ticket/11744] CommentsNathan Guse2013-07-271-1/+1
| * | | [ticket/11744] Create null log class (primarily for unit test)Nathaniel Guse2013-07-261-0/+125
| * | | [ticket/11744] Group join request notificationNathan Guse2013-07-262-7/+169
| | |/ | |/|
* | | Merge pull request #1705 from EXreaction/ticket/11833David King2013-09-121-3/+3
|\ \ \
| * | | [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSENathan Guse2013-09-091-3/+3
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2026-01-01 00:39:05 +0000