makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
31686 commits 18 branches 192 tags 206 MiB
Commit graph

186 commits

Author SHA1 Message Date
JoshyPHP
eb11c80b23 [ticket/13921] Fix block BBCodes inside of inline BBCodes 
PHPBB3-13921
 2015-06-13 14:27:12 +02: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
JoshyPHP
ebda279bea [ticket/11742] Updated s9e\TextFormatter 
PHPBB3-11742
 2015-05-23 19:17:55 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
JoshyPHP
e67c5850e4 [ticket/11530] Updated s9e\TextFormatter 
PHPBB3-11530
 2015-05-18 06:49:53 +02:00
Tristan Darricau
734b89e75c Merge pull request #3524 from marc1706/ticket/8672 
[ticket/8672] Add class for retrieving imagesize without download
 2015-04-27 16:26:40 +02:00
JoshyPHP
572a905c02 [ticket/12745] Updated s9e\TextFormatter 
PHPBB3-12745
 2015-04-25 23:42:54 +02:00
Marc Alexander
9088f44863 [ticket/8672] Update hash of lock file 
PHPBB3-8672
 2015-04-24 13:39:15 +02:00
Marc Alexander
2665e68592 [ticket/8672] Update fastImageSize to 1.0.2 
PHPBB3-8672
 2015-04-24 13:33:16 +02:00
Marc Alexander
0a6ac0226d [ticket/8672] Update fastImageSize to 1.0.1 
PHPBB3-8672
 2015-04-24 13:33:15 +02:00
Marc Alexander
3fc7a352ff [ticket/8672] Add fast-image-size library to composer.json 
PHPBB3-8672
 2015-04-24 13:33:13 +02:00
JoshyPHP
72596429bd [ticket/13774] Updated s9e\TextFormatter 
PHPBB3-13774
 2015-04-22 22:35:47 +02:00
Tristan Darricau
9939ced81f [ticket/13768] Update to symfony 2.8.*@dev 
PHPBB3-13768
 2015-04-19 17:33:06 +02:00
JoshyPHP
4e80565fe7 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
09c19718c0 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
c1bc05a860 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
c891881321 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
5b2d3fddfd [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
3cd5ca8de1 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
8971805e57 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
709d502332 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:03 +02:00
JoshyPHP
1a133d5487 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:02 +02:00
JoshyPHP
aed9ece1bc [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:02 +02:00
JoshyPHP
f721b85a78 [ticket/11768] Replaced the Censor plugin 
...with something that is run at rendering time.

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
42c1297345 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
f6e3e41717 [ticket/11768] Added support for magic links that start with "www." 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
cfbf02bcba [ticket/11768] Re-added the code that got lost in rebase 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
d779ae340a [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
261f7eec9c [ticket/11768] Updated composer.lock 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
147a713cc0 [ticket/11768] This commit integrates s9e\TextFormatter 
This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
Nicofuma
e323c7c23a [ticket/13407] Update composer.lock file 
PHPBB3-13407
 2015-02-04 17:48:10 +01:00
Nicofuma
9e104b0915 [ticket/13407] Update Symfony to 2.7.*@dev 
PHPBB3-13407
 2015-02-04 17:40:06 +01:00
Nicofuma
199e7cf5a1 [ticket/13139] Update Twig to 1.8.0 
PHPBB3-13139
 2015-02-03 13:34:59 +01:00
Tristan Darricau
e1f983d3cf [ticket/13139] Update Twig to 1.16.2 
PHPBB3-13139
 2015-02-03 13:34:53 +01:00
Tristan Darricau
f81d8c53fc [ticket/13063] Adds Twig routing extension 
PHPBB3-13063
 2014-11-20 16:09:44 +01:00
Tristan Darricau
9b4c284102 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
 2014-11-11 15:30:15 +01:00
Tristan Darricau
cd6085ebdc Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
 2014-11-11 15:29:58 +01:00
Andreas Fischer
d266c7ae26 [develop] Update / Fix composer.lock hash. 2014-11-11 13:59:16 +01:00
Andreas Fischer
9bd24e2efb [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. 
PHPBB3-13324
 2014-11-11 12:23:02 +01:00
Nicolas Grekas
5a7caf6508 [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback 2014-11-08 11:36:13 +01:00
Andreas Fischer
ad06f6dd71 [ticket/13215] Update Symfony components to v2.3.21. 
PHPBB3-13215
 2014-10-25 21:29:45 +02:00
Tristan Darricau
03a1c7ed2e [ticket/13130] Updates dependencies to Symfony 2.5 
PHPBB3-13130
 2014-10-04 21:16:12 +02:00
Andreas Fischer
a3c63f6c03 [ticket/13032] Also update symfony/css-selector and pin it down. 
PHPBB3-13032
 2014-09-03 21:47:41 +02:00
Andreas Fischer
65577ed422 [ticket/13032] Update Symfony Components to 2.3.19 
PHPBB3-13032
 2014-09-03 21:40:38 +02:00
Dhruv
dd8adb5d6e [ticket/11528] Revert Mink changes 
PHPBB3-11528
 2014-08-09 17:18:33 +02:00
Nils Adermann
b9fb4e3050 [ticket/12920] Update composer.lock file after update nothing 
PHPBB3-12920
 2014-08-07 15:43:44 +02:00
Dhruv
b4e8e9e29f [ticket/12788] Force 2.3.* on symfony dependencies 
PHPBB3-12788
 2014-07-03 20:50:06 +05:30
Dhruv
0190d1b207 [ticket/12788] Update symfony components 
PHPBB3-12788
 2014-06-30 22:04:29 +05:30
Dhruv
0ebf6011b7 [ticket/11528] Add behat/mink and mink-goutte-driver as dependency 
PHPBB3-11528
 2014-06-23 01:26:02 +05:30
Andreas Fischer
9cea96ad4e Merge branch 'task/sami' into task/sami-ascraeus 
* task/sami:
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2014-05-16 18:13:45 +02:00