Daniel Hensby
e260319823
Merge branch '4.0' into 4.1
2018-06-08 23:05:24 +01:00
Damian Mooyman
29f9b1c18f
Fix linting issues
2018-06-08 11:38:36 +12:00
Jonathon Menz
5a5ba1e5c0
Fix: negative values in read only currency field
...
Don’t strip out ‘-‘ character as this makes negative values appear to be positive (Fixes #8126 )
2018-06-01 12:59:02 -07:00
Robbie Averill
d0d936bc40
Merge branch '4.0' into 4.1
2018-05-30 14:52:31 +12:00
Robbie Averill
c8b0bc0ad7
Merge branch '4.0' into 4.1
...
# Conflicts:
# src/ORM/DataObject.php
# tests/php/ORM/DataObjectDuplicationTest.php
# tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
624a5326a7
Typo in PHPDoc type
2018-05-30 14:51:09 +12:00
Robbie Averill
6d98a912c9
Merge branch 'heads/4.1.1' into 4.1
2018-05-28 18:26:20 +12:00
Robbie Averill
3a537bc745
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
...
# Conflicts:
# src/Control/Director.php
2018-05-24 15:41:11 +12:00
Aaron Carlino
f847f186b1
[ss-2018-013] Remove password text from session data on failed submission
2018-05-14 17:14:38 +12:00
Damian Mooyman
2e13ae746f
[ss-2018-006] Prevent code execution in template value resolution
2018-05-14 17:05:31 +12:00
Daniel Hensby
d5e2d3fa67
Merge branch '3.6' into 4.0
2018-05-01 21:47:17 +01:00
Daniel Hensby
9ed3cd4042
Merge branch '4.0' into 4.1
2018-03-16 14:57:05 +00:00
Thomas Portelange
2e1c70b56c
Ensure tmpData exists
...
Otherwise you might get illegal string offset
2018-03-15 20:40:05 +01:00
Daniel Hensby
c41ebd3279
Merge pull request #7930 from creative-commoners/pulls/4.1/return-self
...
FIX Ensure consistent return type for FieldList::removeByName
2018-03-14 14:21:47 +00:00
Robbie Averill
a9cc4d4844
FIX Ensure consistent return type for FieldList::removeByName
2018-03-14 19:40:17 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:26:18 +13:00
Damian Mooyman
5fee4a81aa
BUG Files dataobjects with missing asset shouldn't un-attach themselves from parent object on save
2018-03-07 11:17:17 +13:00
Damian Mooyman
32637413de
ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites ( #7903 )
...
* ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites
* Minor: Grammar fixes.
2018-03-05 15:47:06 +13:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 12:20:18 +13:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1
2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0
2018-02-09 14:32:58 +00:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/CoreKernel.php
2018-02-05 17:52:38 +13:00
Damian Mooyman
aa2c71424d
API Implement cascade_duplications
...
API Add DataObject::setComponent()
API Support unary components as getter and setter fields
API ManyManyList::add() now supports unsaved records
ENHANCEMENT Animal farm
2018-02-05 12:04:57 +13:00
Robbie Averill
c0ffe2797a
Update phpdoc for FormField::setRightTitle regarding escaped HTML
2018-01-31 11:03:35 +13:00
Damian Mooyman
bca47029c4
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Control/SimpleResourceURLGenerator.php
# tests/php/Control/SimpleResourceURLGeneratorTest.php
2018-01-25 12:53:15 +13:00
Damian Mooyman
b44273d1d6
BUG Better upload error message
...
Fixes https://github.com/silverstripe/silverstripe-asset-admin/issues/720
2018-01-23 16:08:42 +13:00
Damian Mooyman
f4092f7bcf
API Deprecate GridFieldVersionedState
2018-01-22 15:28:09 +13:00
Damian Mooyman
a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/TempFolder.php
# src/ORM/DataObject.php
# src/View/ThemeResourceLoader.php
# src/includes/constants.php
# tests/php/Control/SimpleResourceURLGeneratorTest.php
# tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
# tests/php/View/RequirementsTest.php
2018-01-22 14:57:05 +13:00
Damian Mooyman
16ad7e8fea
BUG Make GridFieldConfig less susceptible to error when versioned isn't installed
2018-01-18 16:43:51 +13:00
Daniel Hensby
db610aaf3b
Fixing string concat CS issues
2018-01-16 18:39:30 +00:00
Damian Mooyman
ca2fe3b1f6
BUG Fix themed editor.css url not being resolved properly
2018-01-16 16:25:17 +13:00
Daniel Hensby
dc96862cac
FIX Forms run through FormHandler rather than Controllers now have access to current Request
2018-01-15 13:08:43 +00:00
Daniel Hensby
e4b936c7c7
Merge branch '4.0' into 4
2018-01-12 14:40:33 +00:00
Robbie Averill
9fddb5de99
NEW Add getter and setter for removeRelation in GridFieldDeleteAction
...
This allows users to modify the property value in the component without having to
remove it and add a new one when they want to change it.
2018-01-12 14:23:22 +13:00
Andrew Aitken-Fincham
fb5476cb70
check for UPLOAD_ERR_NO_FILE on FileField::saveinto
2018-01-03 12:01:18 +00:00
Daniel Hensby
02761d6ca8
Merge pull request #7712 from creative-commoners/pulls/4.0/fix-last-non-sortable-column
...
FIX Ensure last GridField column when non sortable has its title displayed
2017-12-28 11:53:14 +00:00
Damian Mooyman
623daed5ab
Merge pull request #6472 from silbinarywolf/feat-fieldlist-nestedfields
...
feat(FieldList): Add nestedFields() function to return a flat array of all deeply nested fields in a FieldList.
2017-12-18 13:43:36 +13:00
Raissa North
369653b5df
FIX Ensure last GridField column when non sortable has its title displayed
2017-12-15 16:45:46 +13:00
Jake Bentvelzen
da9c133c1b
ENHANCEMENT Add flattenFields() function to iterate over all deeply nested fields in a form
2017-12-14 14:23:00 +00:00
Damian Mooyman
9170220d2c
API Add onAfterSave extension point to GridFieldDetailForm_ItemRequest
2017-12-14 15:08:32 +13:00
Damian Mooyman
a50fd009ca
Update PHPDoc
2017-12-14 15:08:32 +13:00
Damian Mooyman
529e341dbc
Merge pull request #7699 from open-sausages/pulls/4/html-in-security-msg
...
ENHANCEMENT Allow html in security failure message
2017-12-14 14:30:09 +13:00
Damian Mooyman
1c8576cee7
Linting cleanup
2017-12-14 14:18:41 +13:00
Damian Mooyman
8b1b9f022b
Fix linting issues
2017-12-14 13:50:52 +13:00
Damian Mooyman
eba6129c07
Merge pull request #7677 from open-sausages/pulls/4/textarea-maxlength
...
Enable max length for textarea field
2017-12-11 10:34:29 +13:00
Damian Mooyman
627b496379
Fix linting issue
2017-12-11 09:00:04 +13:00
Saophalkun Ponlu
381ad756f2
Fix tests
2017-12-08 09:58:52 +13:00
Damian Mooyman
6b384f4b35
Merge branch '4.0' into 4
2017-12-07 13:52:00 +13:00
Saophalkun Ponlu
442f2bb762
Enable max length for textarea field
2017-12-07 12:52:28 +13:00