Commit Graph

4391 Commits

Author SHA1 Message Date
Robbie Averill 0f2902267e
Merge pull request #125 from creative-commoners/pulls/3.7/php-7.4-builds
Update Travis config to include PHP 7.4 build (3.x)
2020-02-27 13:51:27 +11:00
Garion Herman 6dbe75ce1e Update Travis config to include PHP 7.4 build
Also bump tested minor release branch to 3.7
2020-02-27 14:31:24 +13:00
Garion Herman 30a6b9be90 Upgrade Travis config to trusty, remove PHP 5.3 build
Can't adopt Xenial by default as it doesn't include earlier PHP versions
2020-02-27 14:30:30 +13:00
Damian Mooyman 94eace4f45 Remove obsolete branch-alias 2018-06-08 12:19:36 +12:00
Daniel Hensby d0751f2a59
Update PHP restraints to match framework 2018-05-23 12:40:10 +01:00
Daniel Hensby 01fd709d74
Merge branch '3.6' into 3 2018-01-16 12:13:58 +00:00
Daniel Hensby 5ddb796d15
Merge branch '3.5' into 3.6 2018-01-16 12:01:55 +00:00
Damian Mooyman 6ac1dea913
Merge pull request #93 from dhensby/pulls/3.5/phpunit-loosen-constraint
Loosen PHPUnit constraints
2017-11-20 13:57:13 +13:00
Damian Mooyman e575bff1af
Merge pull request #94 from dhensby/pulls/3.5/remove-php7-test
Remove php7 test suite as its pointless
2017-11-20 13:56:54 +13:00
Daniel Hensby 14eeb10d31
Remove php7 test suite as its pointless 2017-11-17 12:07:34 +00:00
Daniel Hensby b406d8724f
Loosen PHPUnit constraints 2017-11-17 11:41:43 +00:00
Damian Mooyman ec40ffb2cf
Merge pull request #89 from dhensby/pulls/3.5/composer-autoload
Add composer autoloading support to 3.x
2017-11-02 11:42:04 +13:00
Daniel Hensby a548f0290e
Add composer autoloading support to 3.x 2017-10-25 18:44:03 +01:00
Daniel Hensby 6025de29cc
Merge branch '3.6' into 3 2017-07-26 10:45:27 +01:00
Daniel Hensby e8fef7ebdd
Merge branch '3.5' into 3.6 2017-07-26 10:45:00 +01:00
Daniel Hensby 28b79c88ff
Stay on travis precise for now 2017-07-26 10:43:43 +01:00
Daniel Hensby 76b59e7464
Merge branch '3.6' into 3 2017-06-27 13:17:31 +01:00
Ingo Schommer 19fa5355ce Merge pull request #76 from creative-commoners/pulls/3.6/add-php7-build
Add PHP 7.1 and SS 3.6 build to Travis configuration
2017-06-26 15:16:01 +12:00
Robbie Averill 83dae0fbac Add PHP 7.1 and SS 3.6 build to Travis configuration 2017-06-23 16:01:58 +12:00
Daniel Hensby 2aa6433357
Merge branch '3.6' into 3 2017-05-31 00:06:39 +01:00
Daniel Hensby 2e29bf27fe
Merge branch '3.5' into 3.6 2017-05-31 00:06:19 +01:00
Daniel Hensby c249173e48
Merge tag '3.6.0' into 3.6
Release 3.6.0
2017-05-31 00:06:19 +01:00
Daniel Hensby be44c5e7df
Merge branch '3.4' into 3.5 2017-05-31 00:05:59 +01:00
Daniel Hensby 63bbc0bae4
Merge tag '3.5.4' into 3.5
Release 3.5.4
2017-05-31 00:05:59 +01:00
Daniel Hensby d1764ffc08
Merge tag '3.4.6' into 3.4
Release 3.4.6
2017-05-31 00:05:32 +01:00
Daniel Hensby a0fc3aa86f
Merge remote-tracking branch 'security/3.5.4' into 3.6.0 2017-05-29 01:30:58 +01:00
Daniel Hensby c2e804ad72
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:04:35 +01:00
Daniel Hensby c927870432
Merge branch '3.3' into 3.4 2017-05-28 21:37:05 +00:00
Daniel Hensby 7172eecd08
Aliasing 3 as 3.7.x-dev 2017-04-21 16:13:40 +01:00
Loz Calver c1d2696514 Merge pull request #65 from sminnee/fix-php-req
FIX: Relax PHP version requirement.
2017-04-04 00:03:05 +01:00
Sam Minnee e5f51b14a3 FIX: Relax PHP version requirement.
PHP7 support for SS3 is currently under development and the safest 
approach is to fix this module first.
2017-04-04 10:58:52 +12:00
Daniel Hensby b10955d985
Merge branch '3.5' into 3 2016-11-28 14:14:09 +00:00
Daniel Hensby dcb8024158
Merge tag '3.5.0' into 3.5
Release 3.5.0
2016-11-28 14:13:29 +00:00
Daniel Hensby 9c5974a13b
Merge branch '3.4' into 3.5.0 2016-11-15 12:09:14 +00:00
Daniel Hensby da4aeda90e
Merge branch '3.3' into 3.4 2016-11-15 12:08:32 +00:00
Daniel Hensby 65e0b6ef35
Merge branch '3.2' into 3.3 2016-11-15 12:08:05 +00:00
Daniel Hensby 8e5462794d
Merge pull request #1 from silverstripe-security/patch/3.2/SS-2016-012 2016-11-15 12:07:00 +00:00
Damian Mooyman a0eda1edd1 Increment 3 alias to 3.6 2016-11-14 10:04:09 +13:00
Damian Mooyman 8f14b94433 Merge 3.4 into 3 2016-08-15 19:05:25 +12:00
Damian Mooyman 20f929ba8b Merge 3.3 into 3.4 2016-08-15 19:01:57 +12:00
Damian Mooyman 8395a55442 Merge 3.2 into 3.3 2016-08-15 18:47:45 +12:00
Damian Mooyman ac0d621d6f Merge 3.4.1 into 3.4 2016-08-15 18:37:56 +12:00
Damian Mooyman f92b83fc45 Merge 3.3.3 into 3.3 2016-08-15 18:36:18 +12:00
Damian Mooyman eb096e869f Merge 3.2.5 into 3.2 2016-08-15 18:35:03 +12:00
Daniel Hensby c1525c8ba6 [SS-2016-012] FIX Missing ACL check on ReportAdmin
This issue exposed reports to users able to guess the URL of a Report that they were not allowed to view the report
2016-08-15 15:54:47 +12:00
Daniel Hensby efa20d2da0 [SS-2016-012] FIX Missing ACL check on ReportAdmin
This issue exposed reports to users able to guess the URL of a Report that they were not allowed to view the report
2016-08-15 15:05:41 +12:00
Daniel Hensby cff2ea9a98 [SS-2016-012] FIX Missing ACL check on ReportAdmin
This issue exposed reports to users able to guess the URL of a Report that they were not allowed to view the report
2016-08-15 14:17:02 +12:00
Damian Mooyman a446714e5e Merge 3.4 into 3
# Conflicts:
#	composer.json
2016-08-05 19:15:26 +12:00
Damian Mooyman f17fad179f Merge 3.3 into 3.4
# Conflicts:
#	code/Report.php
2016-08-05 16:48:52 +12:00
Damian Mooyman 6c1f17da91 Remove obsolete alias 2016-07-28 14:34:38 +12:00