Commit Graph

4478 Commits

Author SHA1 Message Date
Daniel Hensby
dcb8024158
Merge tag '3.5.0' into 3.5
Release 3.5.0
2016-11-28 14:13:29 +00:00
Daniel Hensby
9c5974a13b
Merge branch '3.4' into 3.5.0 2016-11-15 12:09:14 +00:00
Daniel Hensby
da4aeda90e
Merge branch '3.3' into 3.4 2016-11-15 12:08:32 +00:00
Daniel Hensby
65e0b6ef35
Merge branch '3.2' into 3.3 2016-11-15 12:08:05 +00:00
Daniel Hensby
8e5462794d
Merge pull request #1 from silverstripe-security/patch/3.2/SS-2016-012 2016-11-15 12:07:00 +00:00
Damian Mooyman
a0eda1edd1 Increment 3 alias to 3.6 2016-11-14 10:04:09 +13:00
Daniel Hensby
804ff7c247
FIX Fixing test errors 2016-11-10 13:01:37 +00:00
Daniel Hensby
537f4da88f
Merge branch '3' 2016-11-10 12:19:27 +00:00
Damian Mooyman
43462f1afa Merge pull request #55 from open-sausages/features/4.0/jlayout-to-flexbox
Replace Layout CSS classes for flexbox classes
2016-10-11 17:36:26 +13:00
Damian Mooyman
8dd40b3c26 Merge pull request #50 from open-sausages/pulls/4.0/reports-filter-spacing
Add spacing below filter action
2016-10-05 19:42:45 +13:00
Paul Clarke
97eac2eb09 Replace Layout CSS classes for flexbox classes 2016-10-05 17:48:03 +13:00
Loz Calver
fa7e0825c5 Merge pull request #54 from sminnee/the-chrisening
MINOR: Make use of static::class
2016-09-28 09:22:40 +01:00
Sam Minnee
c813488412 MINOR: Make use of static::class 2016-09-28 11:36:52 +13:00
Daniel Hensby
2c7846cb72 Merge pull request #53 from sminnee/no-class-property
FIX: Remove referencies to Object::$class
2016-09-27 22:15:51 +01:00
Sam Minnee
fe0ca63c7a FIX: Remove referencies to Object::$class
This property is being deprecated in SS4 and so this removes references
to it.
2016-09-28 10:00:51 +13:00
Paul Clarke
3d144b3afc Add spacing below filter action 2016-09-20 17:28:05 +12:00
Will Rossiter
0008f474b8 Update Travis build URL 2016-09-19 19:17:07 +12:00
Will Rossiter
3b32047f28 Merge pull request #49 from open-sausages/pulls/4.0/alignment-and-spacing
Alignment and spacing of main CMS panels
2016-09-19 19:05:45 +12:00
Loz Calver
c4ba67c1fb Merge pull request #48 from open-sausages/webpack
Remove HTMLEditorField.js include
2016-09-15 09:45:36 +01:00
Paul Clarke
9cee3c25fb Remove custom reportAdmin css overrides 2016-09-15 18:23:43 +12:00
Ingo Schommer
1e8d94afe1 Remove HTMLEditorField.js include
This should already be handled by the CMS bundle.
2016-09-15 15:25:14 +12:00
Damian Mooyman
b2f3902996 Rename SS_ prefixed classes (#46) 2016-09-09 18:11:38 +12:00
Ingo Schommer
c6b6c5fb2a Merge pull request #45 from open-sausages/pulls/4.0/namespace-everything
Upgrade code for namespaces
2016-09-08 17:57:19 +12:00
Damian Mooyman
bd17cca223
Upgrade code for namespaces
Apply SilverStripe\Reports namespace
2016-09-08 15:37:35 +12:00
Daniel Hensby
f759a7c6db Merge pull request #44 from open-sausages/pulls/4.0/namespace-admin
Namespace Admin module
2016-08-17 11:45:37 +01:00
Damian Mooyman
a96ab15af3 API Fix issue with namespaced reports
Add permission code to reports
Fix include paths
2016-08-16 11:43:45 +12:00
Damian Mooyman
8f14b94433 Merge 3.4 into 3 2016-08-15 19:05:25 +12:00
Damian Mooyman
20f929ba8b Merge 3.3 into 3.4 2016-08-15 19:01:57 +12:00
Damian Mooyman
8395a55442 Merge 3.2 into 3.3 2016-08-15 18:47:45 +12:00
Damian Mooyman
ac0d621d6f Merge 3.4.1 into 3.4 2016-08-15 18:37:56 +12:00
Damian Mooyman
f92b83fc45 Merge 3.3.3 into 3.3 2016-08-15 18:36:18 +12:00
Damian Mooyman
eb096e869f Merge 3.2.5 into 3.2 2016-08-15 18:35:03 +12:00
Daniel Hensby
c1525c8ba6 [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-08-15 15:54:47 +12:00
Daniel Hensby
efa20d2da0 [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-08-15 15:05:41 +12:00
Daniel Hensby
cff2ea9a98 [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-08-15 14:17:02 +12:00
Damian Mooyman
a325bfb222 Apply SilverStripe\Admin namespace 2016-08-12 10:38:40 +12:00
Hamish Friedlander
83c7e9955b Merge pull request #42 from open-sausages/pulls/4.0/namespace-cms
API Update for SilverStripe\CMS namespace
2016-08-11 20:44:13 +07:00
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