Commit graph

195 commits

Author SHA1 Message Date
Tristan Darricau
7a5fbd0257
[ticket/14807] Updates Twig
PHPBB3-14807
2016-10-02 19:24:45 +02:00
Tristan Darricau
c4812a2d83
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14797] Support PHP 7.1 and clearly state support for latest versions
2016-09-25 17:26:32 +02:00
Marc Alexander
9e52ed9af1
[ticket/14797] Support PHP 7.1 and clearly state support for latest versions
PHPBB3-14797
2016-09-25 12:54:01 +02:00
Marc Alexander
9dbe47ba8e Merge branch '3.2.x' 2016-08-16 20:49:36 +02:00
JoshyPHP
260a0a29ad [ticket/14740] Added support for quoted attributes in BBCode definitions
PHPBB3-14740
2016-08-10 03:19:38 +02:00
Máté Bartus
6ca10fc85a Merge branch '3.2.x' 2016-08-05 21:29:27 +02:00
Marc Alexander
dd01de03bf [ticket/14735] Update composer dependencies to latest versions
This will update Symfony to 2.8.9, fast-image-size to 1.1.1, and
text-formatter to 0.6.1.

PHPBB3-14735
2016-08-05 20:26:58 +02:00
Marc Alexander
59a228f7cd [ticket/14670] Use symfony 3.1 in master branch
Removed sami as it doesn't have a version compatible
with symfony 3.x.

PHPBB3-14670
2016-07-23 17:13:54 +02:00
Máté Bartus
0336bef2d9 Merge branch '3.2.x' 2016-07-19 19:24:52 +02:00
Máté Bartus
d2ff12256c Merge branch '3.1.x' into 3.2.x 2016-07-19 19:23:35 +02:00
Marc Alexander
f3fe610a5e [ticket/14538] Update symfony dependencies to latest versions
PHPBB3-14538
2016-07-19 17:58:41 +02:00
Máté Bartus
5760099618 Merge branch '3.2.x' 2016-07-19 10:20:21 +02:00
Marc Alexander
7195f51806 [ticket/14714] Update dependencies to latest versions
This does include updating guzzle with the latest security update and also
updating symfony to 2.8.8.

PHPBB3-14714
2016-07-18 22:41:42 +02:00
Marc Alexander
4e840fee16 Merge branch '3.2.x'
Conflicts:
	phpBB/composer.lock
2016-07-14 20:23:27 +02:00
JoshyPHP
24da2db987 [ticket/14706] Updated [list] BBCode to automatically create a list item
Fixes issues with missing list items. Produces valid HTML.

PHPBB3-14706
2016-07-08 07:49:10 +02:00
Marc Alexander
155d24107a Merge branch '3.2.x'
Conflicts:
	phpBB/composer.lock
2016-06-20 21:24:46 +02:00
Matt Friedman
3cd0c53118 [ticket/14547] Use package compatible with phpBB requirements
PHPBB3-14547
2016-04-28 08:36:49 -07:00
Matt Friedman
6196e4ae4d [ticket/14547] Add Vagrant to phpBB
PHPBB3-14547
2016-04-28 08:36:49 -07:00
Máté Bartus
caf63ba86b [ticket/14601] Fix composer.lock
PHPBB3-14601
2016-04-13 10:52:12 +02:00
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
Tristan Darricau
5cdbef860d [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
PHPBB3-13616
2016-04-03 16:22:07 +02:00
Tristan Darricau
93f932b80f [ticket/14495] Revert changes in master
PHPBB3-14495
2016-04-02 12:12:24 +02:00
Marc Alexander
83b56f7855 [ticket/14495] Specify correct version numbers in 3.2.x
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).

PHPBB3-14495
2016-04-02 10:06:59 +02:00
Tristan Darricau
1c61fd54d4 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14538] Update dependencies for 3.2.x
  [ticket/14538] Update composer dependencies
2016-03-15 20:25:55 +01:00
Marc Alexander
a92ce812e7 [ticket/14538] Update dependencies for 3.2.x
PHPBB3-14538
2016-03-15 13:37:26 +01:00
Marc Alexander
67d58aa7b8 Merge branch 'ticket/14538' into ticket/14538-3.2.x 2016-03-15 13:30:50 +01:00
Marc Alexander
681836a84d [ticket/14538] Update composer dependencies
PHPBB3-14538
2016-03-15 09:53:57 +01:00
Tristan Darricau
294f926bfc [ticket/14495] Updates the version to 3.3.0-a1-dev
PHPBB3-14495
2016-02-24 22:25:41 +01:00
Tristan Darricau
58359b1587 [ticket/14457] Replaces unique_id implementation by random_bytes()
PHPBB3-14457
2016-02-18 17:30:31 +01:00
Marc Alexander
4364629919 [ticket/14485] Update composer.lock
PHPBB3-14485
2016-02-18 16:28:04 +01:00
Tristan Darricau
d4c7f25e04 Merge pull request #4179 from marc1706/ticket/14477
[ticket/14477] Update text-formatter dependency

* marc1706/ticket/14477:
  [ticket/14477] Update text-formatter dependency
2016-02-15 22:57:30 +01:00
Marc Alexander
d330ef8c1b [ticket/14478] Move facebook/webdriver dependency to main composer file
Also updated to latest version and now using proper version in
composer.json.

PHPBB3-14478
2016-02-14 16:24:00 +01:00
Marc Alexander
b6f9a2e1aa [ticket/14477] Update text-formatter dependency
PHPBB3-14477
2016-02-14 15:49:56 +01:00
Marc Alexander
9ce4ceb9c1 [ticket/14448] Remove no longer needed guzzle 3.9.3
PHPBB3-14448
2016-02-03 16:55:03 +01:00
Marc Alexander
5ee559d524 [ticket/14448] Update composer.json and lock file for guzzlehttp
PHPBB3-14448
2016-02-03 11:30:44 +01:00
Marc Alexander
e4f562bdba [ticket/14442] Use Goutte 2.0 instead of outdated 1.0
PHPBB3-14442
2016-02-01 15:25:31 +01:00
Marc Alexander
6e465c01bf [ticket/14419] Update composer dependencies and lock file
PHPBB3-14419
2016-01-18 21:39:51 +01:00
Oliver Schramm
529880f911 [ticket/14250] Added symfony/debug as requirement
PHPBB3-14250
2016-01-06 16:06:27 +01:00
Oliver Schramm
e45ba44754 [ticket/14250] Update symfony dev-requirements to stable
PHPBB3-14250
2016-01-05 19:12:18 +01:00
Oliver Schramm
d90509bb31 [ticket/14250] Replace abandoned guzzle packages
PHPBB3-14250
2016-01-04 03:55:18 +01:00
Oliver Schramm
b9acf83653 [ticket/14250] Track version numbers instead of commit id
PHPBB3-14250
2016-01-04 03:47:38 +01:00
Oliver Schramm
0e94693089 [ticket/14250] Fix composer.json
Symfony dependencies that aren't required by phpBB itself but by
one of its dependencies are now forced to be 2.8 LTS again.

PHPBB3-14250
2016-01-04 03:44:33 +01:00
MichaelC
d9b107d2a3 [ticket/14341] Update dependencies to Symfony 2.8 stable
PHPBB3-14341
2015-12-06 16:21:14 +01:00
Tristan Darricau
38c05bfba3 Merge branch 'ticket/13656' into ticket/13656-rhea
* ticket/13656:
  [ticket/13656] Updates Symfony to fix the DB password issue
2015-11-25 00:11:38 +01:00
Tristan Darricau
0bff95488b [ticket/13656] Updates Symfony to fix the DB password issue
PHPBB3-13656
2015-11-25 00:04:48 +01:00
Cesar G
86d1b35a00 [ticket/13789] Update composer.lock.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Tristan Darricau
83969053c0 [ticket/14238] Updates Symfony
PHPBB3-14238
2015-10-14 10:25:52 +02:00
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4
PHPBB3-14205
2015-10-04 16:19:48 +02:00
Marc Alexander
223fa3aed5 [ticket/13904] Update composer.lock
PHPBB3-13904
2015-09-09 08:31:40 +02:00
Marc Alexander
b2957b9d65 [ticket/13904] Add bantu/ini-get-wrapper to composer.json
PHPBB3-13904
2015-09-09 08:28:49 +02:00