Commit Graph

17559 Commits

Author SHA1 Message Date
Damian Mooyman
76ce9fb94f Merge pull request #6335 from webbuilders-group/shortcode-location-fix
BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone
2016-11-25 10:56:25 +13:00
UndefinedOffset
a4760b8ee4 BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone 2016-11-24 17:28:15 -04:00
Daniel Hensby
1be2e70a2a
Merge branch '3' 2016-11-24 14:18:09 +00:00
Daniel Hensby
464af18346 Merge pull request #6291 from dhensby/pulls/3.4/fix-uploadfield-max-size
FIX UploadField incorrectly setting max upload size
2016-11-24 12:40:04 +00:00
Daniel Hensby
dd9ade4294
FIX UploadField incorrectly setting max upload size 2016-11-24 11:54:44 +00:00
Daniel Hensby
1529c84212
Merge branch '3.5' into 3 2016-11-23 23:56:14 +00:00
Daniel Hensby
602062802e
Merge branch '3.4' into 3.5 2016-11-23 23:55:31 +00:00
Daniel Hensby
406307c77b
Merge branch '3.3' into 3.4 2016-11-23 23:29:25 +00:00
Daniel Hensby
b7bb7a46da
Merge branch '3.2' into 3.3 2016-11-23 22:26:15 +00:00
Daniel Hensby
17eb351f81
Merge branch '3.1' into 3.2 2016-11-23 21:54:22 +00:00
Damian Mooyman
38a63ad73f Merge pull request #6327 from open-sausages/pulls/4.0/file-icon-update
Update doc icons for files area
2016-11-24 10:34:55 +13:00
Damian Mooyman
730512f036 Merge pull request #6328 from dhensby/pulls/3.1/test-i18n-fix
FIX Tests shouldnt set date or time format to null
2016-11-24 10:01:42 +13:00
Damian Mooyman
76f64efe14 Merge pull request #6331 from silverstripe/bugfix-framework-core-manifest-manifest-cache-file-ds
Replace hard-coded directory separators constant
2016-11-24 10:01:06 +13:00
Damian Mooyman
396a47f824 Merge pull request #6330 from silverstripe/bugfix-framework-core-manifest-manifest-cache-ds
Replace hard-coded directory separators constant
2016-11-24 09:20:43 +13:00
Christopher Pitt
06d1297fbe Replace hard-coded directory separators constant
This removes warnings when building the manifest cache in Windows environments.
2016-11-24 08:05:56 +13:00
Christopher Pitt
a4167e29fe Replace hard-coded directory separators constant
This removes warnings when building the manifest cache in Windows environments.
2016-11-24 08:00:34 +13:00
Daniel Hensby
03b4e6ea32
FIX Tests shouldnt set date or time format to null 2016-11-23 12:36:53 +00:00
Daniel Hensby
67496d3eb0 Merge pull request #6315 from open-sausages/pulls/4.0/namespace-tests-squashed
API Namespace all tests
2016-11-23 08:07:45 +00:00
Damian Mooyman
22cb3d0d74 Fix various ORM test issues 2016-11-23 19:25:12 +13:00
Damian Mooyman
00c9c2c775 BUG Fix DataObject::dbObject assigning incorrect table to DBField instance 2016-11-23 19:25:12 +13:00
Damian Mooyman
cac326eebb API Add getExtraDataObjects() and getExtraControllers() methods to SapphireTest 2016-11-23 19:25:12 +13:00
Damian Mooyman
6e8304ff2f API Namespace framework tests 2016-11-23 19:25:12 +13:00
Damian Mooyman
789cb5b465 Move files to psr-2 standard locations 2016-11-23 19:25:12 +13:00
Paul Clarke
f5923cf433 Update doc icons 2016-11-23 11:26:38 +13:00
Dan Hensby
47c33dc7c2 Added 3.5.0-rc3 changelog 2016-11-22 14:53:03 +00:00
Dan Hensby
ee11b12e7a Update translations 2016-11-22 14:53:02 +00:00
Dan Hensby
64595118fe Added 3.4.2 changelog 2016-11-22 13:55:31 +00:00
Dan Hensby
5cd794bc03 Update translations 2016-11-22 13:55:25 +00:00
Dan Hensby
be86c342b6 Added 3.3.4 changelog 2016-11-22 13:12:14 +00:00
Dan Hensby
c809b044f6 Update translations 2016-11-22 13:12:11 +00:00
Dan Hensby
182522b018 Added 3.2.6 changelog 2016-11-22 11:59:04 +00:00
Dan Hensby
5019f2a8cf Update translations 2016-11-22 11:59:02 +00:00
Daniel Hensby
3e36f5691b
Merge branch '3.4' into 3.5.0 2016-11-22 11:31:39 +00:00
Daniel Hensby
f57244d526
Merge branch '3.3' into 3.4 2016-11-22 11:29:32 +00:00
Daniel Hensby
f17e21c4a3
Merge branch '3.2' into 3.3 2016-11-22 11:26:41 +00:00
Daniel Hensby
d2633be56d
Merge branch '3.1' into 3.2 2016-11-22 11:21:08 +00:00
Damian Mooyman
8ab382ed78 ENHANCEMENT: Insert media modal in react 2016-11-22 17:50:17 +13:00
Paul Clarke
35e313de17 Enhancement Fix height for modal in IE10
Enhancement Remove link color specific to header
Enhancement Close panel class renamed, as it is not always top right
2016-11-22 16:58:01 +13:00
Damian Mooyman
43917edc97 Cleanup FeatureContext 2016-11-22 16:58:01 +13:00
Christopher Joe
875811fdfd API Create loading state for schema
API Create stateOverride state for schema
Enhancement Moved crumbs property to rely on redux state
Enhancement Updated file app icon names
API Added InsertMediaModal functionality to HtmlEditorField
API Removed dependency on schema ID that is returned from server
API Added afterMessages property for FormBuilder to display content after the alert message
2016-11-22 16:58:00 +13:00
Dan Hensby
3067bcbd24 Added 3.4.2 changelog 2016-11-21 13:28:00 +00:00
Dan Hensby
50f456eed8 Update translations 2016-11-21 13:27:57 +00:00
Dan Hensby
375df539eb Added 3.3.4 changelog 2016-11-21 12:37:09 +00:00
Dan Hensby
0d2710c31b Update translations 2016-11-21 12:37:07 +00:00
Dan Hensby
4a82041061 Added 3.2.6 changelog 2016-11-18 15:14:42 +00:00
Dan Hensby
5890f6f7e2 Update translations 2016-11-18 15:14:40 +00:00
Dan Hensby
586e5281e0 Added 3.1.21 changelog 2016-11-18 12:17:03 +00:00
Daniel Hensby
69974d940a
Merge branch '3.3' into 3.4 2016-11-18 11:33:39 +00:00
Daniel Hensby
0ae4b57754
Merge branch '3.2' into 3.3 2016-11-18 11:32:36 +00:00
Daniel Hensby
5df077f24d
Merge branch '3.1' into 3.2 2016-11-18 11:29:19 +00:00