Damian Mooyman
7ca876a4c7
Merge pull request #6369 from dhensby/pulls/3.4/travis-simplification
...
Move travis env vars out of .travis.yml and into travis CI dashboard
2016-12-07 12:17:01 +13:00
Daniel Hensby
6af1e5bf0d
Move travis env vars out of .travis.yml and into travis CI dashboard
2016-12-06 22:29:13 +00:00
Loz Calver
e191bc875f
Merge pull request #6367 from colintucker/6363-fix-csv-bulk-loader
...
FIX hard-coded boolean in CsvBulkLoader (fixes #6363 )
2016-12-06 09:42:06 +00:00
Loz Calver
1919b05980
Merge pull request #6365 from tractorcow/pulls/3.4/fix-localisation-strings
...
BUG Fix localisation issues
2016-12-06 09:38:19 +00:00
Colin Tucker
3fca7b3c4d
Fix hard-coded boolean in CsvBulkLoader
2016-12-06 16:08:00 +11:00
Christopher Joe
c405b4e41a
remove required for actions
2016-12-06 14:27:27 +13:00
Paul Clarke
af853861ec
Updated list-group styles to work with file history and campaigns
2016-12-06 14:10:50 +13:00
Paul Clarke
9b7e242f56
Updated list-group variables
2016-12-06 14:05:28 +13:00
Will Rossiter
8d373046db
Add OtherItemID as a schema param
...
History Form needs both an ItemID and a VersionID. Follows the same naming as $ID/$OtherID available in other controllers.
2016-12-06 14:05:28 +13:00
Damian Mooyman
2181e3b86b
BUG Fix localisation issues
2016-12-06 11:20:10 +13:00
Damian Mooyman
b4ba606ff2
ENHANCEMENT: HTMLEditorField default alignment setting
2016-12-06 09:55:48 +13:00
Jonathon Menz
24dc3428d9
NEW HTMLEditorField default alignment setting
...
A config setting to control the default alignment of embedded media and images
2016-12-05 11:54:36 -08:00
Daniel Hensby
d9537eb76b
Merge pull request #6349 from open-sausages/pulls/4.0/fix-cms-crash
...
Temp patch to 5987 to prevent cms crashing
2016-11-30 10:02:13 +00:00
Steve
c034838c71
Update Versioned.php
...
Change isset() to array_key_exists(). In the CMS, if you have a FormField such as 'My value', then you change it to '' (blank), isset() will return false because even though the key exists, the value === null by the time it reaches this point in the code, and isset() return false on null values. array_key_exists will return true with a null value
2016-11-30 14:49:03 +13:00
Damian Mooyman
6107f45d1e
Temp patch to 5987 to prevent cms crashing
2016-11-30 11:20:22 +13:00
Daniel Hensby
7c23443fb6
Merge branch '3'
2016-11-29 17:20:19 +00:00
Daniel Hensby
dbe063911c
Merge branch '3.5' into 3
2016-11-29 17:18:55 +00:00
Daniel Hensby
0821310207
Merge branch '3.4' into 3.5
2016-11-29 17:18:36 +00:00
Daniel Hensby
afb7652459
Merge branch '3.3' into 3.4
2016-11-29 17:17:08 +00:00
Daniel Hensby
2e538ca9ab
Merge tag '3.4.2' into 3.4
...
Release 3.4.2
2016-11-29 17:17:00 +00:00
Daniel Hensby
c875d7a3ea
Merge branch '3.2' into 3.3
2016-11-29 17:14:43 +00:00
Daniel Hensby
cbbfc50675
Merge tag '3.3.4' into 3.3
...
Release 3.3.4
2016-11-29 17:14:37 +00:00
Daniel Hensby
8865f680e6
Merge tag '3.2.6' into 3.2
...
Release 3.2.6
2016-11-29 17:10:13 +00:00
Daniel Hensby
c6d43b477e
Merge branch '3'
2016-11-29 13:27:49 +00:00
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
