Commit graph

15036 commits

Author SHA1 Message Date
Nathaniel Guse
9eb3ad4d90 [feature/twig] Add && and || support
PHPBB3-11598
2013-06-14 09:41:02 -05:00
Nathaniel Guse
1ad10a7799 [feature/twig] Fix improper template syntax in acp_forums.html
PHPBB3-11598
2013-06-14 09:35:36 -05:00
Nathaniel Guse
30a1f21735 [feature/twig] Use twig loader filesystem with namespaces to add paths
Twig now handles loading style files on its own

PHPBB3-11598
2013-06-14 01:00:38 -05:00
Nathan Guse
38d8025f12 [feature/twig] Use phpbb_template_twig in tests
Replace all new phpbb_template( with new phpbb_template_twig(

PHPBB3-11598
2013-06-12 13:29:57 -05:00
Nathan Guse
fa86f45f62 [feature/twig] Use phpBB's resource locator to find templates
PHPBB3-11598
2013-06-12 13:26:20 -05:00
Nathan Guse
74f19830f3 [feature/twig] Some additional operators, more stuff for IF
PHPBB3-11598
2013-06-12 12:48:37 -05:00
Nathan Guse
95884edf08 [feature/twig] Correcting output of INCLUDEJS
PHPBB3-11598
2013-06-12 12:32:56 -05:00
Nathan Guse
612dbad63f [feature/twig] Fixing IF .blah correctly
PHPBB3-11598
2013-06-11 10:57:00 -05:00
Nathan Guse
6f9acb0117 [feature/twig] Update composer.lock
PHPBB3-11598
2013-06-11 09:44:01 -05:00
Nathan Guse
9acde23a05 [feature/twig] Language output assignments, using context class again
PHPBB3-11598
2013-06-11 09:41:15 -05:00
Nathan Guse
b035697800 [feature/twig] Replace phpBB template with Twig
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
2013-06-10 12:59:47 -05:00
Nathan Guse
eac3c1f75c [feature/twig] BEGIN loops now work
PHPBB3-11598
2013-06-10 11:57:51 -05:00
Nathan Guse
15114067e6 [feature/twig] Replace phpBB template code with Twig syntax, then parse w/Twig
Fixing begin token/node, adding includejs token/node

PHPBB3-11598
2013-06-10 11:17:11 -05:00
Nathan Guse
b775f67128 [feature/twig] More work on the lexer
Committing what I have now to save it as I'm trying another method next

PHPBB3-11598
2013-06-10 10:00:22 -05:00
Nathan Guse
9f8f500ba3 [feature/twig] Working on DEFINE
PHPBB3-11598
2013-06-10 00:59:06 -05:00
Nathan Guse
87cc8af265 [feature/twig] Support our old INCLUDE statements (no quotes)
Better code for handling IF .blah

PHPBB3-11598
2013-06-09 23:32:39 -05:00
Nathan Guse
1da4be04b0 [feature/twig] WIP extension/lexer/some tokenparsers/nodes
PHPBB3-11598
2013-06-09 22:11:12 -05:00
Nathan Guse
7ea0019a71 [feature/twig] Adding Twig dependency to composer.json
PHPBB3-11598
2013-06-09 17:45:29 -05:00
Nathan Guse
e5d02f4b0c Merge remote-tracking branch 'remotes/nickv/ticket/11481' into develop
# 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
2013-06-07 11:14:16 -05:00
Nathaniel Guse
b4b1704a9b Merge remote-tracking branch 'remotes/Marc/ticket/11587' into develop
# 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()
2013-06-06 14:23:20 -05:00
Nathaniel Guse
8c3bb26a62 Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' 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
2013-06-06 14:07:27 -05:00
Nathaniel Guse
4a4a822df8 Merge remote-tracking branch 'remotes/cyberalien/ticket/11564' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11564:
  [ticket/11564] Missing new line in tweaks.css
  [ticket/11564] Notifications popup fixes
2013-06-06 13:57:55 -05:00
Joas Schilling
e36deed24f [ticket/11481] Move prepended slash from calls into function
PHPBB3-11481
2013-06-06 20:35:38 +02:00
Joas Schilling
6333451455 [ticket/11481] Remove globals and use dependency injection instead
PHPBB3-11481
2013-06-06 20:32:47 +02:00
Joas Schilling
3efe0eb246 [ticket/11481] Use container for all classes and inject dependencies
PHPBB3-11481
2013-06-06 20:04:23 +02:00
Nathaniel Guse
f4247aa3fe Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11588] Also use version.phpbb.com in install_update.php.
2013-06-06 12:56:36 -05:00
Joas Schilling
b5f1484744 [ticket/11481] Move functions from feed into helper class
PHPBB3-11481
2013-06-06 19:35:36 +02:00
Joas Schilling
b25af0fa68 [ticket/11481] Move active topics feed to own file
PHPBB3-11481
2013-06-06 17:06:52 +02:00
Joas Schilling
65a527f877 [ticket/11481] Move topics feed to own file
PHPBB3-11481
2013-06-06 17:06:24 +02:00
Joas Schilling
3e30c731b5 [ticket/11481] Move news feed to own file
PHPBB3-11481
2013-06-06 17:05:59 +02:00
Joas Schilling
caf7c45fb4 [ticket/11481] Move forums feed to own file
PHPBB3-11481
2013-06-06 17:05:41 +02:00
Joas Schilling
ffdb5c9388 [ticket/11481] Move topic feed to own file
PHPBB3-11481
2013-06-06 17:05:22 +02:00
Joas Schilling
d94ec8faab [ticket/11481] Move forum feed to own file
PHPBB3-11481
2013-06-06 17:04:57 +02:00
Joas Schilling
a995deb189 [ticket/11481] Move overall feed to own file
PHPBB3-11481
2013-06-06 17:04:37 +02:00
Joas Schilling
f592072b4b [ticket/11481] Move feed topic base to own file
PHPBB3-11481
2013-06-06 17:04:05 +02:00
Joas Schilling
06a51b09f1 [ticket/11481] Move feed post base to own file
PHPBB3-11481
2013-06-06 17:03:40 +02:00
Joas Schilling
2916ddc38c [ticket/11481] Move feed base to own file
PHPBB3-11481
2013-06-06 17:03:10 +02:00
Joas Schilling
a839896ddd [ticket/11481] Move feed factory to own file
PHPBB3-11481
2013-06-06 17:02:45 +02:00
Andreas Fischer
55f7281f61 [ticket/11588] Also use version.phpbb.com in install_update.php.
PHPBB3-11588
2013-06-06 13:00:53 +02:00
Dhruv
3931f7f3b9 Merge branch 'develop-olympus' into develop
# 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
2013-06-05 01:55:49 +05:30
Dhruv
ad8386a64a Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympus
# 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.
2013-06-05 01:41:26 +05:30
Marc Alexander
27bcf25c3b [ticket/11587] Pass legend and teampage settings to group_create()
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
2013-06-04 14:25:37 +02:00
Andreas Fischer
5fa25880e2 [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
Andreas Fischer
50e3173e8c [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
Andreas Fischer
11c80c0402 [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
PHPBB3-11586
2013-06-03 16:14:22 +02:00
Andreas Fischer
cb54f56c3d [ticket/11586] Combine administrator/moderator checks together.
PHPBB3-11586
2013-06-03 16:07:19 +02:00
Andreas Fischer
99d089ce9f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:32 +02:00
Andreas Fischer
a3d1593804 Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympus
* erangamapa/ticket/11145:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:21 +02:00
Andreas Fischer
a20a0e06c2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10840] Add check_form_key to acp_groups.php
2013-06-03 15:39:07 +02:00
Andreas Fischer
1cd6bb88a6 Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympus
* nickvergessen/ticket/10840:
  [ticket/10840] Add check_form_key to acp_groups.php
2013-06-03 15:36:04 +02:00