aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-2379-1551/+3195
|\
| * [ticket/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-134-15/+78
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-131-1/+1
| |\
| | * Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-132-12/+35
| | |\
| | | * [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| * | | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-132-12/+60
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1311-28/+673
| |\ \ \ | | |/ /
| | * | [ticket/11843] The twig lexer fixes DEFINE variables with underscores againrechosen2013-09-131-1/+1
| | * | 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
| | | | | |_|_|/ / | | | | |/| | | |
| | * | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-0614-1477/+529
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | [ticket/11816] Fix define/loop checks in IF statements containing parenthesisNathan Guse2013-08-291-4/+4
| * | | | | | | | Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-122-12/+35
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| | * | | | | | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-12/+35
| * | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1214-0/+1679
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | [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
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-17 07:52:22 +0000