Daniel Hensby
71383b827d
Merge branch '3'
2017-02-08 12:34:45 +00:00
Damian Mooyman
9c040e10c4
Update translations
2017-02-08 11:05:29 +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
a5da085cc7
Merge branch '3'
2017-01-31 17:03:53 +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
Ingo Schommer
f10a259708
Merge pull request #6527 from open-sausages/pulls/4.0/form-field-name
...
API Scaffolded redux form fields have the parent form name
2017-01-31 13:49:05 +13:00
Daniel Hensby
28907f64c1
Merge pull request #6543 from zacps/loading-indicator
...
Fix loading indicator position (fixes #6153 )
2017-01-27 11:43:39 +00:00
Zac Pullar-Strecker
5e19d905f8
Fix loading indicator position ( fixes #6153 )
...
Fix through a different element target in js. This is untested
because node_modules is hopelessly broken on my machine.
2017-01-27 11:07:18 +00:00
Daniel Hensby
a282b3f420
Merge pull request #6528 from zacps/3310-permissions
...
Simplify permissions displayed when admin (fixes #3310 )
2017-01-27 10:26:12 +00: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
Damian Mooyman
8a07c56bdf
API Replace i18n message localisation with symfony/translation
...
API Implement enhanced pluralisation
Remove Zend_Translate and all Zend dependencies from i18n
Deprecated $context from i18n::_t()
Warn on missing default string for i18n::_t()
2017-01-25 17:08:12 +13:00
Ruud Arentsen
c640ade911
Fixed iframe postmessage breaking non-string messages
...
See issue: https://github.com/silverstripe/silverstripe-framework/issues/6562
This is a fix for that, which was already implemented in the code for version 4.0.
2017-01-24 14:15:34 +01:00
3Dgoo
08fbb451d3
Updating help link to 3.4 from 3.3
2017-01-23 09:53:49 +10:30
3Dgoo
b05930356d
Updating help link to 3.5 from 3.3
2017-01-23 09:27:15 +10:30
Matt Peel
cbf64d93c2
DOCS: Add some documentation to ModelAdmin for common use-cases. Fixes #6530
2017-01-20 10:52:49 +13:00
Zac Pullar-Strecker
720e2045c9
Simplify permissions displayed when admin ( fixes #3310 )
...
This changes permissions inherited by being a superuser to gray,
instead of the red x that made it look like you didn't have it.
2017-01-18 14:01:44 +13:00
Damian Mooyman
3033953cc9
API Scaffolded redux form fields have the parent form name assigned as a property
...
Requirement for https://github.com/silverstripe/silverstripe-asset-admin/pull/370
2017-01-18 11:49:09 +13:00
Ingo Schommer
6bd7a6f00b
Update translations
2017-01-17 17:07:42 +13:00
Ingo Schommer
85878192ff
Update translations
2017-01-17 16:11:43 +13:00
Damian Mooyman
584ca3bf03
Merge pull request #6508 from open-sausages/pulls/4.0/search-overlap
...
Fix things not aligning well in the toolbar
2017-01-17 10:00:38 +13:00
Daniel Hensby
de7372ad3b
Test fixes - reorder assertions and ensure string returned
2017-01-16 14:46:22 +00:00
Ingo Schommer
2b05093cc9
Merge pull request #6509 from open-sausages/pulls/4.0/fix-graphql-postvars
...
BUG Prevent type-loss of graphql variables by using JSON.stringify
2017-01-16 17:21:27 +13:00
Christopher Joe
96bd4edce5
Fix things not aligning well in the toolbar
2017-01-16 17:07:00 +13:00
Damian Mooyman
09f967bf67
BUG Prevent type-loss of graphql variables by using JSON.stringify
2017-01-16 16:36:58 +13:00
Ingo Schommer
fa2ef05ef1
Throw warning on missing client validation
...
Client-side validation is not essential (we can only rely on server-side validation being enforced).
So it doesn’t make sense to throw an exception in this context, and stop the entire CMS execution because of missing rules.
2017-01-16 11:59:10 +13:00
Ingo Schommer
558a171366
EmailField client validation
2017-01-16 11:13:24 +13:00
Christopher Joe
c707a91206
Fix shift graphql to use post data due to php-5.6.10+ deprecation message
2017-01-15 04:06:30 +13:00
Damian Mooyman
1f406fa497
Merge pull request #6488 from open-sausages/pulls/4.0/campaign-regressions
...
Fix regression issues in campaigns
2017-01-13 16:53:38 +13:00
Christopher Joe
54c2afd019
Fix regression issues in campaigns
2017-01-12 12:31:32 +13:00
Christopher Joe
4e257435df
Fix Shift react breadcrumbs to use flexbox for placement
2017-01-12 11:14:23 +13:00
Damian Mooyman
b52a963ed7
ENHANCEMENT Remove jquery-ui button() api from default HTML editor dialog
2017-01-11 17:04:20 +13:00
Damian Mooyman
6b5efb91fd
Merge pull request #6434 from open-sausages/features/4.0/ui-button-refresh
...
Refresh CMS UI buttons to new flat style and bootstrap classes
2017-01-11 14:22:25 +13:00
Damian Mooyman
d9034f5bfc
Remove redundant CMSSecurity.js dist file
...
Cleanup GridFieldFilterHeader / GridFieldSortableHeader
2017-01-11 12:00:01 +13:00
Damian Mooyman
ae2861d487
BUG Fix frameworkpath
2017-01-11 11:49:28 +13:00
Damian Mooyman
dcee7c99d3
Normalise indentation in GridField.js
2017-01-11 11:38:19 +13:00
Damian Mooyman
4ea614f04c
Fix linting issues
2017-01-11 10:56:17 +13:00
Damian Mooyman
63cb343cf5
BUG Fix modal animations
...
BUG Correct error type on invalid CSV import
2017-01-11 10:51:54 +13:00
Daniel Hensby
a996e20e79
Merge pull request #6450 from mikenz/page-to-sitetree
...
ENHANCEMENT: Use SiteTree instead of Page class in more places
2017-01-10 16:02:15 +00:00
Damian Mooyman
b62f9b60a0
BUG Fix broken member / group import
...
BUG GridFieldImportButton no longer only works on ModelAdmin
2017-01-10 17:57:54 +13:00
Christopher Joe
8118448a9c
Fix PHP linting issues
2017-01-10 11:34:50 +13:00
Will Rossiter
00c12cc7ed
Loading indicator on buttons now.
2017-01-10 11:05:58 +13:00
Will Rossiter
56c2363909
Implement feedback fixes
...
Enhancement Fix ModelAdmin import form not POSTing to correct form
2017-01-10 11:05:58 +13:00
Paul Clarke
cf5c055ded
Enhancement Fix Campaign admin publish button styles missing
...
API remove unused textures
Enhancement Update legacy DB icon to match new colour
Enhancement Remove Done button on import modal
2017-01-10 11:05:58 +13:00
Will Rossiter
2a7c0138f5
Move lang to root html element ( Fixes #6409 )
2017-01-10 11:05:58 +13:00
