tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,358 Commits 23 Branches 189 Tags 16 MiB
Commit Graph

4358 Commits

Author SHA1 Message Date
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 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
Damian Mooyman fb3083688e Merge remote-tracking branch 'origin/3.2' into 3 
# Conflicts:
#	.travis.yml
#	composer.json
 2015-12-22 14:21:03 +13:00
Daniel Hensby ccb72a10c5 Merge pull request #25 from tractorcow/pulls/3/fix-tests 
BUG Fix regressions is SS_Report::canView
 2015-12-18 13:54:46 +00:00
Damian Mooyman 36241d52a0 BUG Fix regressions is SS_Report::canView 2015-12-18 11:41:34 +13:00
Damian Mooyman fc81b1f582 Merge pull request #14 from christopherdarling/patch-2 
FIX: SS_Report canView should check permissions
 2015-12-18 10:21:07 +13:00
Christopher Darling 5d0f833a39 FIX: SS_Report canView should check permissions 
... checks for ADMIN / CMS_ACCESS_ReportAdmin (from ReportAdmin)

fixes #13
 2015-12-17 12:27:54 +00:00
Damian Mooyman af2d51125c Merge pull request #23 from dhensby/pulls/travis-3.2 
fixing travis config
 2015-12-17 10:00:39 +13:00
Damian Mooyman 7b245c6df9 Merge pull request #22 from dhensby/pulls/travis-fix 
Added standard Travis config
 2015-12-17 09:59:57 +13:00
helpfulrobot 648b6bac40 Added standard Travis config 2015-12-16 11:54:58 +00:00
helpfulrobot 9f780b3eeb fixing travis config 2015-12-16 11:50:55 +00:00
Ingo Schommer 1580db4a9d Merge pull request #12 from silverstripe-labs/pulls/3.2/restore-deprecated-classes 
Restore deprecated reports
 2015-11-10 17:43:37 +13:00
Damian Mooyman 82eb191bf4 Restore deprecated reports 2015-11-10 17:16:21 +13:00
Damian Mooyman 1e665a59b1 Merge remote-tracking branch 'origin/3.2' into 3 2015-11-03 13:11:11 +13:00
Christopher Pitt 94c084714f Merge pull request #11 from silverstripe-labs/pulls/3.2/fix-tests 
FIX Tests for 3.2
 2015-11-03 12:34:52 +13:00
Damian Mooyman 358c294092 FIX Tests for 3.2 2015-11-03 11:35:31 +13:00
Damian Mooyman 0d736d0f3e Merge remote-tracking branch 'silverstripe-cms/3.1' into 3.2 
Conflicts:
	.gitignore
	.travis.yml
	README.md
	_config.php
	composer.json
	javascript/ReportAdmin.js
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss
 2015-11-03 11:11:58 +13:00
Will Rossiter d71c638e0d Merge pull request #8 from christopherdarling/patch-1 
FIX: HtmlEditorConfig should be using content_css
 2015-10-27 09:17:24 +13:00
Christopher Darling 70dedf26e2 FIX: HtmlEditorConfig should be using content_css 
as per https://github.com/silverstripe/silverstripe-framework/pull/4706
 2015-10-26 11:04:44 +00:00