mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
26,817 Commits 17 Branches 190 Tags
Commit Graph

129 Commits

Author SHA1 Message Date
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers 
PHPBB3-13645
 2015-08-23 22:36:10 +02:00
Marc Alexander
01097a24b5 Merge branch '3.1.x' 
Conflicts:
	tests/template/template_includecss_test.php
 2015-07-08 22:54:26 +02:00
Matt Friedman
498a516017 [ticket/13995] Remove deprecated projection media type 
PHPBB3-13995
 2015-07-07 20:09:01 -07:00
Nils Adermann
f958d05aed Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2015-05-30 10:58:40 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Joas Schilling
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Oliver Schramm
cddecec146 Merge pull request #3591 from Nicofuma/ticket/12632 
[ticket/12632] Add twig.debug and twig.auto_reload in config.yml
 2015-05-16 00:30:19 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style 
PHPBB3-13838
 2015-05-14 15:43:44 +02:00
MateBartus
281f2ef2da [ticket/13804] Remove unnecessary array_merge 
PHPBB3-13804
 2015-05-11 16:59:26 +02:00
MateBartus
7b301e22f3 [ticket/13804] Make template's user dependency optional 
PHPBB3-13804
 2015-05-05 19:16:49 +02:00
Nicofuma
51376a4391 [ticket/13638] Inject $filesystem in \phpbb\template\asset 
PHPBB3-13638
 2015-05-05 17:07:11 +02:00
Nicofuma
f097f84f16 [ticket/13638] Handle assets outside of phpbb_root_path 
PHPBB3-13638
 2015-05-04 23:23:40 +02:00
Nicofuma
3b631cb40d [ticket/13638] Prepend the assets path phpbb root 
PHPBB3-13638
 2015-05-04 23:23:18 +02:00
Tristan Darricau
f821130c3a [ticket/12632] Add twig.debug and twig.auto_reload in config.yml 
PHPBB3-13206
PHPBB3-12632
 2015-05-04 14:43:58 +02:00
MateBartus
9a99c9e4b1 [ticket/13762] Replace user service with lang in twig extension 
PHPBB3-13762
 2015-05-02 13:37:13 +02:00
MateBartus
4bdef6fd21 [ticket/13697] Moving filesystem related functions to filesystem service 
* Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service

PHPBB3-13697
 2015-04-16 13:24:10 +02:00
Tristan Darricau
cf39cfc593 [ticket/13132] Twig: Add loops content to the root context 
PHPBB3-13132
 2015-03-05 21:38:59 +01:00
Nicofuma
f4b42c961f [ticket/13139] Fix tests 
PHPBB3-13139
 2015-02-03 13:37:52 +01:00
Matt Friedman
9f4c2effe9 [ticket/10388] Update deprecation comment 
PHPBB3-10388
 2015-01-31 01:11:28 -08:00
Matt Friedman
5b7d1f1b43 [ticket/10388] Update deprecation date for addslashes 
PHPBB3-10388
 2015-01-29 01:50:13 -08:00
Matt Friedman
a62adfc115 [ticket/10388] Use TWIG escape JS filter instead of addslashes 
PHPBB3-10388
 2015-01-29 01:41:28 -08:00
Tristan Darricau
5307f47654 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13133] Fix variable name in set_custom_style()
 2015-01-20 23:48:24 +01:00
Matt Friedman
41966c481f [ticket/13133] Fix variable name in set_custom_style() 
PHPBB3-13133
 2015-01-20 14:21:02 -08:00
Joas Schilling
5b1c9831c2 Merge pull request #3099 from Senky/ticket/13266 
[ticket/13266] Enabling twig dump function if DEBUG is defined
 2014-12-27 13:31:01 +01:00
Joas Schilling
95a8f40052 Merge branch 'develop-ascraeus' into develop 2014-11-21 20:41:14 +01:00
Tristan Darricau
9aa8f44489 [ticket/13133] Rename $ok variable 
PHPBB3-13133
 2014-11-07 15:57:31 +01:00
Jakub Senko
4522db7624 [ticket/13266] Enable twig dump function 
PHPBB3-13266
 2014-11-01 12:31:58 +01:00
Tristan Darricau
911831a9c5 [ticket/13133] Allow @vendor_name for includecss 
PHPBB3-13133
 2014-10-08 18:25:36 +02:00
Andreas Fischer
f20e3e9feb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13070] Use old 'template' class for template class hook
 2014-09-23 23:25:59 +02:00
Marc Alexander
d03be5ea5f [ticket/13070] Use old 'template' class for template class hook 
PHPBB3-13070
 2014-09-22 20:03:55 +02:00
Marc Alexander
cf5ae5abbc Merge branch 'develop-ascraeus' into develop 2014-09-02 20:55:25 +02:00
Pico88
273fc5b5b6 [ticket/12661] Add template test 
PHPBB3-12661
 2014-08-24 10:16:39 +02:00
Pico88
ae3b015f65 [ticket/12661] Load extensions templates from "all" folder by render() 
PHPBB3-12661
 2014-08-24 08:10:37 +02:00
Tristan Darricau
143c1ba8d1 [ticket/12957] Removed unused use 
PHPBB3-12957
 2014-08-10 04:01:47 +02:00
Tristan Darricau
e7e6d45789 [ticket/12957] Update the constructions of the template engine 
PHPBB3-12957
 2014-08-10 03:32:27 +02:00
Tristan Darricau
827510a418 [ticket/11649] Fix coding style 
PHPBB3-11649
 2014-08-09 16:14:58 +02:00
Tristan Darricau
192b8e2568 [ticket/11649] Expose Twig through the container 
PHPBB3-11649
 2014-08-09 16:13:22 +02:00
n-aleha
dfcbace621 [ticket/12557] Template fixes 
PHPBB3-12557
 2014-08-03 07:12:34 +03:00
Joas Schilling
831e9116ab [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop 
We do not set S_NUM_ROWS while adding a row, to reduce the complexity
If we would set it on adding, each subsequent adding would cause
n modifications, resulting in a O(n!) complexity, rather then O(n)

PHPBB3-12892
 2014-07-25 17:48:53 +02:00
Tristan Darricau
6d40b87661 [ticket/12781] Template regex for IF catch too many things 
PHPBB3-12781
 2014-06-27 16:04:56 +02:00
Tristan Darricau
0d0113e6da [ticket/12715] Cleanup comments in \phpbb\template\* 
PHPBB3-12715
 2014-06-15 19:15:06 +02:00
Yuriy Rusko
2a42aee8ac Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 2014-05-28 01:02:39 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers 
PHPBB3-12594
 2014-05-27 20:51:13 +02:00
Tristan Darricau
05cd25a88b [ticket/12509] Add example in doc block 
PHPBB3-12509
 2014-05-27 00:05:12 +02:00
Tristan Darricau
9fc2063d86 [ticket/12509] Fix doc block 
PHPBB3-12509
 2014-05-13 23:49:21 +02:00
Tristan Darricau
1e427fa031 [ticket/12509] Fix the call to set_custom_file in adm/index and messenger 
PHPBB3-12509
 2014-05-13 23:39:42 +02:00
Tristan Darricau
300d5c32db [ticket/12509] Add an option to set the path of custom file for extensions 
https://tracker.phpbb.com/browse/PHPBB3-12509

PHPBB3-12509
 2014-05-13 23:22:54 +02:00
Nils Adermann
d18f19a3bb [ticket/12382] Allow nested loops in included files. 
They have to reference the fully qualified loop name in BEGIN and END.

PHPBB3-12382
 2014-05-03 00:13:06 +02:00
Joas Schilling
235f7c3721 Merge remote-tracking branch 'rxu3/ticket/12224' into develop 
* rxu3/ticket/12224:
  [ticket/12224] Add assign_block_vars_array() test.
  [ticket/12224] Add template wrapper method to assign block arrays
 2014-03-10 23:49:37 +01:00