aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-133-141/+280
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-123-155/+299
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11831] getAttribute was replaced with attrNathan2013-09-061-1/+1
| | * | | | | | | [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
* | | | | | | | | Merge pull request #1713 from Hardolaf/ticket/11836Nathan Guse2013-09-131-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/11836] Fix subsilver fatal errorJoseph Warner2013-09-131-1/+3
* | | | | | | | | | Merge pull request #1711 from Hardolaf/ticket/11836Nathan Guse2013-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-137-19/+139
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | [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
* | | | | | | Merge pull request #1709 from rechosen/ticket/11843Nathan Guse2013-09-133-2/+8
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11843] Added newlines and included numbers in the DEFINE vars testrechosen2013-09-132-1/+5
| * | | | | | | [ticket/11843] Add checking DEFINE variables with underscores to template_testrechosen2013-09-132-1/+3
| * | | | | | | [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-12263-5514/+7398
| |\ \ \ \ \ \ \
| * | | | | | | | [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-127-35/+176
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-122-3/+5
| * | | | | | | | | [ticket/11745] Add test for group request approvedNathan Guse2013-07-271-0/+29
| * | | | | | | | | Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11745Nathan Guse2013-07-273-168/+145
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-275-33/+143
* | | | | | | | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-1214-295/+657
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11744Nathan Guse2013-07-283-168/+145
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | [ticket/11744] Helper function to assert notifications in base testNathan Guse2013-07-273-168/+145
| | |/ / / / / / / / /
| * | | | | | | | | | [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] Copyright yearNathan Guse2013-07-271-1/+1
| * | | | | | | | | [ticket/11744] Fix tests for postgresqlNathaniel Guse2013-07-263-50/+31
| * | | | | | | | | [ticket/11744] spellingNathaniel Guse2013-07-261-1/+1