makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Máté Bartus 13a3e99848 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/13616] Fix CS + constant in the core extension
  [ticket/13616] Fix UI tests
  [ticket/13616] Cleanup globals after installing the board in func tests
  [ticket/13616] Updates direct call to twig environment constructor
  [ticket/13616] Uses a php 5.4 compatible version
  [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer

Conflicts:
	phpBB/composer.lock
2016-04-13 10:14:47 +02:00
..
adm Merge pull request #4021 from marc1706/ticket/14272 2016-03-27 13:34:17 +02:00
assets Merge pull request #4021 from marc1706/ticket/14272 2016-03-27 13:34:17 +02:00
bin [ticket/13616] Fix UI tests 2016-04-03 16:23:16 +02:00
cache
config Merge pull request #4236 from Nicofuma/ticket/13616 2016-04-13 10:11:24 +02:00
develop [ticket/13454] Remove unused variables 2016-01-06 13:52:11 +01:00
docs Merge branch '3.2.x' 2016-04-09 19:53:57 +02:00
download Merge branch '3.1.x' 2015-10-11 20:27:47 +02:00
ext
files
images
includes [3.1.x] Increase version for 3.1.10 development 2016-04-09 19:50:00 +02:00
install [3.1.x] Increase version for 3.1.10 development 2016-04-09 19:50:00 +02:00
language Merge branch '3.2.x' 2016-04-12 11:27:03 +02:00
phpbb Merge pull request #4236 from Nicofuma/ticket/13616 2016-04-13 10:11:24 +02:00
store
styles [prep-release-3.1.9] Update version to 3.1.9-RC1 2016-04-09 08:09:08 +02:00
.htaccess [ticket/14458] Explicitly state RewriteBase into .htaccess root file 2016-02-07 14:46:45 +01:00
app.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
common.php [ticket/13616] Fix UI tests 2016-04-03 16:23:16 +02:00
composer.json Merge branch '3.2.x' 2016-04-13 10:14:47 +02:00
composer.lock Merge branch '3.2.x' 2016-04-13 10:14:47 +02:00
cron.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
faq.php [ticket/13844] FAQ in new controller format 2015-05-16 22:09:05 +02:00
feed.php [ticket/13645] Move the feeds to controllers 2015-08-23 22:36:10 +02:00
index.php Merge branch '3.1.x' 2015-11-12 09:11:37 +01:00
mcp.php [ticket/8708] Apply permission 'f_announce_global' 2015-07-19 21:26:47 +02:00
memberlist.php Merge branch '3.1.x' into 3.2.x 2016-03-30 10:04:33 +02:00
posting.php Merge branch '3.1.x' into 3.2.x 2016-04-03 16:34:43 +02:00
report.php [ticket/13654] Moving reporting into controller 2015-04-16 11:29:11 +02:00
search.php [ticket/14234] Get rid of undefined variables 2015-10-12 21:56:09 +02:00
ucp.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
viewforum.php Merge branch '3.1.x' into 3.2.x 2016-03-27 12:37:27 +02:00
viewonline.php Merge branch '3.1.x' into 3.2.x 2016-02-13 18:08:01 +01:00
viewtopic.php Merge pull request #4190 from marc1706/ticket/14437 2016-03-25 11:48:29 +01:00
web.config [ticket/14587] Remove sectionGroup from web.config 2016-04-07 17:20:34 -04:00