Daniel Hensby
68c4040299
FIX No longer hardcoding admin links
2016-06-09 13:40:29 +01: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
Damian Mooyman
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
Patrick Nelson
ff6c0a3160
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-08 17:48:31 -04:00
Damian Mooyman
0df0f35278
Update translations
2015-09-18 14:21:19 +12:00
Damian Mooyman
6e72bd2cf8
Update translations
2015-09-15 10:51:27 +12:00
Damian Mooyman
ce212972c8
Update translations
2015-09-15 10:42:32 +12:00
Damian Mooyman
105b3c60d1
Update translations
2015-09-15 10:33:25 +12:00
Damian Mooyman
353e5938de
Update translations
2015-09-02 11:15:52 +12:00
Loz Calver
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
Sam Minnee
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
Sam Minnée
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
Stephen Shkardoon
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
Sean Harvey
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
Daniel Hensby
4039805ac2
Removing hhvm-nightly as its not supported on travis
2015-08-17 16:53:42 +01:00
Loz Calver
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
Anton Smith
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
Daniel Hensby
435ccb79c5
Merge pull request #7 from spekulatius/patch-1
...
fixing typo
2015-07-22 13:21:54 +01:00
Peter Thaleikis
5663bd2116
fixing typo
2015-07-22 21:53:55 +12:00
Daniel Hensby
3f7bbeac65
Move to new travis containerised infrastructure
2015-07-20 16:05:32 +01:00
Daniel Hensby
2408c16b0a
Move to new travis containerised infrastructure
2015-07-20 15:54:56 +01:00
Damian Mooyman
8bb09086fe
Merge pull request #1246 from chillu/pulls/fix-behat-image-hotlink
...
Behat tests hotlinking to non-existant image
2015-07-20 19:39:12 +12:00
Ingo Schommer
ce85764292
Behat tests hotlinking to non-existant image
...
Caused by silverstripe.com redesign. Ideally we'd
have a permanent asset hosted there which is clearly marked as a test dependency.
Or create a placeholder for images linked served localhost within the Behat tests,
in which case we wouldn't require a network connection to execute Behat.
2015-07-18 15:38:44 +12:00
Ingo Schommer
d5043ed5c8
Merge pull request #1245 from torleif/patch-2
...
Update CONTRIBUTING.md
2015-07-15 09:23:17 +12:00
torleif
4c050b727b
Update CONTRIBUTING.md
...
[Fix] dead links for 3.1
2015-07-15 09:17:29 +12:00
