Tristan Darricau
6949ee162d
erge branch 'prep-release-3.2.0-b2'
...
* prep-release-3.2.0-b2:
[prep-release-3.2.0-b2] Add schema.json
[prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
[prep-release-3.2.0-b2] Add migration for 3.2.0-b2
[prep-release-3.2.0-b2] Update version to 3.2.0-b2
2016-04-28 21:51:23 +02:00
Marc Alexander
682c44cee4
Merge branch '3.2.x'
2016-04-23 23:04:13 +02:00
Marc Alexander
ead261e6db
Merge pull request #4286 from VSEphpbb/ticket/14569
...
[ticket/14569] Extract CLI progress bar creation to a method
2016-04-23 23:04:05 +02:00
Joas Schilling
4b51590520
Merge branch '3.2.x'
2016-04-16 12:51:06 +02:00
Joas Schilling
29bb1ab72d
Merge branch '3.1.x' into 3.2.x
2016-04-16 12:50:31 +02:00
Joas Schilling
4cdec74e94
Merge branch 'prep-release-3.1.9' into 3.1.x
2016-04-16 12:48:56 +02:00
Joas Schilling
1b01667c7b
[prep-release-3.1.9] Add migration for 3.1.9
2016-04-16 12:16:23 +02:00
Joas Schilling
fdcedb262f
[prep-release-3.1.9] Update version for 3.1.9 final
2016-04-16 12:13:36 +02:00
Tristan Darricau
36c87313a4
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14589] Fix @var usage
2016-04-13 19:14:18 +02:00
Tristan Darricau
1b0b78dabc
Merge pull request #4289 from CHItA/ticket/14589
...
[ticket/14589] Fix @var usage
* CHItA/ticket/14589:
[ticket/14589] Fix @var usage
2016-04-13 19:13:25 +02:00
Tristan Darricau
3a028ef067
Merge pull request #4288 from CHItA/ticket/14601
...
[ticket/14601] Fix composer.lock
* CHItA/ticket/14601:
[ticket/14601] Fix composer.lock
2016-04-13 19:06:46 +02:00
Máté Bartus
4614cc972f
[ticket/14589] Fix @var usage
...
PHPBB3-14589
2016-04-13 19:02:43 +02:00
Máté Bartus
caf63ba86b
[ticket/14601] Fix composer.lock
...
PHPBB3-14601
2016-04-13 10:52:12 +02:00
Máté Bartus
3a44ac1690
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14598] Support vars docblock in sniffer
2016-04-13 10:20:39 +02:00
Máté Bartus
68645d38ef
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14598] Support vars docblock in sniffer
2016-04-13 10:20:07 +02:00
Máté Bartus
ed378a2ec3
Merge pull request #4287 from Nicofuma/ticket/14598
...
[ticket/14598] Support vars docblock in sniffer
2016-04-13 10:18:34 +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
Máté Bartus
4c257d47a6
Merge pull request #4236 from Nicofuma/ticket/13616
...
[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
2016-04-13 10:11:24 +02:00
Tristan Darricau
96bdcedacd
[ticket/14598] Support vars docblock in sniffer
...
PHPBB3-14598
2016-04-12 22:26:57 +02:00
Matt Friedman
d713ce94ff
[ticket/14569] Extract CLI progress bar creation to a method
...
PHPBB3-14569
2016-04-12 10:56:23 -07:00
Tristan Darricau
94853ba2dd
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14589] Fix grammatical errors in language strings
[ticket/14589] Add error messages for failable installer requirements
2016-04-12 11:27:03 +02:00
Tristan Darricau
560bee1be4
Merge pull request #4284 from CHItA/ticket/14589
...
[ticket/14589] Add error messages for failable installer requirements
* CHItA/ticket/14589:
[ticket/14589] Fix grammatical errors in language strings
[ticket/14589] Add error messages for failable installer requirements
2016-04-12 11:27:03 +02:00
Marc Alexander
ffcde0c95a
Merge branch '3.2.x'
2016-04-11 21:27:20 +02:00
Marc Alexander
336f5b49a7
Merge pull request #4285 from CHItA/ticket/14590
...
[ticket/14590] Prevent refresh requests after the last tasks in modules
2016-04-11 21:27:12 +02:00
Máté Bartus
972255247b
[ticket/14589] Fix grammatical errors in language strings
...
PHPBB3-14589
2016-04-11 19:42:40 +02:00
Máté Bartus
f41c7bd2b1
[ticket/14590] Prevent refresh requests after the last tasks in modules
...
PHPBB3-14590
2016-04-11 18:18:09 +02:00
Máté Bartus
9163cc2864
[ticket/14589] Add error messages for failable installer requirements
...
PHPBB3-14589
2016-04-10 10:30:15 +02:00
Joas Schilling
4a1d1dd6a5
Merge branch '3.2.x'
2016-04-09 19:53:57 +02:00
Joas Schilling
d89b75bd36
Merge branch '3.1.x' into 3.2.x
2016-04-09 19:53:39 +02:00
Joas Schilling
58dfff38fa
[3.1.x] Increase version for 3.1.10 development
2016-04-09 19:50:00 +02:00
Joas Schilling
c4ef83e4d2
Merge branch 'prep-release-3.1.9' into 3.1.x
2016-04-09 19:48:35 +02:00
Joas Schilling
e7043dc044
[prep-release-3.1.9] Add changelog for 3.1.9-RC1
2016-04-09 08:19:34 +02:00
Joas Schilling
5ee6c216e5
[prep-release-3.1.9] Add migration for 3.1.9-RC1
2016-04-09 08:13:31 +02:00
Joas Schilling
15e22af266
[prep-release-3.1.9] Update version to 3.1.9-RC1
2016-04-09 08:09:08 +02:00
Joas Schilling
c03d9d9acc
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14587] Remove sectionGroup from web.config
2016-04-08 16:35:18 +02:00
Joas Schilling
45a3e4d04f
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14587] Remove sectionGroup from web.config
2016-04-08 16:35:00 +02:00
Joas Schilling
2ae17d6caf
Merge pull request #4283 from DavidIQ/ticket/14587
...
[ticket/14587] Remove sectionGroup from web.config
* DavidIQ/ticket/14587:
[ticket/14587] Remove sectionGroup from web.config
2016-04-08 16:34:43 +02:00
David Colón
ebbedf29e0
[ticket/14587] Remove sectionGroup from web.config
...
Causes errors on some IIS installations.
PHPBB3-14587
2016-04-07 17:20:34 -04:00
Marc Alexander
662fbc7cde
Merge branch '3.2.x'
2016-04-07 21:59:44 +02:00
Marc Alexander
4e8981ee37
Merge branch '3.1.x' into 3.2.x
2016-04-07 21:59:36 +02:00
Marc Alexander
901f36e982
Merge pull request #4258 from Nicofuma/ticket/13683-3.2.x
...
[ticket/13683] Respects force_server_vars settings when generating URLs
2016-04-07 21:59:36 +02:00
Marc Alexander
9ad5c577f5
Merge pull request #4256 from Nicofuma/ticket/13683
...
[ticket/13683] Respects force_server_vars settings when generating URLs
2016-04-07 21:59:26 +02:00
Marc Alexander
76af1c608c
Merge branch '3.2.x'
2016-04-06 21:00:41 +02:00
Marc Alexander
c53eae7abc
Merge pull request #4280 from Nicofuma/ticket/14198
...
[ticket/14198] Use the build option to calculate the container cache filename
2016-04-06 21:00:36 +02:00
Marc Alexander
a6c90643fd
Merge branch '3.2.x'
2016-04-06 20:54:57 +02:00
Marc Alexander
cdc7f1722d
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/install/database_update.php
2016-04-06 20:54:35 +02:00
Marc Alexander
12f5c0405e
Merge pull request #4279 from RMcGirr83/ticket_14408
...
[ticket/14408] Remove span tags from file
2016-04-06 20:54:07 +02:00
Tristan Darricau
7bf8006b67
[ticket/14198] Use the build option to calculate the container cache filename
...
PHPBB3-14198
2016-04-04 21:32:46 +02:00
Richard McGirr
68eba86309
[ticket/14408] Remove span tags from file
...
PHPBB3-14408
2016-04-04 07:18:21 -04:00
Tristan Darricau
4ded3864cd
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14559] Remove attachment BBCode tags from the quoted message
2016-04-03 16:34:46 +02:00
