Daniel Hensby
|
bb74c86236
|
Merge branch '3.5' into 3
|
2016-11-29 11:41:22 +00:00 |
|
Daniel Hensby
|
fb39022ef3
|
Merge branch '3.4' into 3.5
|
2016-11-29 11:40:37 +00:00 |
|
Daniel Hensby
|
3a009a5849
|
Merge branch '3.3' into 3.4
|
2016-11-29 11:39:58 +00:00 |
|
Daniel Hensby
|
f1244db49b
|
Merge pull request #6342 from open-sausages/pulls/3.3/fix-behat-html
BUG Fix behat tests unable to capture HTML editor fields
|
2016-11-29 10:29:23 +00:00 |
|
Ingo Schommer
|
622a07c06f
|
Merge pull request #6325 from open-sausages/pulls/4.0/uploadfield
API Refactor UploadField, FileField and AssetField into traits
|
2016-11-29 17:08:42 +13:00 |
|
Damian Mooyman
|
792a9ec3ed
|
Add missing changelog content
|
2016-11-29 16:21:14 +13:00 |
|
Damian Mooyman
|
bc19b2a491
|
PSR2 cleanup
|
2016-11-29 16:18:48 +13:00 |
|
Damian Mooyman
|
d4abfea4eb
|
Rename Uploadable -> UploadReceiver and FileUploadable -> FileUploadReceiver
|
2016-11-29 16:16:16 +13:00 |
|
Damian Mooyman
|
7cba50e3a5
|
API Refactor UploadField, FileField and AssetField into traits Uploadable and FileUploadable
|
2016-11-29 16:15:59 +13:00 |
|
Damian Mooyman
|
8e4ed776d8
|
API Expose FieldHolder react component
|
2016-11-29 16:14:20 +13:00 |
|
Damian Mooyman
|
9ec1d35f2b
|
BUG Fix behat tests unable to capture HTML editor fields
|
2016-11-29 14:49:39 +13:00 |
|
Sam Minnée
|
d38097ec14
|
Merge pull request #6340 from open-sausages/pulls/4.0/psr-2
API Apply psr-2 coding conventions to framework with linting CI check
|
2016-11-29 14:37:12 +13:00 |
|
Damian Mooyman
|
97d0fc61d8
|
API Include psr-2 checks in CI
|
2016-11-29 13:00:58 +13:00 |
|
Damian Mooyman
|
4b7d31377b
|
PSR2: Automatic fixes
|
2016-11-29 12:33:28 +13:00 |
|
Damian Mooyman
|
1b1e921e3d
|
PSR2: Whitespace-only changes
|
2016-11-29 12:31:16 +13:00 |
|
Daniel Hensby
|
6a040bb753
|
Merge branch '3.5' into 3
|
2016-11-28 13:36:41 +00:00 |
|
Daniel Hensby
|
4bb6765392
|
Merge branch '3.4' into 3.5
|
2016-11-28 13:36:06 +00:00 |
|
Daniel Hensby
|
71efd960b0
|
Merge tag '3.5.0' into 3.5
Release 3.5.0
|
2016-11-28 13:32:48 +00:00 |
|
Daniel Hensby
|
17690ff6bc
|
Merge branch '3.3' into 3.4
|
2016-11-28 13:30:29 +00:00 |
|
Daniel Hensby
|
fc83321b6e
|
Merge tag '3.4.2' into 3.4
Release 3.4.2
|
2016-11-28 13:29:33 +00:00 |
|
Daniel Hensby
|
6552dce70e
|
Merge branch '3.2' into 3.3
|
2016-11-28 13:26:31 +00:00 |
|
Daniel Hensby
|
b299a7921d
|
Merge tag '3.3.4' into 3.3
Release 3.3.4
|
2016-11-28 13:20:07 +00:00 |
|
Daniel Hensby
|
214c3d2582
|
Merge branch '3.1' into 3.2
|
2016-11-28 13:16:27 +00:00 |
|
Daniel Hensby
|
f7fd0d3f21
|
Merge tag '3.2.6' into 3.2
Release 3.2.6
|
2016-11-28 13:16:21 +00:00 |
|
Daniel Hensby
|
612a9164af
|
Merge tag '3.1.21' into 3.1
Release 3.1.21
|
2016-11-28 13:13:48 +00:00 |
|
Dan Hensby
|
179996b5f9
|
Added 3.5.0 changelog
|
2016-11-28 12:35:19 +00:00 |
|
Dan Hensby
|
7593df6db3
|
Update translations
|
2016-11-28 12:35:18 +00:00 |
|
Daniel Hensby
|
a9c85057b0
|
Merge pull request #6332 from andrewandante/BUGFIX/apply-send-all-emails-from-to-SS_LogEmailWriter
|
2016-11-25 11:21:21 +00:00 |
|
Andrew Aitken-Fincham
|
13aaa6badb
|
Apply email defaults to SS_LogEmailWriter
|
2016-11-25 09:59:41 +00:00 |
|
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 |
|