aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | [ticket/11837] Replace escaped single quote with utf-8 single quoteJoseph Warner2013-09-131-1/+1
| * | | | | | | | [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTEDJoseph Warner2013-09-131-0/+1
* | | | | | | | | Merge branch 'ticket/11811' into ticket/develop-2/11811Vjacheslav Trushkin2013-09-143-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/11811] Remove outline on :focusVjacheslav Trushkin2013-09-133-0/+23
* | | | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-132-140/+279
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-122-154/+298
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
* | | | | | | | | | | [ticket/11836] Fix subsilver fatal errorJoseph Warner2013-09-131-1/+3
* | | | | | | | | | | [ticket/11836] Fix fatal error on unsupported provider for auth linkJoseph Warner2013-09-131-1/+3
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1675 from marc1706/ticket/11809Nathan Guse2013-09-132-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | [ticket/11809] Ensure code.js is first script included after jQueryMarc Alexander2013-09-132-2/+2
* | | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-136-13/+89
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| * | | | | | | | [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] 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-037-16/+92
* | | | | | | | | [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-125-2/+97
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-12214-5055/+6436
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/11373] Use inheritdocNathan Guse2013-08-281-13/+3
| * | | | | | | | | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-275-5/+110
* | | | | | | | | | | 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-126-35/+147
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-122-3/+5
| * | | | | | | | | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-275-33/+143
* | | | | | | | | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-128-41/+292
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [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] LanguageNathan Guse2013-07-271-1/+1
| * | | | | | | | | | | [ticket/11744] Create null log class (primarily for unit test)Nathaniel Guse2013-07-261-0/+125
| * | | | | | | | | | | [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-262-8/+15
| * | | | | | | | | | | [ticket/11744] Group join request notificationNathan Guse2013-07-267-38/+204
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1705 from EXreaction/ticket/11833David King2013-09-122-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSENathan Guse2013-09-091-3/+3
| * | | | | | | | | | | [ticket/11833] Fix bad template loopNathan Guse2013-09-091-1/+1
* | | | | | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-1258-62/+2920
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 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
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |