Marc Alexander
8d58d1814f
Merge branch '3.2.x'
2017-01-07 17:08:30 +01:00
Marc Alexander
da8ec61ab2
[prep-release-3.2.0] Update version numbers and add 3.2.0 migration
2017-01-07 11:48:15 +01:00
Marc Alexander
cff3dbf00e
[3.2.x] Update version numbers to 3.2.0-RC3-dev
2016-12-10 00:32:41 +01:00
Marc Alexander
86257feb33
Merge branch '3.2.x'
2016-12-10 00:30:07 +01:00
Marc Alexander
185bda094b
[prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2
2016-12-09 20:50:48 +01:00
Tristan Darricau
c36ac7703a
Merge branch '3.2.x'
...
* 3.2.x: (47 commits)
[ticket/14492] Add user service to installer & only instantiate if needed
[ticket/14492] Fix redirection to help phpBB page
[ticket/14492] Encode URI components in systemdata for stats
[ticket/14492] Always update the time the stats were sent
[ticket/14492] Update versions in files
[ticket/14492] Add missing event variable
[ticket/14492] Don't explicitly pass data providers by refs
[ticket/14492] Update phpBB version and fix miscellaneous code issues
[ticket/14492] Install all extensions if 'all' is specified for extensions
[ticket/14492] Checkout master if viglink tag does not exist for latest version
[ticket/14492] Add language variables for updating extensions
[ticket/14492] Prevent timeouts in install & update extensions tasks
[ticket/14492] Use same list for checking if extension should be updated
[ticket/14492] Add missing config to schema_data.sql
[ticket/14492] Unify version check for installing default extensions
[ticket/14492] Use extension manager instead of finder and add try/catch
[ticket/14492] Checkout viglink for each version depending on tags
[ticket/14492] Remove unused use statement
[ticket/14492] Redirect to help phpBB page after installation
[ticket/14492] Properly retrieve version updating from
...
2016-12-03 14:42:32 +01:00
Marc Alexander
b9c284d85b
[ticket/14492] Update phpBB version and fix miscellaneous code issues
...
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
9f3b151dab
[ticket/14492] Checkout master if viglink tag does not exist for latest version
...
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
88f197e67a
[ticket/14492] Checkout viglink for each version depending on tags
...
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
9525a64d64
[ticket/14492] Start working on the build script
...
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
47b6e7edf4
Merge branch '3.2.x'
2016-10-12 21:44:07 +02:00
Marc Alexander
84a8cf00ad
Merge branch '3.1.x' into 3.2.x
2016-10-12 21:43:35 +02:00
Marc Alexander
cb226f83be
[prep-release-3.1.10] Update version numbers for 3.1.10
2016-10-02 21:06:56 +01:00
Tristan Darricau
a0c508b926
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14805] Ignore platform requirements while building packages
2016-10-02 17:14:58 +02:00
Tristan Darricau
78333e300c
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14805] Ignore platform requirements while building packages
2016-10-02 17:14:52 +02:00
Marc Alexander
047c7375a5
[ticket/14805] Ignore platform requirements while building packages
...
PHPBB3-14805
2016-10-01 16:46:48 +01:00
Marc Alexander
51d830a6d3
[3.1.x] Increase version for 3.1.11 development
2016-09-24 21:39:47 +02:00
Marc Alexander
2f17757f4e
[prep-release-3.1.10] Update version to 3.1.10-RC1
2016-09-24 14:50:46 +02:00
Marc Alexander
d74e85ffd9
Merge branch '3.2.x'
2016-08-04 20:47:33 +02:00
Marc Alexander
c9ada4d201
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
build/build.xml
2016-08-04 20:45:42 +02:00
Oliver Schramm
6fd507f60d
[ticket/14731] Skip composer when exporting old versions
...
PHPBB3-14731
2016-08-04 04:29:01 +02:00
Andreas Fischer
a4f575c322
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14689] Build API docs for 3.2.x
2016-07-08 14:12:52 +02:00
Andreas Fischer
7f50c798e6
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14689] Build API docs for 3.2.x
2016-07-08 14:12:43 +02:00
Marc Alexander
2ec4855cba
[ticket/14689] Build API docs for 3.2.x
...
PHPBB3-14689
2016-07-07 19:25:26 +02:00
Tristan Darricau
fe9df5b76b
[Release 3.2.0-RC1] Restore versions in master
...
This reverts commit 37cf178c0c9ed787fd9db8bb33086b72950b8eee.
2016-06-27 21:59:53 +02:00
Tristan Darricau
37cf178c0c
[Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev
2016-06-27 21:58:31 +02:00
Tristan Darricau
2eb8a97f47
[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
2016-06-19 17:51:51 +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
fdcedb262f
[prep-release-3.1.9] Update version for 3.1.9 final
2016-04-16 12:13:36 +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
Tristan Darricau
96bdcedacd
[ticket/14598] Support vars docblock in sniffer
...
PHPBB3-14598
2016-04-12 22:26:57 +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
15e22af266
[prep-release-3.1.9] Update version to 3.1.9-RC1
2016-04-09 08:09:08 +02:00
Tristan Darricau
4070d1e06f
[ticket/13616] Uses a php 5.4 compatible version
...
PHPBB3-13616
2016-04-03 16:23:16 +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
9d7b6260bd
[release-3.2.0-b2] Update versions to 3.2.0-3-dev
2016-03-07 17:36:16 +01:00
Marc Alexander
8e6a21955a
[ticket/14500] Specify prevversion instead of duplicate newversion
...
PHPBB3-14500
2016-02-27 09:48:29 +01:00
Marc Alexander
f6fd819764
Merge pull request #4165 from Nicofuma/ticket/14457
...
[ticket/14457] Uses a random placeholder to inject css and js
2016-02-18 21:52:48 +01:00
Joas Schilling
ab6e0bbef9
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
build/build.xml
phpBB/composer.lock
2016-02-18 18:42:39 +01:00
Joas Schilling
fc66f00236
Merge branch 'prep-release-3.1.8' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2016-02-18 18:38:43 +01:00
Joas Schilling
6fc7fc1c75
Update version for final 3.1.8 release
2016-02-18 17:59:26 +01:00
Tristan Darricau
58359b1587
[ticket/14457] Replaces unique_id implementation by random_bytes()
...
PHPBB3-14457
2016-02-18 17:30:31 +01:00
Joas Schilling
17e21d5140
[3.1.x] Increase dev version for 3.1.9
2016-02-13 18:01:32 +01:00
Joas Schilling
3e8a62f309
[prep-release-3.1.8] Update version to 3.1.8-RC1
2016-02-13 14:52:57 +01:00
Tristan Darricau
c9e5d308f2
Merge pull request #4159 from marc1706/ticket/14448
...
[ticket/14448] Use guzzle for remote files uploading
* marc1706/ticket/14448:
[ticket/14448] Correctly pass verify setting if available
[ticket/14448] Let user decide if remote upload certs should be checked
[ticket/14448] Add new vendor files and dirs to clean task
[ticket/14448] Do not try to test remote upload timeout
[ticket/14448] Remove no longer needed guzzle 3.9.3
[ticket/14448] Use GuzzleHttp and try to verify certs
[ticket/14448] Update composer.json and lock file for guzzlehttp
[ticket/14431] Remote avatar uploading
[ticket/14431] Remote avatar uploading
2016-02-11 22:16:10 +01:00
Tristan Darricau
dab282e664
[release-3.2.0-b1] Update version to 3.2.0-b2-dev
2016-02-05 17:12:39 +01:00
Tristan Darricau
f80ec7e786
[prep-release-3.2.0-b1] Update version to 3.2.0-b1
2016-02-03 21:41:22 +01:00
Marc Alexander
9a5b2d5e66
[ticket/14448] Add new vendor files and dirs to clean task
...
PHPBB3-14448
2016-02-03 19:38:54 +01:00
Joas Schilling
7f7b09fdeb
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/acp/acp_bbcodes.php
2016-01-09 18:45:32 +01:00