aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for browser support and valid textarea in function instead of before applying function. PHPBB3-11557
| * | | [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-205-92/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move code editor from prosilver to assets Apply code editor to subsilver2 Apply code editor to ACP elements where bbcode is allowed PHPBB3-11557
| * | | [feature/editor-code-tabs] Correctly count indentation on first lineVjacheslav Trushkin2013-05-201-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | Correctly count indentation on first line of code tag PHPBB3-11557
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11564' into developNathaniel Guse2013-06-062-5/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11564: [ticket/11564] Missing new line in tweaks.css [ticket/11564] Notifications popup fixes
| * | | | [ticket/11564] Missing new line in tweaks.cssVjacheslav Trushkin2013-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing new line at the end of tweaks.css PHPBB3-11564
| * | | | [ticket/11564] Notifications popup fixesVjacheslav Trushkin2013-05-232-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix width issue with vertical scrollbar Correctly absolutely position it above link, allowing style authors to move notifications link around in style Fix IE7 positioning PHPBB3-11564
* | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-061-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11588] Also use version.phpbb.com in install_update.php.
| * | | | [ticket/11588] Also use version.phpbb.com in install_update.php.Andreas Fischer2013-06-061-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11588
* | | | | Merge branch 'develop-olympus' into developDhruv2013-06-052-3/+10
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv (1) * develop-olympus: [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. Conflicts: phpBB/includes/search/fulltext_mysql.php phpBB/language/en/acp/search.php
| * | | Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympusDhruv2013-06-052-3/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11583: [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
| | * | | [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-032-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11583
| | * | | [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-012-2/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11583
* | | | | [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.Andreas Fischer2013-06-031-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11586
* | | | | [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.Andreas Fischer2013-06-031-8/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11586
* | | | | [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.Andreas Fischer2013-06-031-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11586
* | | | | [ticket/11586] Combine administrator/moderator checks together.Andreas Fischer2013-06-031-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11586