aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] Only set extensions if extension manager is loadedNathan Guse2013-06-241-1/+4
| | | | PHPBB3-11598
* [feature/twig] Change composer to load Twig 1.13.*Nathan Guse2013-06-242-2/+2
| | | | PHPBB3-11598
* [feature/twig] Fixing file header copyrightsNathan Guse2013-06-245-105/+35
| | | | PHPBB3-11598
* [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-2410-14/+15
| | | | | | | | | | | | | | | | | | | | | | Was: <!-- INCLUDEJS template/foo.js --> Now: <!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' --> Reasons for this: 1. INCLUDEJS is 3.1-dev only 2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path to styles/name/ directory) 3. INCLUDEJS could not include files from outside directories or anywhere else 4. It was easier to change INCLUDEJS behavior to something more flexible and useful than hack around it to make it work as it was with Twig. PHPBB3-11598
* [feature/twig] Fix <!-- .blah since the being node was changedNathan Guse2013-06-242-2/+7
| | | | PHPBB3-11598
* [feature/twig] Able to set chain of namespaces to search for loadTemplate()Nathan Guse2013-06-244-3/+147
| | | | | | | | | | | | | | | | This is done so that when event template files are included, if they include files themselves, that namespace is checked first, then __main__ is checked to include the correct template file. Also, when template files are included from a particular namespace, this is done so that the files from that namespace are included first, then the main namespace is checked. We may want to change this behavior in the future to allow choosing which locations have priority, but for now, this is what I am doing to make sure the behavior is simple and always the same. PHPBB3-11598
* [feature/twig] Use twig->display rather than echo twig->renderNathan Guse2013-06-241-1/+1
| | | | PHPBB3-11598
* [feature/twig] Event template tagNathan Guse2013-06-244-40/+97
| | | | PHPBB3-11598
* [feature/twig] Changing method for begin node to not use anonymous functionNathan Guse2013-06-233-3/+89
| | | | | | | The way it was setup would actually require PHP 5.4, which isn't an option right now. Leaving the old code there, just commented out, for now at least. PHPBB3-11598
* [feature/twig] Setup the style chain/loader properlyNathaniel Guse2013-06-181-18/+26
| | | | PHPBB3-11598
* [feature/twig] Fix begin loops & subloopsNathaniel Guse2013-06-152-43/+52
| | | | PHPBB3-11598
* [feature/twig] Throw exceptions (don't catch and ignore)Nathaniel Guse2013-06-141-1/+1
| | | | PHPBB3-11598
* [feature/twig] Add && and || supportNathaniel Guse2013-06-141-0/+3
| | | | PHPBB3-11598
* [feature/twig] Fix improper template syntax in acp_forums.htmlNathaniel Guse2013-06-141-1/+1
| | | | PHPBB3-11598
* [feature/twig] Use twig loader filesystem with namespaces to add pathsNathaniel Guse2013-06-143-11/+65
| | | | | | Twig now handles loading style files on its own PHPBB3-11598
* [feature/twig] Use phpbb_template_twig in testsNathan Guse2013-06-123-5/+5
| | | | | | Replace all new phpbb_template( with new phpbb_template_twig( PHPBB3-11598
* [feature/twig] Use phpBB's resource locator to find templatesNathan Guse2013-06-122-1/+51
| | | | PHPBB3-11598
* [feature/twig] Some additional operators, more stuff for IFNathan Guse2013-06-125-5/+54
| | | | PHPBB3-11598
* [feature/twig] Correcting output of INCLUDEJSNathan Guse2013-06-122-57/+27
| | | | PHPBB3-11598
* [feature/twig] Fixing IF .blah correctlyNathan Guse2013-06-112-8/+28
| | | | PHPBB3-11598
* [feature/twig] Update composer.lockNathan Guse2013-06-111-33/+819
| | | | PHPBB3-11598
* [feature/twig] Language output assignments, using context class againNathan Guse2013-06-112-33/+63
| | | | PHPBB3-11598
* [feature/twig] Replace phpBB template with TwigNathan Guse2013-06-104-396/+898
| | | | | | | | Move phpbb_template class to phpbb_template_phpbb Changed phpbb_template class to an interface Switch services.yml to load phpbb_template_twig instead of phpbb_template PHPBB3-11598
* [feature/twig] BEGIN loops now workNathan Guse2013-06-102-5/+4
| | | | PHPBB3-11598
* [feature/twig] Replace phpBB template code with Twig syntax, then parse w/TwigNathan Guse2013-06-106-67/+146
| | | | | | Fixing begin token/node, adding includejs token/node PHPBB3-11598
* [feature/twig] More work on the lexerNathan Guse2013-06-103-2/+41
| | | | | | Committing what I have now to save it as I'm trying another method next PHPBB3-11598
* [feature/twig] Working on DEFINENathan Guse2013-06-103-1/+60
| | | | PHPBB3-11598
* [feature/twig] Support our old INCLUDE statements (no quotes)Nathan Guse2013-06-091-13/+23
| | | | | | Better code for handling IF .blah PHPBB3-11598
* [feature/twig] WIP extension/lexer/some tokenparsers/nodesNathan Guse2013-06-097-0/+395
| | | | PHPBB3-11598
* [feature/twig] Adding Twig dependency to composer.jsonNathan Guse2013-06-092-821/+80
| | | | PHPBB3-11598
* Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0715-1171/+1542
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11481: [ticket/11481] Move prepended slash from calls into function [ticket/11481] Remove globals and use dependency injection instead [ticket/11481] Use container for all classes and inject dependencies [ticket/11481] Move functions from feed into helper class [ticket/11481] Move active topics feed to own file [ticket/11481] Move topics feed to own file [ticket/11481] Move news feed to own file [ticket/11481] Move forums feed to own file [ticket/11481] Move topic feed to own file [ticket/11481] Move forum feed to own file [ticket/11481] Move overall feed to own file [ticket/11481] Move feed topic base to own file [ticket/11481] Move feed post base to own file [ticket/11481] Move feed base to own file [ticket/11481] Move feed factory to own file
| * [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-066-6/+6
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0612-125/+157
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-069-34/+139
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-063-109/+167
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-062-123/+139
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-062-77/+93
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move news feed to own fileJoas Schilling2013-06-062-99/+115
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-062-62/+78
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-062-98/+114
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-062-129/+145
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-062-83/+99
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-062-45/+61
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-062-43/+59
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed base to own fileJoas Schilling2013-06-062-214/+230
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-062-88/+104
| | | | | | | | PHPBB3-11481
* | Merge remote-tracking branch 'remotes/Marc/ticket/11587' into developNathaniel Guse2013-06-061-4/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11587: [ticket/11587] Add functional tests for group teampage settings [ticket/11587] Pass legend and teampage settings to group_create()
| * | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
| | | | | | | | | | | | | | | | | | | | | Without passing those values, the group is removed from the teampage and the legend while submitting the edit form on the ucp groups manage page. PHPBB3-11587
* | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathaniel Guse2013-06-065-78/+165
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Make inTag function reusable [feature/editor-code-tabs] Check for browser support in function [feature/editor-code-tabs] Apply code editor to everything [feature/editor-code-tabs] Correctly count indentation on first line
| * | | [feature/editor-code-tabs] Make inTag function reusableVjacheslav Trushkin2013-05-221-29/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change inTag function to reusable JS function that can check for any BBCode PHPBB3-11557