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
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
Joas Schilling
fd5e66cbf1
Merge branch 'prep-release-3.1.7' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2016-01-09 18:42:07 +01:00
Joas Schilling
89da4e8bf7
[prep-release-3.1.7] Update version to 3.1.7-pl1
2016-01-09 09:35:03 +01:00
Oliver Schramm
e738dad729
[ticket/14250] Review/bump dependencies
...
PHPBB3-14250
2016-01-04 03:33:42 +01:00
Tristan Darricau
554b90b59f
[release-3.2.0-a2] Update version to 3.2.0-a3
2015-12-19 17:34:46 +01:00
Tristan Darricau
6b09dbe16c
[prep-release-3.2.0-a2] Update version to 3.2.0-a2
2015-12-19 17:17:01 +01:00
Joas Schilling
9a814e21aa
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-12-19 14:23:12 +01:00
Joas Schilling
9af2dc0b6b
Merge branch 'prep-release-3.1.7' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-12-19 14:21:57 +01:00
Joas Schilling
4ec32592a4
[prep-release-3.1.7] Increase version to 3.1.7
2015-12-19 12:21:04 +01:00
Joas Schilling
1de3ede399
[3.1.x] Update version to 3.1.8-dev
2015-12-12 15:19:47 +01:00
Joas Schilling
d2acccf92c
[prep-release-3.1.7] Update version to 3.1.7-RC1
2015-12-12 01:31:31 +01:00
Tristan Darricau
8a3288e3aa
[master] Update version to 3.2.0-a2-dev
2015-11-23 23:20:04 +01:00
Tristan Darricau
f8236cc907
[prep-release-3.2.0-a1] Update version to 3.2.0-a1
2015-11-09 20:20:26 +01:00
Tristan Darricau
d64accd72c
[ticket/14243] Exclude every .git directory from the pakages
...
PHPBB3-14243
2015-10-17 18:50:14 +02:00
Tristan Darricau
e9f262611d
[ticket/14243] Exclude every .git directory from the pakages
...
PHPBB3-14243
2015-10-17 18:04:06 +02:00
Joas Schilling
fb3e9d9a77
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-09-05 15:20:38 +02:00
Joas Schilling
f201c22ca7
Merge branch 'prep-release-3.1.6' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-09-05 15:19:16 +02:00
Joas Schilling
82a45cd4da
[prep-release-3.1.6] Update version for final 3.1.6 release
2015-09-05 12:45:00 +02:00
Joas Schilling
335452b1c1
[3.1.x] Update version to 3.1.7-dev
2015-08-23 18:24:12 +02:00
Joas Schilling
819eca99a8
[prep-release-3.1.6] Update version to 3.1.6-RC1
2015-08-23 16:50:43 +02:00
Joas Schilling
2a662c5e07
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/phpbb/user.php
2015-06-14 17:40:18 +02:00
Joas Schilling
7ccb19fa00
Merge branch 'prep-release-3.1.5' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-06-14 17:38:04 +02:00
Joas Schilling
38a1442d40
[prep-release-3.1.5] Update version for final 3.1.5 release
2015-06-14 16:11:22 +02:00
Joas Schilling
9238d28353
[3.1.x] Update dev version to 3.1.6-RC1
2015-06-11 23:25:43 +02:00
Joas Schilling
a3883a6f23
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-06-11 21:00:04 +02:00
Joas Schilling
4276962e78
[3.1.x] Increase dev version to 3.1.6-dev
2015-06-11 20:57:26 +02:00
Joas Schilling
dfb7bb1de1
Merge branch '3.0.x' into prep-release-3.1.5
2015-06-10 22:23:34 +02:00
Tristan Darricau
cdf580ee37
[ticket/13823] Change diff options while packaging to not ignore all whitespaces
...
Removed:
-w, --ignore-all-space Ignore white space when comparing lines.
Added:
-Z, --ignore-trailing-space Ignore white space at line end.
-b, --ignore-space-change Ignore changes in the amount of white space.
PHPBB3-13823
2015-06-10 14:15:10 +02:00
Joas Schilling
d2a2c183ed
[prep-release-3.1.5] Update version to 3.1.5-RC1
2015-06-09 20:30:40 +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
Nils Adermann
01073ffcbf
Merge pull request #3560 from Nicofuma/ticket/13790
...
[ticket/13790] Update phpcs
2015-05-30 10:53:47 +02:00
Tristan Darricau
a462f14aa3
[ticket/13790] Update phpcs
...
PHPBB3-13790
2015-05-19 22:19:18 +02:00
Joas Schilling
36abb61d39
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-05-03 18:44:34 +02:00
Joas Schilling
f42a737419
Merge branch 'prep-release-3.1.4' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-05-03 18:44:01 +02:00
Joas Schilling
199d823f7a
[prep-release-3.1.4] Update version to 3.1.4
2015-05-03 17:07:35 +02:00
Andreas Fischer
9074738a10
Merge branch '3.1.x'
...
* 3.1.x:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
2015-05-03 16:45:10 +02:00
Andreas Fischer
cfeb2bec80
Merge branch 'prep-release-3.1.4' into 3.1.x
...
* prep-release-3.1.4:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
2015-05-03 16:43:32 +02:00
Andreas Fischer
52aafb4dea
Merge branch 'prep-release-3.0.14' into 3.0.x
...
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:41:58 +02:00
