Oliver Schramm
6fd507f60d
[ticket/14731] Skip composer when exporting old versions
...
PHPBB3-14731
2016-08-04 04:29:01 +02:00
Marc Alexander
2ec4855cba
[ticket/14689] Build API docs for 3.2.x
...
PHPBB3-14689
2016-07-07 19:25:26 +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
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
Marc Alexander
8e6a21955a
[ticket/14500] Specify prevversion instead of duplicate newversion
...
PHPBB3-14500
2016-02-27 09:48:29 +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
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
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
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
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
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
7bb617eeb6
Merge branch 'prep-release-3.1.5' into 3.1.x
2015-06-11 23:24:02 +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
Marc Alexander
d4e0c08915
[ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
...
PHPBB3-13930
2015-06-08 13:40:33 +02:00
Marc Alexander
d70ad1230b
[ticket/13930] Remove not needed return statements
...
PHPBB3-13930
2015-06-08 10:07:12 +02:00
Marc Alexander
6687b7e9ab
[ticket/13930] Check for correct spacing between keyword & parenthesis
...
The codesniffer should check for a correct spacing between keywords like
if or foreach and its opening parenthesis.
PHPBB3-13930
2015-06-07 22:51:33 +02:00
Oliver Schramm
049f584111
Merge pull request #3638 from naderman/ticket/13874
...
[ticket/13874] Add master to sami API docs
2015-05-30 12:54:27 +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
Nils Adermann
d589142c0b
[ticket/13874] Add master to sami API docs
...
PHPBB3-13874
2015-05-28 13:19:52 +02:00
Tristan Darricau
a462f14aa3
[ticket/13790] Update phpcs
...
PHPBB3-13790
2015-05-19 22:19:18 +02:00
Joas Schilling
e52bc2d022
Merge pull request #3606 from Nicofuma/ticket/13838
...
[ticket/13838] Check braces for control structures
2015-05-16 13:39:45 +02:00
Nicofuma
3bc2b54128
[ticket/13830] Fix unsused used statements and catch blocks
...
PHPBB3-13830
2015-05-14 16:02:05 +02:00
Nicofuma
62e13e945c
[ticket/13838] Fix coding style
...
PHPBB3-13838
2015-05-14 15:43:44 +02:00
Nicofuma
e4b30c474b
[ticket/13838] Check braces for control structures
...
PHPBB3-13838
2015-05-14 15:40:52 +02:00
Nicofuma
084aa56777
[ticket/13830] Check class used in catch statements
...
PHPBB3-13830
2015-05-10 21:13:36 +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
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
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
