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 |
|
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 |
|
Damian Mooyman
|
49e1631066
|
Merge pull request #21 from helpfulrobot/convert-to-psr-2
Converted to PSR-2
|
2015-12-16 12:26:16 +13:00 |
|
Damian Mooyman
|
ff0598f827
|
Merge pull request #20 from helpfulrobot/add-standard-scrutinizer-config
Added standard Scrutinizer config
|
2015-12-16 12:25:09 +13:00 |
|
Damian Mooyman
|
8691a7d9b6
|
Merge pull request #18 from helpfulrobot/add-standard-editor-config
Added standard editor config
|
2015-12-16 12:22:35 +13:00 |
|
Damian Mooyman
|
c6ce02bd33
|
Merge pull request #17 from helpfulrobot/add-standard-license
Added standard license
|
2015-12-16 12:22:18 +13:00 |
|
Damian Mooyman
|
1024c16ffe
|
Merge pull request #16 from helpfulrobot/add-standard-git-attributes
Added standard git attributes
|
2015-12-16 12:21:52 +13:00 |
|
Damian Mooyman
|
891cb40654
|
Merge pull request #15 from helpfulrobot/add-standard-code-of-conduct
Added standard code of conduct
|
2015-12-16 12:21:04 +13:00 |
|
helpfulrobot
|
b16e1c6788
|
Added standard code of conduct
|
2015-12-16 11:07:23 +13:00 |
|
helpfulrobot
|
75ece1710c
|
Added standard git attributes
|
2015-12-16 11:07:17 +13:00 |
|
helpfulrobot
|
3014b3dbe3
|
Added standard license
|
2015-12-16 11:07:11 +13:00 |
|
helpfulrobot
|
26fb8d965a
|
Added standard editor config
|
2015-12-16 11:07:05 +13:00 |
|
helpfulrobot
|
1e2e65d279
|
Added standard Scrutinizer config
|
2015-12-16 11:06:51 +13:00 |
|
helpfulrobot
|
93fced94f1
|
Converted to PSR-2
|
2015-12-16 11:06:45 +13: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
|
a09795b3a2
|
Merge remote-tracking branch 'origin/3'
|
2015-11-03 13:18:09 +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 |
|