makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 18:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
20320 commits 18 branches 192 tags 207 MiB
Commit graph

8463 commits

Author SHA1 Message Date
Nathan Guse
9acde23a05 [feature/twig] Language output assignments, using context class again 
PHPBB3-11598
 2013-06-11 09:41:15 -05:00
Marc Alexander
2d934704e2 [ticket/11602] Do not call localize_errors() if avatars are disabled 
The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.

PHPBB3-11602
 2013-06-11 14:54:22 +02: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
Dhruv
abd299b0a9 Merge branch 'ticket/10820' into ticket/10820-develop 
* ticket/10820:
  [ticket/10820] Fix function docblock

Conflicts:
	phpBB/download/file.php
 2013-06-08 23:17:04 +05:30
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
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
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
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
Dhruv
e6d521df29 Merge branch 'ticket/10820' into ticket/10820-develop 
* ticket/10820:
  [ticket/10820] Inject IE version in function

Conflicts:
	phpBB/download/file.php
 2013-06-05 00:27:32 +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
d925c8d0da [ticket/11583] Use a new lang key instead of giving the old one a new meaning. 
PHPBB3-11583
 2013-06-03 15:16:57 +02:00
Joas Schilling
6206d4aa4e [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL 
The explanation now states that links are prefixed with the board URL.

PHPBB3-8319
 2013-06-03 12:37:58 +02:00
Joas Schilling
c0e0c13cf1 [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts 
PHPBB3-8319
 2013-06-03 12:37:54 +02:00
Joas Schilling
81140ec887 [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse 
The description says:
"The URL must be relative to the topic page and cannot contain a server name
or protocol."
We now enforce this and will add a new token with the current behaviour back.

PHPBB3-8319
 2013-06-03 12:37:54 +02:00
Joas Schilling
0eae9eb75d [ticket/10840] Add check_form_key to acp_groups.php 
PHPBB3-10840
 2013-06-03 10:54:16 +02:00
Andreas Fischer
d0e45e17dd [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. 
PHPBB3-11583
 2013-06-01 04:09:33 +02:00
Joas Schilling
69e1b402df Merge remote-tracking branch 'Elsensee/ticket/11409' into develop 
* Elsensee/ticket/11409:
  [ticket/11409] Add success message after updating group position settings
 2013-05-31 18:08:26 +02:00
Joas Schilling
cae1f8bc86 Merge remote-tracking branch 'EXreaction/ticket/11387' into develop 
* EXreaction/ticket/11387:
  [ticket/11387] Log module added only after it has been added
 2013-05-31 17:21:00 +02:00
Oliver Schramm
faf804c70f [ticket/11409] Add success message after updating group position settings 
PHPBB3-11409
 2013-05-31 17:16:15 +02:00
Marc Alexander
6d5da402ec [ticket/11579] Remove unnecessary globals from validate_password() 
The globals $db and $user are not used in that function.

PHPBB3-11579
 2013-05-30 16:09:06 +02:00
Joas Schilling
a3c5809f94 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11578] Add missing underscore after 'validate' function prefix
 2013-05-27 23:07:06 +02:00
marc1706
b75f67231f [ticket/11578] Add missing underscore after 'validate' function prefix 
The underscore after the 'validate' function prefix for the older
functions was dropped by accident in PR #1407. This patch will add it
back.

PHPBB3-11578
 2013-05-27 22:56:49 +02:00