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

165 commits

Author SHA1 Message Date
Marc Alexander
defcb1c46f
Merge branch '3.2.x' 2017-01-22 23:00:12 +01:00
JoshyPHP
f53f6d1c61 [ticket/15040] Updated s9e\TextFormatter to 0.9.1 
PHPBB3-15040
 2017-01-22 19:11:17 +01:00
Marc Alexander
7973984821
Merge branch '3.2.x' 2017-01-15 14:06:13 +01:00
JoshyPHP
52d53ef3de [ticket/15016] Fixed an issue with some parentheses in smilies 
PHPBB3-15016
 2017-01-15 11:24:15 +01:00
Marc Alexander
b5ad21debc
Merge branch '3.2.x' 2017-01-02 22:55:25 +01:00
Tristan Darricau
e88aecd3b4
[ticket/14947] Updates phpunit to 4.8 
$ composer update phpunit/phpunit --with-dependencies
Dependency "symfony/yaml" is also a root requirement, but is not explicitly whitelisted. Ignoring.
Loading composer repositories with package information
Updating dependencies (including require-dev)
  - Installing sebastian/global-state (1.1.1)
    Loading from cache

  - Installing doctrine/instantiator (1.0.5)
    Loading from cache

  - Removing phpunit/phpunit-mock-objects (2.1.5)
  - Installing phpunit/phpunit-mock-objects (2.3.8)
    Loading from cache

  - Removing phpunit/php-file-iterator (1.3.4)
  - Installing phpunit/php-file-iterator (1.4.2)
    Loading from cache

  - Installing phpdocumentor/reflection-docblock (2.0.4)
    Downloading: 100%

  - Installing phpspec/prophecy (v1.6.2)
    Loading from cache

  - Removing phpunit/phpunit (4.1.6)
  - Installing phpunit/phpunit (4.8.31)
    Downloading: 100%

sebastian/global-state suggests installing ext-uopz (*)
phpdocumentor/reflection-docblock suggests installing dflydev/markdown (~1.0)
phpdocumentor/reflection-docblock suggests installing erusev/parsedown (~1.0)
Writing lock file
Generating autoload files
> echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.'
You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.

PHPBB3-14947
 2016-12-30 21:58:38 +01:00
Máté Bartus
c5f5ab2c3f Merge branch '3.2.x' 2016-12-09 12:44:44 +01:00
Marc Alexander
7fedc19cc4
[ticket/14891] Use own proxy instantiator for open_basedir compatibility 
Also reverted random_compat lib to 1.4.x.

PHPBB3-14891
 2016-12-09 08:17:51 +01:00
Marc Alexander
bc6ce4c4af Merge branch '3.2.x' 2016-12-06 15:18:02 +01:00
Marc Alexander
e5504b74f0 [ticket/14892] Revert to twig 1.24 to have working assets again 
Twig 1.25 and after introduced a way of handling both relative and
absolute paths. However, it seems to handle absolute windows paths as
relative paths. This breaks any assets or similar ways of including files
into the main template files.

PHPBB3-14892
 2016-12-06 14:42:14 +01:00
Tristan Darricau
fd6de052ef
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14867] Revert back to twig 1.26.* and update dependencies
 2016-11-24 14:23:24 +01:00
Marc Alexander
a96fc3d87f
[ticket/14867] Revert back to twig 1.26.* and update dependencies 
The revert of twig back to 1.26.* is necessary due to a breaking
change in the way the Filesystem loader returns the paths to
template files.

PHPBB3-14867
 2016-11-16 21:39:29 +01:00
Tristan Darricau
462fb7b296
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14716] Update dependencies to latest versions
 2016-11-14 21:36:34 +01:00
Marc Alexander
4d07f8a134
[ticket/14716] Update dependencies to latest versions 
This addresses some issues with symfony that resulted in
issues when open_basedir restrictions were enabled, as well
as issues with JPEG images in fast-image-size.
The phpBB class extending the twig lexer also had to be
modified to ensure compatibility after BC was broken by
the PR https://github.com/twigphp/Twig/pull/2182 for twig
1.27.

PHPBB3-14716
 2016-11-03 21:36:12 +01:00
Máté Bartus
65d09b1dce Merge branch '3.2.x' 2016-11-02 10:02:09 +01:00
JoshyPHP
33f1934b72 [ticket/14846] Updated s9e\TextFormatter 
PHPBB3-14846
 2016-11-02 09:19:35 +01:00
Marc Alexander
8f4ea4c495
Merge branch '3.2.x' 2016-10-10 21:39:21 +02:00
Tristan Darricau
b2711371f1
[ticket/14807] s9e/textformatter 0.8.1 
PHPBB3-14807
 2016-10-10 20:07:33 +02:00
Tristan Darricau
1100db7e86
[ticket/14807] Updates paragonie/random_compat 
PHPBB3-14807
 2016-10-09 22:03:50 +02:00
Tristan Darricau
4c60995d7a
[ticket/14807] Updates everything else 
PHPBB3-14807
 2016-10-02 19:40:49 +02:00
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