aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-137-75/+110
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1335-362/+1178
|\
| * 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
| | * | | [ticket/11744] Empty notifications tables after testing themNathaniel Guse2013-07-261-0/+9
| | * | | [ticket/11744] Tables are not truncated in some dbms during testsNathaniel Guse2013-07-262-11/+8
| | * | | [ticket/11744] Fix functional test case that's failingNathaniel Guse2013-07-261-6/+3
| | * | | [ticket/11744] Include onceNathaniel Guse2013-07-261-3/+3
| | * | | [ticket/11744] CleanupNathaniel Guse2013-07-261-3/+2
| | * | | [ticket/11744] Group request testNathaniel Guse2013-07-262-0/+127
| | * | | [ticket/11744] Create base notification test class for setupNathaniel Guse2013-07-262-83/+107
| | * | | [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 pull request #1683 from EXreaction/ticket/11816David King2013-09-123-5/+14
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-1263-63/+3144
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1708 from EXreaction/ticket/11828David King2013-09-123-5/+6
| |\ \ \ \ \
| | * | | | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-123-5/+6
| * | | | | | 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 pull request #1640 from brunoais/ticket/11637Nathan Guse2013-09-121-8/+2
| |\ \ \ \ \ \
| | * | | | | | [ticket/11637] generate_text_for_display on search.phpbrunoais2013-08-041-8/+2