6c1f17da91
Remove obsolete alias
2016-07-28 14:34:38 +12:00
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
87477a1e01
BUG Fix incorrect url manipulation
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1183
2016-07-21 18:06:19 +12:00
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
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
3bb32eb013
FIX Tests need the DB
2016-06-09 14:25:01 +01:00
68c4040299
FIX No longer hardcoding admin links
2016-06-09 13:40:29 +01:00
68d9533542
Alias 3 as 3.5
2016-05-19 16:14:08 +12:00
1d8f3b0c7c
Merge pull request #30 from chillu/pulls/remove-triple-title
...
Remove triple report titles
2016-05-11 10:02:52 +01:00
b63600c392
Remove triple report titles
2016-05-10 22:24:40 +12:00
fe17073355
Merge branch '3.3' into 3
2016-04-26 02:30:18 +01:00
b985ce0eba
Merge branch '3.2' into 3.3
2016-04-26 02:29:59 +01:00
7eb6b21494
Merge pull request #29 from dhensby/pulls/3.2/fix-deps
...
Decouple from CMS module
2016-03-22 17:41:09 +13:00
b1566f3e79
Decoupling from CMS module
2016-03-21 12:15:27 +00:00
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
57cfe3c66a
FIX Bad joining of links in reports
2016-03-18 11:03:26 +00:00
59cff00bb7
Alias 3 branch as 3.4
2015-12-23 14:24:14 +13:00
fb3083688e
Merge remote-tracking branch 'origin/3.2' into 3
...
# Conflicts:
# .travis.yml
# composer.json
2015-12-22 14:21:03 +13:00
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
36241d52a0
BUG Fix regressions is SS_Report::canView
2015-12-18 11:41:34 +13:00
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
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
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
435ccb79c5
Merge pull request #7 from spekulatius/patch-1
...
fixing typo
2015-07-22 13:21:54 +01:00
Damian Mooyman
Daniel Hensby
Daniel Hensby
Will Rossiter
Ingo Schommer
Daniel Hensby
Christopher Darling
helpfulrobot
Christopher Pitt
Will Rossiter
Patrick Nelson
Damian Mooyman
Damian Mooyman
Loz Calver
Sam Minnee
Stephen Shkardoon
Sean Harvey
Loz Calver
Anton Smith