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
Andreas Fischer
dde72c58b0
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* 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:39:51 +02:00
Andreas Fischer
5382552fc8
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
2015-05-03 14:40:50 +02:00
Joas Schilling
1ad09d9c8b
[prep-release-3.1.4] Increase version number to 3.1.4-RC2
2015-04-29 09:59:40 +02:00
Andreas Fischer
0f707ddb99
Merge branch '3.1.x'
...
* 3.1.x:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:43:46 +02:00
Andreas Fischer
62abead26d
Merge branch 'prep-release-3.1.4' into 3.1.x
...
* prep-release-3.1.4:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:42:39 +02:00
Andreas Fischer
969718fc91
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* prep-release-3.0.14:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
2015-04-28 21:40:23 +02:00
Andreas Fischer
6d8df7332c
[3.0.x] Increment version number to 3.0.15-dev.
2015-04-28 20:40:20 +02:00
Andreas Fischer
ce74a0bd6c
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
2015-04-27 23:22:44 +02:00
JoshyPHP
14333f6ebc
[ticket/13767] Remove vendor/s9e/text-formatter/.git during build
...
PHPBB3-13767
2015-04-19 13:54:21 +02:00
Joas Schilling
a151ad912a
[3.1.x] Update development version to 3.1.5-dev
2015-04-10 09:56:20 +02:00
Joas Schilling
313a224c68
Update version to 3.1.4-RC1
2015-04-09 20:26:12 +02:00
Marc Alexander
8793d2f2c8
[ticket/13619] Remove unneeded files and folders from vendor in release package
...
PHPBB3-13619
2015-02-15 14:52:12 +01:00
Nicofuma
9e104b0915
[ticket/13407] Update Symfony to 2.7.*@dev
...
PHPBB3-13407
2015-02-04 17:40:06 +01:00
Joas Schilling
6e2838a4ca
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
build/build.xml
2015-02-01 20:24:32 +01:00
