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
Roman Schmid
6fafce766e
Fixed Rfc3339 implementation of Date and Datetime
2018-01-24 16:58:12 +01:00
Damian Mooyman
3fce5372b0
DOC Fix phpdoc on ArrayList::limit
...
Fixes #7781
2018-01-24 10:18:15 +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
Daniel Hensby
db610aaf3b
Fixing string concat CS issues
2018-01-16 18:39:30 +00:00
Daniel Hensby
42511d8061
Merge pull request #7714 from @zanderwar
2018-01-16 15:43:18 +00:00
Daniel Hensby
ebeaf3e40d
Merge branch '3' into 4
2018-01-16 11:47:39 +00:00
Daniel Hensby
e4b936c7c7
Merge branch '4.0' into 4
2018-01-12 14:40:33 +00:00
Damian Mooyman
ce07e4781e
BUG Do database migrations before default records
...
Fixes #7703
2017-12-18 16:37:21 +13:00
Reece Alexander
9c91e9820e
Returns chainability in setValue from parent
2017-12-17 17:21:42 +10:00
Robbie Averill
cd9695eda9
Merge pull request #7695 from open-sausages/pulls/4/versions-of-atlantis
...
Update framework docs / phpdoc for versioning changes
2017-12-17 16:33:59 +13:00
Daniel Hensby
e4bf9a31ed
Merge branch '4.0' into 4
2017-12-14 21:20:11 +00: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
ed6561d9f5
BUG Fix incorrect merge of associative / non-associative summary fields
...
Fixes #7696
2017-12-14 14:17:19 +13:00
Damian Mooyman
8b1b9f022b
Fix linting issues
2017-12-14 13:50:52 +13:00
Damian Mooyman
2391af5ba7
Fix literal linting
2017-12-12 09:22:18 +13:00
Loz Calver
0e1753f33d
FIX: Only show table_name warning on dev/build
2017-12-11 17:33:39 +00:00
Damian Mooyman
71c80d3762
Merge remote-tracking branch 'origin/4.0' into 4
2017-12-11 14:09:41 +13:00
Damian Mooyman
69decdf3a4
BUG Don't warn on table name for classes without tables
...
Fixes #7686
2017-12-11 09:55:57 +13:00
Damian Mooyman
6b384f4b35
Merge branch '4.0' into 4
2017-12-07 13:52:00 +13:00
Damian Mooyman
e45921b293
Merge pull request #46 from silverstripe-security/pulls/4.0/escape-limit-args
...
[SS-2017-008] Fix SQL injection in full text search (4.0 branch)
2017-12-06 18:22:24 +13:00
Damian Mooyman
d290eee217
Merge pull request #7668 from kinglozzer/getviewertemplates
...
NEW: Add ViewableData::getViewerTemplates()
2017-12-06 11:22:53 +13:00
Loz Calver
91bd92df31
FIX: Remove some unnecessary ClassInfo calls in DataObjectSchema
2017-12-05 12:23:10 +00:00
Daniel Hensby
eb55c27124
Merge branch '4.0' into 4
2017-12-05 12:14:22 +00:00
Loz Calver
259ae3f78b
NEW: Add ViewableData::getViewerTemplates()
...
Forms part of the fix for silverstripe/silverstripe-cms#2039
2017-12-05 09:13:28 +00:00
Damian Mooyman
9666222637
BUG Fix _configure_database.php being ignored
...
Fixes #7590
2017-11-29 12:01:24 +13:00
Christopher Joe
cc72b5c852
BUG Added warning for auto-generated table_name for non-test classes
2017-11-27 20:22:37 +13:00
Daniel Hensby
6d5cbe0a0e
Merge branch '4.0' into 4
2017-11-25 17:19:31 +00:00
Daniel Hensby
07a0f75426
Merge branch '3.6' into 4.0
2017-11-25 16:56:50 +00:00
Daniel Hensby
333ecc201c
Merge pull request #7583 from open-sausages/pulls/4/relation-object-navigation
...
BUG Ensure relObject() safely bails on empty objects
2017-11-23 12:48:57 +00:00
Christopher Joe
2b6b877327
Merge branch '4.0' of https://github.com/silverstripe/silverstripe-framework into 4
2017-11-21 15:08:30 +13:00
Damian Mooyman
099a5a3c2d
[SS-2017-008] Fix SQL injection in full text search
2017-11-20 16:53:44 +13:00
Chris Joe
d8ca223e15
Merge pull request #7605 from open-sausages/pulls/4.0/fix-enum-defaults
...
BUG Fix DBEnum ignoring empty defaults
2017-11-20 11:32:45 +13:00
Damian Mooyman
cbf9e40115
BUG Fix postgres / PDO support
2017-11-17 12:35:55 +13:00
Damian Mooyman
ef58799103
BUG Fix DBEnum ignoring empty defaults
...
FIxes #7582
2017-11-17 12:35:39 +13:00
Christopher Joe
2bc7edbf47
BUG Fix don't treat zero-date as invalid
2017-11-16 13:30:15 +13:00
Damian Mooyman
6a6cf2f9eb
ENHANCEMENT Raise warning if DBField::create_field() would behave unpredictably and improve PHPDoc
2017-11-16 12:55:31 +13:00
Damian Mooyman
eae3d0cfaa
Merge remote-tracking branch 'origin/4.0' into 4
2017-11-16 10:16:44 +13:00
Chris Joe
bee3c404fa
Merge pull request #7545 from open-sausages/pulls/4.0/deprecated-each
...
BUG Remove usage of deprecated each() and use a helper method instead
2017-11-15 16:30:20 +13:00
Damian Mooyman
c9921447b3
Merge pull request #7539 from colintucker/fix-broken-paginated-list
...
Fixed array/object mismatch bug in PaginatedList
2017-11-15 15:17:15 +13:00
Damian Mooyman
f863573d1c
API Add getShortName to DBClassName
...
Fixes #7586
2017-11-15 11:27:58 +13:00
Damian Mooyman
ba2c5b48f7
BUG Ensure relObject() safely bails on empty objects
...
BUG Remove assignment of IDs to singletons
API relation methods can take an optional $id parameter to get relations from specific parents
API Added UnsavedRelationList::relation() method
2017-11-10 15:27:02 +13:00
Colin Tucker
f952ef747b
Fixed array/object mismatch bug in PaginatedList
2017-11-06 11:23:41 +00:00
Sam Minnee
d8b4ca91d9
FIX: Fix ContextSummary behaviour with UTF8 chars
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/1396
Ensure that DBTextTest has UTF8 test cases
2017-11-06 12:09:08 +13:00
Damian Mooyman
5bc4f3d1fc
BUG Remove usage of deprecated each() and use a helper method instead
2017-11-01 16:04:35 +13:00
Damian Mooyman
324bdad48c
ENHANCEMENT Ensure DBVarchar scaffolds text field with TextField with appropriate max length
...
Fixes #1413
2017-10-26 16:21:51 +13:00
Damian Mooyman
b9cb1e69e6
BUG Replace phpdotenv with thread-safe replacement
2017-10-20 18:43:11 +13:00
Damian Mooyman
7e97f04e47
ENHANCEMENT Allow extensions to intercept incorrect deletes on unpublish
2017-10-13 10:12:08 +13:00
