makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 02:18:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
31395 commits 18 branches 192 tags 209 MiB
Commit graph

121 commits

Author SHA1 Message Date
Marc Alexander
009ae0dfac
Merge pull request #4966 from VSEphpbb/ticket/15369 
[ticket/15369] Update composer
 2018-02-17 16:31:53 +01:00
Marc Alexander
2113e998d1
Merge branch '3.2.x' 2018-01-24 18:12:21 +01:00
Matt Friedman
2d8b856a63 [ticket/15525] Update to valid SPDX license name GPL-2.0-only 
PHPBB3-15525
 2018-01-20 09:52:14 -08:00
Matt Friedman
a6b45ff0fd [ticket/15369] Update composer to 1.6.x 
PHPBB3-15369
 2018-01-06 09:36:16 -08:00
Matt Friedman
3c143e7ae8 [ticket/15369] Update composer to 1.5 
PHPBB3-15369
 2018-01-02 12:27:41 -08:00
Marc Alexander
1656ca4011
Merge branch '3.2.x' 2017-12-27 18:16:29 +01:00
JoshyPHP
b9dce3fa65 [ticket/15457] Updated s9e/text-formatter dependency 
PHPBB3-15457
 2017-12-10 02:55:10 +01:00
Tristan Darricau
c6bf129ee4
[ticket/15357] Requires composer/installers in phpBB core for extensions 
PHPBB3-15357
 2017-09-10 11:03:31 +02:00
Tristan Darricau
c59ef8bd2f
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15304] Update s9e/text-formatter dependency
 2017-08-06 11:52:08 +02:00
JoshyPHP
5b67939e6a [ticket/15304] Update s9e/text-formatter dependency 
https://github.com/s9e/TextFormatter/releases/tag/0.11.0

PHPBB3-15304
 2017-08-05 18:28:09 +02:00
rxu
07c6e821d5 [ticket/14972] Bump PHP requirements to 5.6. Update dependencies. 
Also bump to PHP 7.2 compatible versions: PHPUnit to 5.7, Guzzle to 6.3.

PHPBB3-14972
 2017-07-17 16:56:53 +07:00
Marc Alexander
f101532c09
Merge branch '3.2.x' 2017-07-16 21:42:30 +02:00
JoshyPHP
329e5c5e05 [ticket/15261] Fix censoring HTML tags 
PHPBB3-15261
 2017-07-03 16:06:50 +02:00
Marc Alexander
a44f31ec42
Merge branch '3.2.x' 2017-06-11 19:09:02 +02:00
Marc Alexander
a079c5fed0
Merge branch 'ticket/15178' into ticket/15179 2017-05-31 20:20:43 +02:00
Tristan Darricau
fbf11d61aa
[ticket/11150] Updates deps + fix various issues 
PHPBB3-11150
 2017-04-23 21:01:14 +02:00
Tristan Darricau
fbb85e2f4f
[ticket/11150] Add ability to manage extensions through composer 
PHPBB3-11150
 2017-04-23 21:01:01 +02:00
Marc Alexander
3dd1f9e707
[ticket/15178] Update dependencies for 3.1.x 
PHPBB3-15178
 2017-04-17 12:40:09 +02:00
Matt Friedman
c6321fc61b [ticket/15153] Update to newer homestead for vagrant 
PHPBB3-15153
 2017-03-26 16:31:59 -07: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
Marc Alexander
8f4ea4c495
Merge branch '3.2.x' 2016-10-10 21:39:21 +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
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
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
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
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
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
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
5ee559d524 [ticket/14448] Update composer.json and lock file for guzzlehttp 
PHPBB3-14448
 2016-02-03 11:30:44 +01:00
Scott Dutton
cec63974c3 [ticket/14431] Remote avatar uploading 
replace the 3.1 way with guzzle
Adds guzzle as a dependency
Removed a test as it wont wont with guzzle (as far as I know)

PHPBB3-14431
 2016-02-03 11:24:47 +01:00