Dan Hensby
bf797a1a88
Merge branch '3.7' into 3
2020-04-05 21:16:43 +01:00
Dan Hensby
6c8dc0fd99
Fix deprecated php syntax
2020-04-01 14:03:03 +01:00
Robbie Averill
7d901a6d9b
FIX Member argument is now passed to LeftAndMain::alternateAccessCheck()
2019-08-27 11:23:02 +12:00
Daniel Hensby
362c2f3b64
Make sure that CMS requests disable caching
2018-08-13 14:39:55 +01:00
Daniel Hensby
5f48b3e5d2
FIX txt/json is not a valid content type
2018-08-13 12:16:42 +01:00
Damian Mooyman
47a9cdfd49
ENHANCEMENT Backport of querystring work to 3.x ( #8026 )
...
* WIP Backport of querystring work to 3.x
* Remove dataextension requirement
* Fix up bootstrapping
* more backporting
* Bug fix some tests
* Fix up some tests
* Fix support for custom stages
Don't set empty stage
* Better cache typehint
* Make sure useDraftSite(false) re-enables secure site
* Remove unnecessary guard around controller property
2018-05-08 10:04:44 +12:00
Daniel Hensby
c31251911c
Merge branch '3.6' into 3
2018-04-18 13:14:46 +01:00
Robbie Averill
51d4d2c11e
Update some phpdocs that had typos, missing parts or incorrect formats
2018-04-11 20:12:38 +12:00
Daniel Hensby
9103816333
NEW Add php 7.2 support
2018-01-30 16:50:32 +00:00
Daniel Hensby
bb90751cc8
Merge branch '3.6' into 3
2018-01-15 16:44:48 +00:00
Tobias Oetiker
396005381f
JSON.parse does not like empty strings
...
Add some protection for the case that envent.data is empty or null
2018-01-12 16:21:33 +01:00
Damian Mooyman
50aa1f22a6
Merge branch '3.6' into 3
2017-12-07 13:20:58 +13:00
Damian Mooyman
91cf85087b
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:21:09 +13:00
Daniel Hensby
8d1a5ed8b7
More code style fixes
2017-12-05 14:20:13 +00:00
Daniel Hensby
2aa1d8f2c4
remove create_function usage
2017-12-05 14:20:13 +00:00
Robbie Averill
2538f59ab7
Merge pull request #5211 from stevie-mayhew/pulls/reset-button
...
BUGFIX: don't try and switch out of context of the tab system
2017-12-05 19:59:49 +13:00
Robbie Averill
ee4d8b4d4e
NEW Add new SilverStripeVersionProvider to provider module versions
2017-07-04 23:29:29 +12:00
Daniel Hensby
41b8df0ec7
Merge branch '3.6' into 3
2017-07-03 16:44:20 +01:00
Daniel Hensby
5f17c7fb58
Merge branch '3.5' into 3.6
2017-07-03 16:44:06 +01:00
Daniel Hensby
79a7b1016e
FIX add missing $rootCall param from LeftAndMain
2017-06-29 11:24:09 +01:00
Daniel Hensby
399c46579a
Merge branch '3.6' into 3
2017-06-27 13:15:14 +01:00
Daniel Hensby
1e5592a3d9
Merge branch '3.5' into 3.6
2017-06-27 13:14:39 +01:00
Ingo Schommer
a51eb46735
Revert "Update translations"
...
This reverts commit f9e890176dhttps://github.com/silverstripe/silverstripe-framework/issues/7002
2017-06-15 14:48:35 +12:00
Daniel Hensby
273a087f5a
Merge branch '3.6' into 3
2017-06-14 14:29:15 +01:00
Daniel Hensby
6f2b08b962
Merge branch '3.6' into 3
2017-06-14 12:02:27 +01:00
Daniel Hensby
ecc88b2cbe
Merge branch '3.5' into 3.6
2017-06-14 12:02:06 +01:00
Robbie Averill
fd57bd9100
FIX Update help link from 3.5 to 3.6
2017-06-14 15:29:28 +12:00
Brian Cairns
53c84d93da
Fix changetracker checkbox bugs
...
1) Use quoted name attribute selector, to work with CheckboxsetField bracketed[] field names
2) Initialize unchecked boxes original values to 0 instead of undefined, as this is the value onchange() expects for unchecked boxes (see line 67)
2017-06-12 16:16:55 -06:00
Daniel Hensby
21d2e5cad1
Merge branch '3.6' into 3
2017-05-31 00:12:14 +01:00
Daniel Hensby
becb769167
Merge branch '3.5' into 3.6
2017-05-31 00:11:48 +01:00
Robbie Averill
b4368196d1
FIX Use plural name for ModelAdmin tab name
2017-05-29 14:02:58 +12:00
Damian Mooyman
3883878c13
Merge pull request #6797 from halkyon/broken-group-search
...
Fixing broken search in SecurityAdmin Groups field
2017-05-18 14:28:53 +12:00
root
f9e890176d
Update translations
2017-04-21 11:49:39 +01:00
Sean Harvey
8999f70acc
Fixing broken search in SecurityAdmin Groups field
...
Breadcrumbs is not a database field, so can't be searched.
2017-04-12 13:04:55 +12:00
Loz Calver
a7920b1f98
Fix regression from #6668 - ModelAdmin form widths
2017-04-05 15:13:09 +01:00
Daniel Hensby
e8eb2f0fb0
Merge pull request #6668 ' from timkung/pulls/modeladmin-content-template-fix
2017-03-03 10:18:31 +00:00
Tim Kung
33054100ca
updating title attribute on managed model tab list links to the actual title of each model
2017-03-01 16:32:30 +13:00
Daniel Hensby
f3691eb2b3
Merge branch '3.4.5' into 3.5.3
2017-02-08 22:24:18 +00:00
Daniel Hensby
1f3d46b832
FIX #6606 the JS SiteTree lib depends on whitespace
2017-02-08 21:56:52 +00:00
Damian Mooyman
9c040e10c4
Update translations
2017-02-08 11:05:29 +13:00
Damian Mooyman
60aa4bcfb9
Update translations
2017-02-08 10:29:07 +13:00
Damian Mooyman
89a927d152
Merge 3.4 into 3.5
2017-02-08 10:01:14 +13:00
Daniel Hensby
0fe4ec4537
Partial revert of c6c6c13fc2
2017-02-07 15:33:20 +00:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5
2017-01-31 13:33:00 +00:00
Daniel Hensby
73a83954ea
Merge branch '3.4.4' into 3.4
2017-01-31 13:32:31 +00:00
Damian Mooyman
609b0a612c
Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
...
Test fixes - reorder assertions and ensure string returned
2017-01-31 17:25:34 +13:00
Dan Hensby
247ddd5d46
Update translations
2017-01-26 21:47:36 +00:00
Daniel Hensby
3a6d41042f
Merge branch '3.4' into 3.5
2017-01-26 21:25:14 +00:00
Dan Hensby
393ad5b8a2
Update translations
2017-01-26 18:57:27 +00:00
Daniel Hensby
c6c6c13fc2
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::forTemplate
2017-01-26 12:56:31 +00:00
