Build: #4166 was successful
Job: Build and Test Job was successful
Code commits
phpBB Ascraeus
-
Andreas Fischer <bantu@phpbb.com> a737eeb6cea2d494be4c8ae5e1101d1015746191
Merge pull request #3320 from marc1706/ticket/13534
[ticket/13534] Set imagick path to empty string to prevent failing path ...
* marc1706/ticket/13534:
[ticket/13534] Set imagick path to empty string to prevent failing path check -
Andreas Fischer <bantu@phpbb.com> 7ed065a630abab7ca1978e23eaa393130ed2c550
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[develop-olympus] Increment version number to 3.0.14-dev.
[develop-olympus] Add changelog for 3.0.13 release.
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.13 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 -
Marc 7d6fdcfaa597b96b97a82829d2491f1d2b284cb8
[ticket/13534] Set imagick path to empty string to prevent failing path check
The imagick path defaults to /usr/bin. If it doesn't exist for some reason,
for example on travis, the form won't be submitted and the settings won't be
changed.
PHPBB3-13534- tests/functional/fileupload_form_test.php (version 7d6fdcfaa597b96b97a82829d2491f1d2b284cb8)
-
Andreas Fischer <bantu@phpbb.com> 14585fcb4f1d6238a188089891a11895a557f99e
[develop-olympus] Increment version number to 3.0.14-dev.
- build/build.xml (version 14585fcb4f1d6238a188089891a11895a557f99e)
- phpBB/includes/constants.php (version 14585fcb4f1d6238a188089891a11895a557f99e)
- phpBB/install/database_update.php (version 14585fcb4f1d6238a188089891a11895a557f99e)
- phpBB/install/schemas/schema_data.sql (version 14585fcb4f1d6238a188089891a11895a557f99e)
-
Andreas Fischer <bantu@phpbb.com> 2c9e178a42dd3c096c693f2a18fd27620df83065
[develop-olympus] Add changelog for 3.0.13 release.
- phpBB/docs/CHANGELOG.html (version 2c9e178a42dd3c096c693f2a18fd27620df83065)
-
Andreas Fischer <bantu@phpbb.com> 9f7f366573bc117d429e0c044836455662c344ed
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
- build/build.xml (version 9f7f366573bc117d429e0c044836455662c344ed)
- phpBB/includes/constants.php (version 9f7f366573bc117d429e0c044836455662c344ed)
- phpBB/install/database_update.php (version 9f7f366573bc117d429e0c044836455662c344ed)
- phpBB/install/schemas/schema_data.sql (version 9f7f366573bc117d429e0c044836455662c344ed)
-
Andreas Fischer <bantu@phpbb.com> c09023d1db2e05798437d2e5120f6e8cbb1e6567
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
- phpBB/docs/INSTALL.html (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/install/convertors/convert_phpbb20.php (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/prosilver/imageset/imageset.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/prosilver/style.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/prosilver/template/template.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/prosilver/theme/theme.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/subsilver2/imageset/imageset.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/subsilver2/style.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/subsilver2/template/template.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
- phpBB/styles/subsilver2/theme/theme.cfg (version c09023d1db2e05798437d2e5120f6e8cbb1e6567)
