Commit Graph

4375 Commits

Author SHA1 Message Date
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
Daniel Hensby
c6fdf440a6 Merge pull request #37 from tractorcow/pulls/3.3/fix-broken-links
BUG Fix incorrect url manipulation
2016-07-21 13:37:40 +01:00
Damian Mooyman
87477a1e01
BUG Fix incorrect url manipulation
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1183
2016-07-21 18:06:19 +12:00
Daniel Hensby
ca526b08c3
[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-07-14 16:57:16 +01:00
Will Rossiter
9c124f1d53 Merge pull request #32 from dhensby/pulls/3.4/fix-hardcoded-admin-url
FIX No longer hardcoding admin links
2016-06-10 08:40:05 +12:00
Daniel Hensby
3bb32eb013
FIX Tests need the DB 2016-06-09 14:25:01 +01:00
Daniel Hensby
68c4040299
FIX No longer hardcoding admin links 2016-06-09 13:40:29 +01:00
Damian Mooyman
68d9533542
Alias 3 as 3.5 2016-05-19 16:14:08 +12:00
Daniel Hensby
1d8f3b0c7c Merge pull request #30 from chillu/pulls/remove-triple-title
Remove triple report titles
2016-05-11 10:02:52 +01:00
Ingo Schommer
b63600c392 Remove triple report titles 2016-05-10 22:24:40 +12:00
Daniel Hensby
fe17073355
Merge branch '3.3' into 3 2016-04-26 02:30:18 +01:00
Daniel Hensby
b985ce0eba
Merge branch '3.2' into 3.3 2016-04-26 02:29:59 +01:00
Damian Mooyman
7eb6b21494 Merge pull request #29 from dhensby/pulls/3.2/fix-deps
Decouple from CMS module
2016-03-22 17:41:09 +13:00
Daniel Hensby
b1566f3e79 Decoupling from CMS module 2016-03-21 12:15:27 +00:00
Damian Mooyman
dfb7b4d29f Merge pull request #28 from dhensby/pulls/3.2/join-links-fix
FIX Bad joining of links in reports
2016-03-21 14:34:50 +13:00
Daniel Hensby
57cfe3c66a FIX Bad joining of links in reports 2016-03-18 11:03:26 +00:00
Damian Mooyman
59cff00bb7 Alias 3 branch as 3.4 2015-12-23 14:24:14 +13:00