tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity
4,741 Commits 24 Branches 193 Tags 16 MiB
61ecdb74e7
Commit Graph

4741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
5953957881 API Update for SilverStripe\CMS namespace 
Remove unused reports
 2016-08-08 18:14:06 +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
Hamish Friedlander
77a696ecdd Merge pull request #36 from open-sausages/features/4.0/gridfield-styles 
Class change for new gridfield styles, moved report actions to appear above gridfield
 2016-08-04 11:54:19 +12:00
Damian Mooyman
c54b8b5a6c Fix link formatting 2016-08-01 16:51:21 +12:00
Damian Mooyman
d2142f252e Fix psr-2 formatting 2016-08-01 16:51:21 +12:00
Paul Clarke
f04975c64e Remove additional title and move actions to top 2016-08-01 16:47:38 +12:00
Paul Clarke
9fdf236611 Add new styling for links in gridfield 2016-08-01 16:47:08 +12:00
Hamish Friedlander
2502118a21 Merge pull request #40 from open-sausages/pulls/4.0/fix-form-actions 
BUG Fix broken form actions on parent and nested gridfields
 2016-08-01 16:40:20 +12:00
Damian Mooyman
9d31bb0542 BUG Fix broken form actions on parent and nested gridfields 2016-08-01 16:35:37 +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
8a5741aa00 Merge pull request #39 from dhensby/pulls/4/admin-url-fix 
FIX Use new admin_url
 2016-07-19 14:48:22 +01:00
Daniel Hensby
761cbf0dc2
FIX Use new admin_url 2016-07-18 13:06:49 +01:00
Daniel Hensby
c876a21669
Merge branch '3' 2016-07-18 13:02:20 +01: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
Damian Mooyman
2d47fed75d Fix ReportAdmin::Link() not returning correct home url (#38) 2016-07-14 17:51:20 +12:00
Damian Mooyman
39b6d12969 API Apply SilverStripe\Security namespace (#35) 2016-07-07 13:43:27 +12:00
Ingo Schommer
c4cdeda7dc Merge pull request #33 from open-sausages/pulls/4.0/namespace-orm 
API Apply SilverStripe\ORM namespace
 2016-07-01 15:09:24 +12:00
Will Rossiter
6c31b23b2d Merge pull request #34 from mikenz/patch-1 
ReportTest needs the database
 2016-06-24 19:36:37 +12:00
Mike Cochrane
0a2c248e6b ReportTest needs the database 
ReportTest needs the database, if run in isolation these tests will fail.
 2016-06-24 18:43:35 +12:00
Damian Mooyman
ab81961115
API Apply SilverStripe\ORM namespace 2016-06-23 17:32:58 +12: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
Daniel Hensby
1890c208e3 Merge pull request #31 from silverstripe-labs/copyright-in-contributingmd 
Create CONTRIBUTING.md
 2016-05-31 13:58:33 +01:00
Sam Minnée
36298ee8c1 Create CONTRIBUTING.md 
New contribution guide to mathc https://github.com/silverstripe/silverstripe-framework/pull/5610
 2016-05-30 14:37:53 +12: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
a39515357d
Merge branch '3' 2016-04-26 02:32:15 +01: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
94faf34266 Merge pull request #27 from chillu/pulls/fix-phpunit-dependency 
Require-dev for PHPUnit
 2016-03-07 20:46:20 +13:00
Ingo Schommer
3c6c4b33db Require-dev for PHPUnit 
If not set, it breaks the root composer.json generation in travis-support, since it falls back to PHPUnit 3.7.
See https://github.com/silverstripe-labs/silverstripe-travis-support/blob/master/src/ComposerGenerator.php

See d9e292ba28
for same fix on cms module.
 2016-03-07 20:41:05 +13:00
Damian Mooyman
d031f53e73 Fix incorrect version dependency 2016-01-25 16:59:20 +13:00
Damian Mooyman
f777f36c68 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	code/Report.php
#	composer.json
#	tests/ReportTest.php
 2016-01-25 16:20:10 +13:00
Damian Mooyman
e7ed9b2a77 Merge pull request #26 from helpfulrobot/update-license-year 
Updated license year
 2016-01-05 09:50:15 +13:00
helpfulrobot
32b39916d2 Updated license year 2016-01-01 06:36:21 +13: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