aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [feature/twig] Replace phpBB template with TwigNathan Guse2013-06-104-396/+898
* [feature/twig] BEGIN loops now workNathan Guse2013-06-102-5/+4
* [feature/twig] Replace phpBB template code with Twig syntax, then parse w/TwigNathan Guse2013-06-106-67/+146
* [feature/twig] More work on the lexerNathan Guse2013-06-103-2/+41
* [feature/twig] Working on DEFINENathan Guse2013-06-103-1/+60
* [feature/twig] Support our old INCLUDE statements (no quotes)Nathan Guse2013-06-091-13/+23
* [feature/twig] WIP extension/lexer/some tokenparsers/nodesNathan Guse2013-06-097-0/+395
* [feature/twig] Adding Twig dependency to composer.jsonNathan Guse2013-06-092-821/+80
* Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0715-1171/+1542
|\
| * [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-066-6/+6
| * [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0612-125/+157
| * [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-069-34/+139
| * [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-063-109/+167
| * [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-062-123/+139
| * [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-062-77/+93
| * [ticket/11481] Move news feed to own fileJoas Schilling2013-06-062-99/+115
| * [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-062-62/+78
| * [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-062-98/+114
| * [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-062-129/+145
| * [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-062-83/+99
| * [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-062-45/+61
| * [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-062-43/+59
| * [ticket/11481] Move feed base to own fileJoas Schilling2013-06-062-214/+230
| * [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-062-88/+104
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-070-0/+0
|\ \
| * \ Merge remote-tracking branch 'remotes/nickv/ticket/11543' into develop-olympusNathaniel Guse2013-06-072-0/+359
| |\ \
* | \ \ Merge remote-tracking branch 'remotes/nickv/ticket/develop/11543' into developNathaniel Guse2013-06-073-0/+353
|\ \ \ \
| * \ \ \ Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-072-10/+21
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/11543] Add more users so #hidden <> #normalJoas Schilling2013-06-072-10/+21
| * | | | [ticket/develop/11543] Use plurals in developJoas Schilling2013-06-062-25/+19
| * | | | Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-062-0/+348
| |\ \ \ \ | | |/ / /
| | * | | [ticket/11543] Use correct IP addresses and inject time for correct valuesJoas Schilling2013-06-061-22/+25
| | * | | [ticket/11543] Add unit tests for obtain_users_online_string()Joas Schilling2013-06-062-1/+185
| | * | | [ticket/11543] Add unit tests for obtain_users_online() with empty forumJoas Schilling2013-06-061-0/+16
| | * | | [ticket/11543] Add unit tests for obtain_users_online()Joas Schilling2013-06-061-0/+65
| | * | | [ticket/11543] Add unit tests for obtain_guest_count()Joas Schilling2013-06-062-0/+80
* | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-06-061-0/+20
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #1466 from nickvergessen/ticket/11590Nils Adermann2013-06-061-0/+20
| |\ \ \ \
| | * | | | [ticket/11590] Close database connections when tearDown() is calledJoas Schilling2013-06-071-0/+20
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-060-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'remotes/nickv/ticket/11568' into develop-olympusNathaniel Guse2013-06-065-105/+173
| |\ \ \ \
* | \ \ \ \ Merge remote-tracking branch 'remotes/nickv/ticket/11568-develop' into developNathaniel Guse2013-06-0618-183/+219
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11568-d...Joas Schilling2013-06-0726-145/+640
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11587' into developNathaniel Guse2013-06-064-10/+170
|\ \ \ \ \ \
| * | | | | | [ticket/11587] Add functional tests for group teampage settingsMarc Alexander2013-06-043-6/+157
| * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11587Marc Alexander2013-06-043-8/+14
| |\ \ \ \ \ \
| * | | | | | | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
* | | | | | | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' in...Nathaniel Guse2013-06-065-78/+165
|\ \ \ \ \ \ \ \
| * | | | | | | | [feature/editor-code-tabs] Make inTag function reusableVjacheslav Trushkin2013-05-221-29/+44
| * | | | | | | | [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-202-3/+4