fc81b1f582
Merge pull request #14 from christopherdarling/patch-2
...
FIX: SS_Report canView should check permissions
2015-12-18 10:21:07 +13:00
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
af2d51125c
Merge pull request #23 from dhensby/pulls/travis-3.2
...
fixing travis config
2015-12-17 10:00:39 +13:00
7b245c6df9
Merge pull request #22 from dhensby/pulls/travis-fix
...
Added standard Travis config
2015-12-17 09:59:57 +13:00
648b6bac40
Added standard Travis config
2015-12-16 11:54:58 +00:00
9f780b3eeb
fixing travis config
2015-12-16 11:50:55 +00:00
49e1631066
Merge pull request #21 from helpfulrobot/convert-to-psr-2
...
Converted to PSR-2
2015-12-16 12:26:16 +13:00
ff0598f827
Merge pull request #20 from helpfulrobot/add-standard-scrutinizer-config
...
Added standard Scrutinizer config
2015-12-16 12:25:09 +13:00
8691a7d9b6
Merge pull request #18 from helpfulrobot/add-standard-editor-config
...
Added standard editor config
2015-12-16 12:22:35 +13:00
c6ce02bd33
Merge pull request #17 from helpfulrobot/add-standard-license
...
Added standard license
2015-12-16 12:22:18 +13:00
1024c16ffe
Merge pull request #16 from helpfulrobot/add-standard-git-attributes
...
Added standard git attributes
2015-12-16 12:21:52 +13:00
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
b16e1c6788
Added standard code of conduct
2015-12-16 11:07:23 +13:00
75ece1710c
Added standard git attributes
2015-12-16 11:07:17 +13:00
3014b3dbe3
Added standard license
2015-12-16 11:07:11 +13:00
26fb8d965a
Added standard editor config
2015-12-16 11:07:05 +13:00
1e2e65d279
Added standard Scrutinizer config
2015-12-16 11:06:51 +13:00
93fced94f1
Converted to PSR-2
2015-12-16 11:06:45 +13:00
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
82eb191bf4
Restore deprecated reports
2015-11-10 17:16:21 +13:00
a09795b3a2
Merge remote-tracking branch 'origin/3'
2015-11-03 13:18:09 +13:00
1e665a59b1
Merge remote-tracking branch 'origin/3.2' into 3
2015-11-03 13:11:11 +13:00
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
358c294092
FIX Tests for 3.2
2015-11-03 11:35:31 +13:00
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
d71c638e0d
Merge pull request #8 from christopherdarling/patch-1
...
FIX: HtmlEditorConfig should be using content_css
2015-10-27 09:17:24 +13:00
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
b302a9a9be
Merge pull request #1296 from patricknelson/issue-1294-errorpage-fatal-3.1
...
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-19 07:59:47 +13:00
ff6c0a3160
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-08 17:48:31 -04:00
0df0f35278
Update translations
2015-09-18 14:21:19 +12:00
6e72bd2cf8
Update translations
2015-09-15 10:51:27 +12:00
ce212972c8
Update translations
2015-09-15 10:42:32 +12:00
105b3c60d1
Update translations
2015-09-15 10:33:25 +12:00
353e5938de
Update translations
2015-09-02 11:15:52 +12:00
a382dd1cfc
Merge pull request #1269 from sminnee/travis-disable-irc
...
MINOR: Remove IRC notifications of travis builds.
2015-08-25 09:07:20 +01:00
8a3e84ba1c
MINOR: Remove IRC notifications of travis builds.
...
Companion to https://github.com/silverstripe/silverstripe-framework/pull/4535
2015-08-25 18:12:22 +12:00
4db4db05af
Merge pull request #1263 from ss23/fix_812_oldpageredirector
...
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
2015-08-21 17:26:09 +12:00
b87f5473d9
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
...
Previously, we would be limited by the way allParams will return 3 parameters
at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
e5a4cdb302
Merge pull request #1261 from dhensby/pulls/remove-nightly
...
Removing hhvm-nightly as its not supported on travis
2015-08-18 10:07:16 +12:00
4039805ac2
Removing hhvm-nightly as its not supported on travis
2015-08-17 16:53:42 +01:00
718503edb1
Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
...
* antons--773-nested-virtual-pages-allowed_children:
Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
c6684559f6
Issue #773 - $allowed_children not allowing nested virtual pages
...
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
0759392980
Merge pull request #2 from sunnysideup/master
...
adding counts to report links
2015-07-22 13:23:52 +01:00
324da5fff4
Merge pull request #4 from jedateach/patch-1
...
Added note about visibility of reports
2015-07-22 13:22:39 +01:00
435ccb79c5
Merge pull request #7 from spekulatius/patch-1
...
fixing typo
2015-07-22 13:21:54 +01:00
5663bd2116
fixing typo
2015-07-22 21:53:55 +12:00
3f7bbeac65
Move to new travis containerised infrastructure
2015-07-20 16:05:32 +01:00
2408c16b0a
Move to new travis containerised infrastructure
2015-07-20 15:54:56 +01:00
740dbbfb99
Merge branch '3'
...
Conflicts:
composer.json
2015-07-20 15:39:40 +01:00
c56b92a4c3
Merge branch '3.2' into 3
2015-07-20 15:37:49 +01:00
Damian Mooyman
Christopher Darling
helpfulrobot
Ingo Schommer
Christopher Pitt
Will Rossiter
Patrick Nelson
Damian Mooyman
Damian Mooyman
Loz Calver
Sam Minnee
Stephen Shkardoon
Sean Harvey
Daniel Hensby
Loz Calver
Anton Smith
Daniel Hensby
Peter Thaleikis