mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00
Code Issues Releases Wiki Activity
25,502 Commits 17 Branches 190 Tags
Commit Graph

69 Commits

Author SHA1 Message Date
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
Andreas Fischer
b32f91b9c6 [task/sami] Add sami/sami as a composer development dependency. 
PHPBB3-12495
 2014-05-16 17:55:41 +02:00
Andreas Fischer
0cee35aeef Merge branch 'ticket/12429' into ticket/12429-develop 
* ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2014-05-02 20:28:58 +02:00
Andreas Fischer
30dc3afb69 [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3. 
PHPBB3-12429
 2014-05-02 20:19:10 +02:00
Andreas Fischer
92d82e80cb [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12. 
PHPBB3-12424
 2014-04-20 16:48:26 +02:00
Andreas Fischer
22210d3dc4 [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2. 
PHPBB3-12423
 2014-04-20 16:46:37 +02:00
Andreas Fischer
edfc48a71c [ticket/11998] Add symfony/console as dependency. 
PHPBB3-11998
 2013-11-03 01:52:40 +01:00
Andreas Fischer
c82979a472 [task/code-sniffer] Add PHP CodeSniffer dependency to composer. 
PHPBB3-11980
 2013-10-27 17:42:58 +01:00
Nathan Guse
b8bb16f8e7 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 
* remotes/upstream/develop-olympus:
  [ticket/11831] getAttribute was replaced with attr
  [ticket/11831] Update fabpot/goutte to 1.0.*

Conflicts:
	phpBB/composer.lock
 2013-09-13 15:56:28 -05:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
 2013-09-06 20:35:54 -04:00
Nathan
b7eca27f2a [ticket/11831] Update fabpot/goutte to 1.0.* 
PHPBB3-11831
 2013-09-06 12:28:46 -05:00
Nathan Guse
fe6688ff49 [ticket/11818] Update Symfony dependencies to 2.3.* 
PHPBB3-11818
 2013-09-02 16:23:05 -05:00
Joseph Warner
d04def0558 [feature/oauth] Update lusitanian/oauth to stable branch 
PHPBB3-11673
 2013-09-02 16:03:59 -04:00
Joseph Warner
3254f7c02b [feature/oauth] Include OAuth library in composer.json 
PHPBB3-11673
 2013-07-14 14:22:42 -04:00
Nathaniel Guse
fd10d97cb1 Merge branch 'develop-olympus' into develop 
# By Igor Wiedler (1) and others
* develop-olympus:
  [ticket/11671] Update composer.lock
  [ticket/11671] Add phing as a dependency and upgrade deps
  [ticket/11668] Move lint test to the end for travis

Conflicts:
	phpBB/composer.lock
 2013-07-13 10:28:02 -05:00
Nathaniel Guse
7b0a6ef06c [ticket/11671] Update composer.lock 
PHPBB3-11671
 2013-07-13 09:20:18 -05:00
Nathaniel Guse
678cccfb04 [ticket/11671] Update composer.lock 
PHPBB3-11671
 2013-07-13 09:14:22 -05:00
Nils Adermann
97f633bced [ticket/11671] Add phing as a dependency and upgrade deps 
PHPBB3-11671
 2013-07-12 16:47:08 -04:00