Ingo Schommer
e3fbd1dcac
Fixed coding conventions
2017-04-03 20:54:25 +12:00
Ingo Schommer
e9693467bf
Fixed tests
2017-04-03 20:04:37 +12:00
Ingo Schommer
a70de91b33
Fix DatetimeFieldTest
2017-04-03 19:35:40 +12:00
Ingo Schommer
3b94d14e42
MERGE
2017-04-03 12:11:21 +12:00
Ingo Schommer
326aa37ea4
API HTML5 date/time fields, remove member prefs ( fixes #6626 )
2017-03-31 15:21:47 +13:00
Daniel Hensby
ac075eaf0b
Remove TestListener and rely on PHPUnits APIs
2017-03-30 11:46:58 +13:00
Ingo Schommer
ac9d645e4e
Root-level module support in Module->getResourcePath()
...
See https://github.com/silverstripe/silverstripe-framework/pull/6733
2017-03-29 10:19:31 +13:00
Ingo Schommer
556c9a537e
Module->getResourcePath()
...
Based on Sam's feedback in https://github.com/silverstripe/silverstripe-framework/pull/6733
2017-03-28 17:22:30 +13:00
Damian Mooyman
874c6ccdd4
API Add experimental getResource() to Module
2017-03-28 14:13:47 +13:00
Loz Calver
b3d37880e9
FIX: many_many_extraFields breaks _SortColumn0 ordering ( fixes #6730 )
2017-03-27 09:16:13 +01:00
Damian Mooyman
ac3a9c9e6e
API Split out SilverStripe\ORM\Versioned into new module
2017-03-27 11:03:39 +13:00
Daniel Hensby
0410b4c35e
Respect PHPUnit method visibility
2017-03-24 16:23:03 +13:00
Daniel Hensby
6b4a72dee8
Fixing deprecated PHPUnit APIs
2017-03-24 16:23:01 +13:00
Damian Mooyman
1186f07830
API Use mysql-safe table namespace separator
2017-03-24 14:17:30 +13:00
Sam Minnée
d91c6659be
Merge pull request #6723 from open-sausages/pulls/4.0/assets-module
...
API Split SilverStripe\Assets into separate module
2017-03-23 09:21:27 +13:00
Damian Mooyman
dae6d5902f
API Split SilverStripe\Assets into separate module
2017-03-21 11:12:51 +13:00
Damian Mooyman
e4c68bc2bf
Fix and test pluralisation usages
2017-03-21 10:49:30 +13:00
Damian Mooyman
54ba08a306
API Replace ManifestCache with ManifestCacheFactory
...
API Remove lots of deprecated module code from ClassManifest
2017-03-21 09:43:48 +13:00
Sam Minnee
5ea238c58b
MINOR: Add a Versioned test for #6680
...
It turns out that cascaded query params as described in #6680 were
already implemented; this test confirms that.
2017-03-14 09:39:26 +13:00
Damian Mooyman
0c41a97a8b
API Refactor Form request handling into FormRequestHandler
...
API Add HasRequestHandler interface
API Refactor Link() and url handling behaviour from Controller into RequestHandler
API RequestHandler classes now must define url_segment to have a default Link()
API Clean up redirectBack()
2017-03-10 15:04:33 +13:00
Christopher Joe
50deb17763
API remove UploadField, AssetField and associated files
...
Fixes #6481
2017-03-09 10:16:46 +13:00
Daniel Hensby
cdb4a86e1c
PHPParser optimisations and update
2017-03-06 10:35:25 +00:00
Damian Mooyman
f1b99b6fa7
API Enable theming of GroupedDropdownField
...
Based on partial back-port of 4.0 code
2017-03-06 11:44:42 +13:00
Daniel Hensby
f225b83e2b
Merge branch '3'
2017-03-03 15:55:22 +00:00
Daniel Hensby
e932b22388
Merge branch '3.5' into 3
2017-03-03 14:54:43 +00:00
Daniel Hensby
8aaa3e3a86
Merge branch '3.4' into 3.5
2017-03-03 14:54:29 +00:00
Daniel Hensby
7f194a917d
Merge pull request #6351 from steve-silverstripe/patch-2
2017-03-03 14:05:53 +00:00
Daniel Hensby
62e301bdba
Merge pull request #6529 from timezoneone/3.5
...
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
2017-03-03 12:45:05 +00:00
Shawn
72b6fb49b6
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
2017-03-03 14:11:53 +13:00
Damian Mooyman
6ed98a3a94
BUG Prevent obsolete class cache breaking autoload
...
Remove hard-coded class paths
2017-03-01 10:06:15 +13:00
Damian Mooyman
ff47bc03d7
BUG Remove reference to $_SERVER within FakeController
2017-02-27 16:54:01 +13:00
Damian Mooyman
695194546d
BUG Ensure test fixture uses test module manifest
2017-02-27 16:54:01 +13:00
Damian Mooyman
c452d5f6cd
API Rename CoreConfigCreator to CoreConfigFactory
...
Fix rebase regressions
2017-02-27 16:54:01 +13:00
Damian Mooyman
8444a21cbf
API Upgrade tests to use new Config API
2017-02-27 16:54:01 +13:00
Ingo Schommer
d220ca3f67
API Use symfony/cache ( fixes #6252 )
2017-02-26 13:07:59 +13:00
Daniel Hensby
1c55948fc1
Ensure test objects implement TestOnly
2017-02-21 20:30:15 +00:00
Daniel Hensby
7156da6279
Merge branch '3'
2017-02-20 22:19:33 +00:00
Daniel Hensby
0ddf3b4186
Merge branch '3.5' into 3
2017-02-20 21:33:31 +00:00
Daniel Hensby
5a6f784e42
Merge branch '3.4' into 3.5
2017-02-20 21:31:09 +00:00
Ingo Schommer
80723c077b
Reinstated separated DateField functionality
2017-02-16 09:06:14 +13:00
Damian Mooyman
014f0d23ed
API Create SeparatedDateField
...
API Restrict allowed values parsed via DBDate::setValue
API Remove NumericField_Readonly
API Remove DBTime::Nice12 / Nice24
2017-02-15 11:07:58 +13:00
Daniel Hensby
7122e1fde7
FIX Comments ignored by classmanifest ( #6619 )
2017-02-15 10:46:04 +13:00
Damian Mooyman
029a8b9586
API Substitute Zend_Currency with NumberFormatter based solution
...
API Substitute Zend_Locale with Locale / NumberFormatter
API Substitute Zend_Date with IntlDateFormatter
API Added DBTIme::Nice12, FormatFromSettings
API Added Short() method to DBDate / DBTime / DBDatetime
API Add Date::getTimestamp()
API Added setSubmittedValue api for FormField
API Add second arg to base FormField::setValue()
API Major refactor of i18n into component data parts
API Implement Resettable interface to reset objects between tests
ENHANCEMENT Changed DBField::create_field return type to `static` to support better type hinting
ENHANCEMENT i18nTextCollector supports __CLASS__
2017-02-09 15:28:59 +13:00
Daniel Hensby
71383b827d
Merge branch '3'
2017-02-08 12:34:45 +00:00
Daniel Hensby
4d3cd9d9a2
Merge branch '3.5' into 3
2017-02-08 10:40:40 +00:00
Andrew Aitken-Fincham
b8a0944bda
FIX/load fields if lazy ones exists
2017-02-08 08:52:48 +00:00
Damian Mooyman
c25c443d95
BUG Fix minor mysql 5.7 warning in SQLQueryTest ( #6608 )
...
Fixes #5451
2017-02-08 15:44:55 +13:00
Aaron Carlino
0982f77ec7
Feature/aggregate data filters ( #6553 )
2017-02-03 09:03:19 +13:00
Daniel Hensby
8c8231c03e
NEW Director::host() to determine host name of site
2017-01-31 21:36:04 +00:00
Daniel Hensby
873fd8c5bc
NEW replace _ss_environment.php with .env and environment vars
2017-01-31 20:40:17 +00:00
Daniel Hensby
a5da085cc7
Merge branch '3'
2017-01-31 17:03:53 +00:00
Daniel Hensby
669f6a3d41
Merge branch '3.5' into 3
2017-01-31 13:33:26 +00:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5
2017-01-31 13:33:00 +00:00
Damian Mooyman
7b26b4a1f3
BUG Ensure that tests run with flush=1 clean Flushables
...
BUG Restore opt-in flushing (regression from #4404 )
2017-01-31 18:59:19 +13:00
Damian Mooyman
609b0a612c
Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
...
Test fixes - reorder assertions and ensure string returned
2017-01-31 17:25:34 +13:00
Damian Mooyman
de02a3f733
Restored context parameter to i18n, and added to a “comment” key
...
Rolled pluralisation functionality into the i18n::_t() method
Warnings on missing default can now be turned off
2017-01-25 18:12:40 +13:00
Damian Mooyman
8a07c56bdf
API Replace i18n message localisation with symfony/translation
...
API Implement enhanced pluralisation
Remove Zend_Translate and all Zend dependencies from i18n
Deprecated $context from i18n::_t()
Warn on missing default string for i18n::_t()
2017-01-25 17:08:12 +13:00
Robbie Averill
3583f1f79e
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
2017-01-24 13:27:16 +13:00
Daniel Hensby
8b4cce435e
Merge branch '3'
2017-01-17 14:17:45 +00:00
Damian Mooyman
d192a4f86f
BUG Fix root folder getFilename() returning incorrect path ( #6510 )
2017-01-17 17:49:42 +13:00
Daniel Hensby
2ce80e448d
Merge branch '3.5' into 3
2017-01-16 21:00:14 +00:00
Stephan Bauer
17d123a3be
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing
2017-01-16 21:24:34 +01:00
Daniel Hensby
de7372ad3b
Test fixes - reorder assertions and ensure string returned
2017-01-16 14:46:22 +00:00
Damian Mooyman
7d67c5b9bd
API Allow users to act-as another
2017-01-16 09:04:20 +13:00
Stephan Bauer
1f1fffe734
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing ( fixes #6467 )
2017-01-14 23:13:47 +01:00
Daniel Hensby
f2470cc98d
Merge pull request #6459 from robbieaverill/feature/nofollow-robots-in-security
...
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
2017-01-13 12:38:04 +00:00
Daniel Hensby
c4972da37e
Merge pull request #6496 from robbieaverill/feature/remove-gridfield-components
...
API Enhancement: Allow "removeComponentsByType" to remove multiple component"s"
2017-01-13 11:29:04 +00:00
Robbie Averill
ce38f1f1fd
API Enhancement: Allow "removeComponentsByType" to remove multiple component"s"
2017-01-13 23:30:30 +13:00
Daniel Hensby
3ea5015f8b
NEW Move to SwiftMailer powered Emails ( #6466 )
...
* API Replace existing Email and Mailer classes with SwiftMailer powered email system
* DOCS New Email docs
* Initial feedback from Damian
* Making Mailer an interface
* Templates relocated
* Round of feedback
* More robust approach to plain parts
* Revert changes to TestMailer
2017-01-13 14:48:46 +13:00
Ingo Schommer
3b06e30558
Don’t add extension dot in FileNameFilter
...
File names are generally valid without an extension (although they might be disallowed by upload constraints),
so the filter should deal gracefully with them (“myfile” should return “myfile”, not “myfile.”)
2017-01-13 11:11:40 +13:00
Ingo Schommer
b1d5e97a3d
Enforce unique Folder names, use AssetNameGenerator
2017-01-13 11:11:37 +13:00
Daniel Hensby
747c0770e7
Merge pull request #6446 from robbieaverill/feature/controllers-without-underscores
...
API Allow controller discovery without underscores (PSR-2 compliance)
2017-01-11 15:27:56 +00:00
Damian Mooyman
6b5efb91fd
Merge pull request #6434 from open-sausages/features/4.0/ui-button-refresh
...
Refresh CMS UI buttons to new flat style and bootstrap classes
2017-01-11 14:22:25 +13:00
Robbie Averill
6fb49224b9
FIX SSViewer should resolve templates with or without underscores
...
* Capture fully qualified class name, without "Controller"
2017-01-11 09:59:28 +13:00
Robbie Averill
2f6f5b5eff
Do not send the header if it is not defined
2017-01-11 08:26:04 +13:00
Daniel Hensby
f3b6bb1470
Merge branch '3'
2017-01-10 14:31:07 +00:00
Daniel Hensby
733511565e
Merge branch '3.5' into 3
2017-01-10 12:52:06 +00:00
Damian Mooyman
9e563ebd3a
API Moved iShouldSeeAButton to behat-extension
2017-01-10 14:39:24 +13:00
Robbie Averill
cb2dcc75f1
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
2017-01-09 16:13:39 +13:00
Paul Clarke
178bd480eb
API Changes required for asset search behaviour
2017-01-09 14:55:20 +13:00
Damian Mooyman
3e32b18c6b
Merge pull request #6263 from dhensby/pulls/3/allow-unltd-grid-row-count
...
NEW Allow setting of unlimited row counts on GridFieldPaginator
2017-01-05 09:12:02 +13:00
Daniel Hensby
faccdef532
Merge pull request #6444 from robbieaverill/feature/add-group-tests
...
TEST Add Group tests for collating family IDs and getting all children
2016-12-29 23:41:31 +00:00
Robbie Averill
b4e183aba5
TEST Add Group tests for collating family IDs and getting all children
2016-12-30 11:27:52 +13:00
Daniel Hensby
776d2fbc66
NEW Allow setting of unlimited row counts on GridFieldPaginator
2016-12-29 14:10:13 +00:00
Robbie Averill
e8b959864e
TEST Add historical password count test
2016-12-30 00:43:14 +13:00
Robbie Averill
37a009289c
Consolidate temporary file creation and deletion logic.
2016-12-29 22:32:04 +13:00
Robbie Averill
7448622a1a
FIX Replace ini casting to int with explicit split and cast for PHP 7.1. Add tests.
2016-12-29 21:55:52 +13:00
Daniel Hensby
664c0eafbe
Merge branch '3'
2016-12-28 14:30:54 +00:00
Daniel Hensby
c8a40605ec
Merge pull request #6413 from volkerloew/1400-text-contextsummary
...
search term highlighting without altering case (fixes #1400 )
2016-12-28 13:36:08 +00:00
Volker Löw
5e581eace7
search term highlighting without altering case ( fixes #1400 )
2016-12-28 13:03:35 +00:00
Damian Mooyman
b1b3a6ee13
Merge 3.4 into 3.5
2016-12-22 13:18:37 +13:00
Damian Mooyman
94c3bc9fa1
Merge 3.4.3 into 3.4
2016-12-22 13:16:12 +13:00
Damian Mooyman
f314b86ad8
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-22 10:08:46 +13:00
Damian Mooyman
ffdb99e78d
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-21 18:55:00 +13:00
Damian Mooyman
9be5142fc1
API ChangeSet::publish() / canPublish() no longer treats hasChanges() = false as a permission error
...
BUG fix issues with doArchive() in live mode
2016-12-21 14:28:20 +13:00
Daniel Hensby
273a06d47d
TEST Duplicated DataObjects dont keep Created date value
2016-12-19 14:23:39 +00:00
Daniel Hensby
78ed003977
Merge branch '3.4' into 3.5
2016-12-19 10:48:10 +00:00
Damian Mooyman
c2a1e86f5d
Apply PSR2 / Namespace to remaining admin / tests
2016-12-19 16:08:19 +13:00
Damian Mooyman
c007e85d1b
BUG Suppress HtmlEditorField casting
...
Fixes #6396
2016-12-19 16:03:48 +13:00
Daniel Hensby
efd8114fd5
Merge branch '3.4' into 3.5
2016-12-16 15:52:53 +00:00
Daniel Hensby
f8132b39af
Assertions should be $this->assert($expected, $actual)
2016-12-13 11:32:52 +00:00
Damian Mooyman
6e589aac75
API Updates to Form, ValidationResponse, ValidationException
...
API Implement form schema "errors" handling
2016-12-09 14:24:11 +13:00
Sam Minnee
6650561dac
Don't use session and FormSchema to manage server-side React validation responses
2016-12-09 10:27:23 +13:00
Damian Mooyman
6b06fd9f2d
API Add buttonTooltop to PopoverField and fix critical positioning issue
2016-12-07 13:06:35 +13:00
Damian Mooyman
6107f45d1e
Temp patch to 5987 to prevent cms crashing
2016-11-30 11:20:22 +13: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
c6d43b477e
Merge branch '3'
2016-11-29 13:27:49 +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
Damian Mooyman
9ec1d35f2b
BUG Fix behat tests unable to capture HTML editor fields
2016-11-29 14:49:39 +13:00
Damian Mooyman
97d0fc61d8
API Include psr-2 checks in CI
2016-11-29 13:00:58 +13:00
Daniel Hensby
1be2e70a2a
Merge branch '3'
2016-11-24 14:18:09 +00:00
Damian Mooyman
22cb3d0d74
Fix various ORM test issues
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
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
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
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
Damian Mooyman
f43a91a4f8
API Add FormField::canSubmitValue()
...
API Add HTMLText::getProcessShortcodes() / setProcessShortcodes()
API Split TextareaField::Value() into ValueEntities() with shortcodes disabled
2016-11-17 09:55:03 +13:00
Daniel Hensby
8e5f786b8d
Merge branch '3.4' into 3.5.0
2016-11-15 11:43:16 +00:00
Daniel Hensby
3f4445641d
Merge branch '3.3' into 3.4
2016-11-15 11:35:38 +00:00
Daniel Hensby
c7778a1e9a
Merge branch '3.2' into 3.3
2016-11-15 11:19:27 +00:00
Daniel Hensby
06d0210233
Merge branch '3.1' into 3.2
2016-11-15 11:18:46 +00:00
Damian Mooyman
cc9d17063a
Add tests for FormField submission behaviour
...
Fix ReadonlyField casting with empty values
Restore Value() behaviour for TextareaField
2016-11-15 11:55:48 +13:00
Daniel Hensby
61e4055bdb
[SS-2016-010] FIX Cast FormField values as Text to prevent readonly fields embeding rogue HTML
2016-11-14 10:38:15 +00:00
Daniel Hensby
17108ff50c
Merge branch '3.4' into 3.5.0
2016-11-10 14:23:38 +00:00
Daniel Hensby
bcc21c2403
Merge branch '3'
2016-11-10 01:09:35 +00:00
Damian Mooyman
ebae480c66
BUG Fix regression in aggregate column lookup from #6199
2016-11-10 11:13:02 +13:00
Daniel Hensby
5a7cde0e10
Merge branch '3.4' into 3.5.0
2016-11-09 16:14:40 +00:00
Loz Calver
6bf36fbd30
FIX: Correct return type for Member::currentUser()
2016-11-09 14:20:44 +00:00
Damian Mooyman
eefecc21fc
BUG Fix incorrect include paths in tests and railsyml ( #6279 )
2016-11-03 14:41:19 +13:00
Damian Mooyman
ce10530f53
Merge pull request #6251 from open-sausages/pulls/4.0/schema-validation-rules
...
Implement client-side form validation feedback in React forms
2016-11-03 12:27:54 +13:00
Damian Mooyman
4ee78fc29d
BUG Restore travis artifacts ( #6277 )
...
Fixes #6046
2016-11-03 12:17:15 +13:00
Damian Mooyman
1142757c21
API Add 'validation' to form schema
2016-11-03 10:07:24 +13:00
Damian Mooyman
019e99dd4d
BUG Fix regressions from src folder creation ( #6272 )
2016-11-02 13:18:56 +13:00
Damian Mooyman
d7cb38434e
Create separate cms-config.yml for cms behat tests within framework
2016-11-02 10:54:09 +13:00
Damian Mooyman
6da36a9ed1
Fix some issues with tests
2016-11-02 09:11:35 +13:00
Damian Mooyman
c0c219e178
Fix invalid files_path
2016-11-01 17:55:43 +13:00
Damian Mooyman
5650254b53
NEW: Fixes to allow code files in src/ folder.
...
Separated from the file renames for clarity.
2016-11-01 16:35:32 +13:00
Chris Joe
82119888c1
Validation on server side for React forms ( fixes #6205 )
2016-10-28 16:13:29 +13:00
Damian Mooyman
1734e0d2a3
API Shorten overly-verbose invalid extension error ( #6231 )
...
Fixes #6198
2016-10-28 15:20:49 +13:00
Damian Mooyman
e386c6a153
FIX: Refactor bootstrap.php to allow for code sharing with cms bootstrap
2016-10-28 10:53:11 +13:00
Daniel Hensby
3859a1d7e7
Merge branch '3.4' into 3
2016-10-27 16:16:04 +01:00
Sam Minnee
7b44fc7bce
FIX: Fix SSViewerTest in PHP7
...
PHP7 is a bit more picky about passing values by reference.
2016-10-26 15:38:13 +13:00
Ingo Schommer
a4a895ff43
Merge pull request #6219 from open-sausages/pulls/4.0/fix-behat-search-chosen
...
BUG Prevent intermittent "Element is not currently visible and so may not be interacted with"
2016-10-25 17:33:22 +13:00
Damian Mooyman
ea6851fd70
API Rename _versions table to _Versions
...
API Support case-sensitive changes to tables
Fixes #2365
2016-10-25 13:27:21 +13:00
Damian Mooyman
e83f3962a1
BUG Prevent intermittent "Element is not currently visible and so may not be interacted with"
2016-10-25 10:42:13 +13:00
Damian Mooyman
316ac86036
API Writes to versioned dataobjects always writes to stage even when written on live
...
API Remove "Archive" actions
API "Delete" actions for pages now archives records
BUG Fix batch actions failing on certain controllers
Fixes #6059
2016-10-21 13:16:32 +13:00
Damian Mooyman
7cd32b7d72
Remove unnecessary $schemaLink parameter
2016-10-21 11:11:18 +13:00
Ingo Schommer
1e478a5378
Consistently set 'id' in FormSchema
...
The URL to request the schema representation is the unique identifier.
We can't default to $request->getURL() since that's different for form submissions.
The schema.schema_url key is redundant, since the identifier is already contained on the top level 'id' key.
Keeping schema_url in a schema itself makes it less portable, particularly once we transition into
generic schemas which are not reliant on a particular record context (that's only contained in the schema_url)
This also fixes the issue of form schemas not refreshing after submit,
e.g. when form fields are added or removed.
2016-10-20 15:33:50 +13:00
Damian Mooyman
840f275235
API Created a generic FormFactory interface ( #6178 )
...
Created a generic DataObject FormFactory interface that can be substituted in place of getCMSFields. Different FormFactories can depend on different kinds of context, such as
'Record' or 'Controller' - it's the responsibility of the code calling the factory to interpret and
supply this context.
The expected use-case is that rather than overriding getCMSFields(), developers can
change CMS UIs by manipulating the FormFactory associated with the given DataObject.
This is an experimental UI and may change before 4.0 stable is released.
2016-10-20 12:42:24 +13:00
Jonathon Menz
b0445f72e4
FIX Ambiguous column SQL error
...
Specify the table for the field we’re fetching, in case a joined table has a field with the same name
2016-10-18 21:35:37 -07:00
Daniel Hensby
9a6121c867
Merge branch '3.4' into 3
2016-10-16 22:56:37 +01:00
Daniel Hensby
8afff154b8
Merge pull request #6171 from open-sausages/pulls/4.0/use-changeset-for-publish
...
API Versioned::publishRecursive() now uses a ChangeSet
2016-10-16 14:45:23 +01:00
Damian Mooyman
f60fe7d4a9
API Versioned::publishRecursive() now uses a ChangeSet
...
API Add IsInferred to inferred changesets
API Add SapphireTest::assertNotDOSContains
Fixes #5667
2016-10-13 17:38:08 +13:00
Damian Mooyman
055795d4d1
API Support fixture paths relative to current directory
2016-10-13 16:53:30 +13:00
Daniel Hensby
4c7ba731be
Merge branch 'open-sausages/pulls/3.4/fix-checkbox-datalist' into 3.4
2016-10-11 20:16:33 +01:00
Damian Mooyman
7368deca8f
BUG Fix issue with SS_List as datasource for dropdown field
...
BUG Fix validation issue with CheckboxSetField
Fixes #6166
2016-10-11 14:58:48 +13:00
Damian Mooyman
27d35403e8
API Force formschema to be reloaded on form submission
...
BUG Fix missing action state
2016-10-07 13:26:57 +13:00
Damian Mooyman
92e34b7434
API controller::join_links supports array values
2016-10-07 13:25:56 +13:00
Damian Mooyman
cb24d199b6
API Convert fieldSpec options to bitwise operators ( #6161 )
...
Fixes #6159
2016-10-06 23:23:22 +01:00
Damian Mooyman
11bbed4f76
API Move many methods from DataObject to DataObjectSchema
2016-10-06 19:57:24 +13:00
Damian Mooyman
f0dd9af699
API Support named join alias for many_many through list
...
Add tests for sorting on joined alias
2016-10-06 17:39:48 +13:00
Damian Mooyman
e7303170c2
API Implement many_many through
...
API Remove DataObject::validateModelDefinitions, and move to DataObjectSchema
API Remove deprecated 3.0 syntax for addSelect()
API made DataList::createDataObject public
API Move component parsing logic to DataObjectSchema
API Remove support for triangular has_many / belongs_many relationships
2016-10-06 17:39:48 +13:00
Damian Mooyman
380d6523c5
API Cleaned up versioned status checks
2016-10-06 10:31:09 +13:00
Christopher Joe
287809ec3b
Refactored react FormFields to use react-bootstrap FormControl components
...
Addded Checkbox, CheckboxSet and Optionset (radio) fields
Refactored documentation
2016-10-05 10:25:21 +13:00
Jonathon Menz
797be6ac82
FIX Revert natural sort
...
More backwards compatible and more consistent with ORM sorting (fixes #6124 )
2016-10-04 13:56:12 -07:00
Loz Calver
cc68d336b1
Tests to cover caching repeated template lookups
2016-10-03 16:01:02 +01:00
Stephan van Diepen
95b66d19b2
Added MySQL support for Bigint.
...
Conflicts:
model/MySQLDatabase.php
2016-09-30 16:38:25 +01:00
Damian Mooyman
5a2e2b7ed5
Merge pull request #6089 from open-sausages/pulls/codecoverage
...
Code coverage via CodeCov.io
2016-09-27 10:23:30 +13:00
Ingo Schommer
9cb33ea5bf
Fixed @covers namespaces
2016-09-27 07:46:17 +13:00
Daniel Hensby
74ecaded08
Merge branch '3'
2016-09-26 14:00:58 +01:00
Andrew Aitken-Fincham
ad0d68d133
add IPUtils.php to control and implement symfony IpUtils ( #6062 )
2016-09-26 12:44:55 +13:00
Daniel Hensby
004bb8f03a
Merge pull request #5998 from sminnee/remove-bbcode
2016-09-23 15:28:30 +01:00
Damian Mooyman
65ff0a4d38
BUG Fix incorrect backslash escaping in htaccess template
2016-09-22 19:11:08 +12:00
Damian Mooyman
aa7a9565ce
BUG Fix incorrect ssviewertest path ( #6060 )
2016-09-22 18:03:14 +12:00
Ingo Schommer
60294654d9
Merge pull request #6056 from open-sausages/pulls/4.0/fix-file-validation
...
BUG Fix invalid file uploads not being validated
2016-09-22 16:22:01 +12:00
Damian Mooyman
e8375111b1
API Enable default value to be specified for dbstring types at the db level
...
Fixes #1409
2016-09-22 15:19:30 +12:00
Damian Mooyman
9a9cd97bc3
BUG Fix invalid file uploads not being validated
2016-09-22 14:55:06 +12:00
Sam Minnee
2e054af7b1
FIX: Throw more helpful error if tests are run badly.
...
If you run tests outside of a composer autoloader-based environment, or
your autoloader isn’t pulling in Constants.php, everything will break.
This provides a more helpful error message.
2016-09-21 09:43:14 +12:00
Sam Minnee
07396e4437
NEW: Move Travis behat test to run locally.
...
This shifts the behat test run to be triggered form composer activity
within the framework module directly,
* silverstripe/serve is used to provide a webserver, based on the
php -S command
* se/selenium-server-standalone is used to install selenium rather than
a download command
Because we’re using serve, the behat configuration can be locked down.
Further refinements could be made on this:
* the behat-extension could be responsible for installing and
starting/stopping selenium, making these tests more portable
* xvfb initialisation could be provided with another bin tool in the
begat-extension: vendor/bin/xvfb 1024x768
* The bootstrap-file argument to serve could be provided as part of a
composer.json setting. This would make it easier for developers to
start a dev server simply by running vendor/bin/serve
* the behat-extension could be responsible for installing and
starting/stopping silverstripe/serve, removing the need for
specifying base_url at all, and possibly utilising the same bootstrap
file between serve and behat.
2016-09-17 15:40:37 +12:00
Sam Minnee
61d7c3af28
FIX: Fix tests when running directly from framework.
2016-09-17 15:40:32 +12:00
Sam Minnee
9dd5ebee8c
NEW: Don’t set up SilverStripe project for test run
...
The SilverStripe project structure complicates the travis test run, and
the goal of this branch is to prevent it from being necessary.
- Unit tests can be run simply with PHPUnit.
- Behat test can be run with the silverstripe/serve module
Note that initially this commit doesn’t cater to the behat tests.
As part of this, we allow dev packages to be installed when testing
These settings don’t affect projects that use framework, only when
framework’s composer install / require calls are used themselves.
Since SS4 is pre-stable, these are important. They can probably be
removed once SS4 stable (and stable versions of support packages) have
been released.
2016-09-16 16:16:44 +12:00
Sam Minnee
93a0122c0f
FIX: Don’t treat URLs as root relative when FRAMEWORK_DIR = “”
...
Code was assuming that FRAMEWORK_DIR would always have a value. If it
doesn’t (because you’re running a test instance of a naked framework)
This caused URLs to be treated as root relative, which creates some
duplicate-inclusion bugs.
The use of ltrim() works, but is a bit clumsy. A more flexible approach
to including front-end assets of given modules would be preferable;
ideally something that also let you keep your code outside of the
web root.
2016-09-16 16:16:39 +12:00
Ingo Schommer
8f23fa99a5
API Moved CMS-specific JavaScript to admin/thirdparty
...
The 'admin' module will be split off from 'framework',
where 'framework' only provides (mostly) frontend-agnostic PHP classes.
For example, HTMLEditorField.php has a TinyMCEConfig.php driver,
but doesn't come with its own JS includes.
2016-09-16 13:46:10 +12:00
Ingo Schommer
7d67b24c25
API Removed legacy Jasmine JS Unit tests
...
They were used for TreeDropdownField JavaScript tests but were never run
on CI, hence have been a bit of a wasted effort.
We're using a different JS unit testing solution now (geared towards React),
and running Jasmine in parallel on Travis for a few test cases
doesn't warrant the setup effort involved.
The TreeDropdownField component will eventually move to a React solution
which can be developed in a test-driven fashion.
2016-09-16 13:46:10 +12:00
Daniel Hensby
a9df28c791
Merge branch '3.4' into 3
2016-09-14 11:40:15 +01:00
Christopher Joe
ee5b4fd8d3
Tabs support in new file/image editor
...
Introducing <Tabs> component based on react-bootstrap
Better support for nested fields in FormBuilder
Tweaks to get FormBuilder working with frameworktest BasicFieldsPage fields
Added exception in FormBuilder when Component is defined but not found
Added check in SingleSelectField for empty value before adding one in
Added temporary workaround for CompositeFields with no name (another story to address the actual problem)
Added asset_preview_height for File image preview, matches the defined CSS max-height
Added documentation to DBFile::PreviewLink() method
2016-09-14 14:08:59 +12:00
Sam Minnee
aecf5260fc
API: Remove TextParser and BBCodeParser
...
These have been archived at
https://github.com/silverstripe-archive/silverstripe-bbcodeparser
2016-09-14 09:10:49 +12:00
Damian Mooyman
c6457c50e9
API Allow has_many fixtures to be declared with array format as well as many_many ( #5944 )
...
BUG Fix issue with parsing of extrafields in fixtures
BUG Fix issue in duplicate relation name, and ensure FixtureBlueprint fails on these
2016-09-12 14:01:08 +01:00
Damian Mooyman
bfd9cb1aca
Rename SS_ prefixed classes ( #5974 )
2016-09-09 18:43:05 +12:00
Damian Mooyman
8dd644d25d
API Namespace all classes
...
Namespace all templates
Move difflib and BBCodeParser2 to thirdparty
Remove deprecated API marked for removal in 4.0
2016-09-08 10:23:17 +12:00
Daniel Hensby
918fb94396
Merge branch '3'
2016-09-07 09:31:23 +01:00
Daniel Hensby
3fd9fe3aa0
Merge branch '3.4' into 3
2016-09-07 09:22:06 +01:00
Ingo Schommer
3b71b7731a
Merge pull request #5943 from open-sausages/pulls/4.0/template-lookup-redux
...
API Update template lookup to late resolution for performance reasons
2016-09-06 20:27:11 +12:00
Damian Mooyman
efb004b72a
API use injector for DataObject::newClassInstance()
...
API Fail on invalid class type change
2016-09-06 14:10:51 +12:00
Damian Mooyman
c9b6e9bac0
API Update template lookup to late resolution for performance reasons
...
API Update behaviour of form fields to use standard template lookup mechanism
API Support custom "type" parameter to template lookup
2016-09-06 12:54:03 +12:00
Damian Mooyman
7105099497
API Change behaviour of filter API to support injected search filter classes
...
API Remove DataList::applyFilterContext(), superseded by DataList::createSearchFilter()
API SearchFilter::getSupportedModifiers() added to support supported modifier inspection
2016-09-05 17:28:36 +12:00
Damian Mooyman
fc353dc17a
API Allow has_many fixtures to be declared with array format as well as many_many ( #5944 )
...
BUG Fix issue with parsing of extrafields in fixtures
BUG Fix issue in duplicate relation name, and ensure FixtureBlueprint fails on these
2016-09-05 16:58:36 +12:00
Daniel Hensby
f2ed59e185
FIX Empty dmyfields on DateField now validate as true
2016-09-01 11:55:17 +01:00
Christopher Joe
d7663e850e
Remove duplicate props for PopoverField, added FormBuilder->handleAction and flattened state data
2016-08-28 13:07:30 +12:00
Daniel Hensby
1d1227cc9a
Merge branch '3'
2016-08-23 10:37:47 +01:00
Daniel Hensby
058f57979b
Merge branch '3.4' into 3
2016-08-22 16:23:22 +01:00
Daniel Hensby
060bf6b327
Merge branch '3.3' into 3.4
2016-08-22 16:22:37 +01:00
Daniel Hensby
088d88e978
Merge branch '3.2' into 3.3
2016-08-22 16:22:02 +01:00
Daniel Hensby
4998b80445
FIX ArrayList sorting now caseinsensitive
2016-08-22 11:21:50 +01:00
Damian Mooyman
59efd280ad
Fix issues with CMS permission codes
...
Standardise template locations
Move CMSSettingsController class to SiteConfig module
Fix CMSMenu behaviour for namespaced admin sections
Split classes into one per file
Manual fixes and cleanup
2016-08-17 11:19:14 +12:00
Damian Mooyman
db34e011f3
Apply SilverStripe\Admin namespace
2016-08-17 11:12:22 +12:00
Damian Mooyman
d88516203c
Merge 3.4 into 3
2016-08-15 19:05:20 +12:00
Damian Mooyman
bbc865ff67
Merge 3.4.1 into 3.4
2016-08-15 18:37:55 +12:00
Damian Mooyman
b0ba2015d9
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 15:53:21 +12:00
Damian Mooyman
049cdefacf
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 15:02:58 +12:00
Damian Mooyman
12a6b357e7
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 14:14:42 +12:00
Damian Mooyman
62a242154e
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 13:24:06 +12:00
Damian Mooyman
ed7fe65156
BUG Fix usage of $this as closure argument
2016-08-12 09:49:23 +12:00
Jonathon Menz
d4114b3dce
FIX include related fields on canFilter() check
...
closes #5576
2016-08-11 10:26:18 -07:00
Damian Mooyman
6005a1c2b2
API Upgrade for silverstripe CMS namespace changes
2016-08-11 11:51:02 +12:00
Damian Mooyman
7026da20db
BUG Make template lookup use 'type' correctly
2016-08-10 15:52:15 +12:00
Hamish Friedlander
0fa39b591f
Merge pull request #5874 from open-sausages/pulls/4.0/fix-incorrect-versioned-basetable
...
BUG Fix incorrect use of baseClass as baseTable
2016-08-10 07:17:44 +07:00
Damian Mooyman
cb1f4335a0
API remove DataFormatter class and all subclasses
...
Cleanup of #5461
2016-08-09 15:49:11 +12:00
Damian Mooyman
01a13dcba9
BUG Fix incorrect use of baseClass as baseTable
2016-08-08 17:44:46 +12:00
Damian Mooyman
7de5b998e1
Merge 3.4 into 3
2016-08-05 19:12:25 +12:00
Damian Mooyman
ca754eb887
Merge 3.3 into 3.4
...
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
2016-08-05 16:48:26 +12:00
Paul Clarke
b9445511b7
Bootstrap GridField
2016-08-03 18:35:18 +12:00
Daniel Hensby
e7c6509196
Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3
2016-08-02 12:00:04 +01:00
Damian Mooyman
4ca3d1dc94
API Allow custom 'type' option for scripts
...
Fixes #5829
2016-08-02 18:49:13 +12:00
Damian Mooyman
cd80d501f9
BUG Fix unset config options returning isset() = true
...
Fixes #4791
2016-08-02 18:07:55 +12:00
Damian Mooyman
9188628ae3
API Add $action parameter to Controller::Link
2016-08-02 10:27:55 +12:00
Damian Mooyman
7d0b8e6520
BUG Fix permission checking code not correctly handling escaped SQL identifiers
...
Fixes https://github.com/silverstripe/silverstripe-installer/issues/96
2016-08-01 18:15:30 +12:00
Sam Minnée
c5d662b4fe
Merge pull request #5832 from open-sausages/pulls/4.0/bootify-forms-addpage
...
Add page styles based on new bootstrap forms
2016-07-28 18:13:25 +12:00
Hamish Friedlander
4d2fd04c64
FIX Behat preview mode finder being too specific ( #5846 )
2016-07-28 17:59:31 +12:00
Damian Mooyman
6e74b57c36
BUG Fix issue with gulpfile.js not compiling client/src/legacy dir
...
BUG Make SelectionGroup.ss and SelectionGroup.js work together
BUG Fix for IE visual indentation of composite field
2016-07-28 16:32:40 +12:00
Damian Mooyman
20daf1f8e1
API Abstract ThemeManifest into ThemeList
...
BUG Fix Requirements not resolving $default theme
2016-07-21 12:11:25 +12:00
Daniel Hensby
f548ddf8a8
Merge branch '3'
2016-07-20 21:44:47 +01:00
Daniel Hensby
340a48306b
Merge branch '3.4' into 3
2016-07-20 19:48:17 +01:00
Daniel Hensby
cf247534d5
Merge branch '3.3' into 3.4
2016-07-20 19:43:41 +01:00
Daniel Hensby
96b061ffff
Merge branch '3.2' into 3.3
2016-07-20 19:41:46 +01:00
Daniel Hensby
ac17e12464
Merge pull request #3274 from colymba/custom-admin-url
2016-07-19 14:42:25 +01:00
Damian Mooyman
4b4aa4e91c
API Exclude templates in 'themes' directories from $default theme ( #5820 )
...
API $themes parameter is now mandatory in TemplateLoader::findTemplate()
2016-07-19 13:17:07 +12:00
madmatt
43dcde5197
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
2016-07-19 11:22:36 +12:00
Loz Calver
0a7e4cf7c3
Merge branch '3'
2016-07-15 16:01:48 +01:00
Loz Calver
391161208e
Merge branch '3.4' into 3
2016-07-15 14:34:50 +01:00
Loz Calver
44d7919496
Merge branch '3.3' into 3.4
2016-07-15 14:34:18 +01:00
Loz Calver
b3fea3723f
FIX: Fixes support for "inline" form actions ( fixes #2534 )
2016-07-15 10:11:47 +01:00
Sam Minnée
5c98d331a3
Merge pull request #5804 from open-sausages/feature/themestack
...
API Theme stacking
2016-07-15 17:12:54 +12:00
Hamish Friedlander
b8b4e98ac2
API Theme stacking
2016-07-15 16:29:25 +12:00
Damian Mooyman
5cb4ab4a82
API Add PopoverField for extra-actions popup in react
2016-07-15 15:46:11 +12:00
Daniel Hensby
a64a066bbf
Merge pull request #5665 from tractorcow/pulls/3.3/fix-button-clicked
...
BUG Fix buttonClicked() error
2016-07-15 00:30:25 +01:00
Daniel Hensby
b7fc0a2752
Merge pull request #5790 from patricknelson/issue-5784-email-reply-to
...
FIX for #5784 : Email API improvements, documentation cleanup.
2016-07-15 00:23:25 +01:00
Patrick Nelson
74c555e004
FIX for #5784 : Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards.
2016-07-14 10:25:40 -07:00
Daniel Hensby
d19955afc8
Merge branch '3'
2016-07-14 14:05:18 +01:00
Daniel Hensby
4c40cf8dbb
Merge branch '3.4' into 3
2016-07-14 12:01:19 +01:00
Daniel Hensby
d766c8559b
Merge branch '3.3' into 3.4
2016-07-14 11:57:15 +01:00
Damian Mooyman
83c2af72ca
BUG Fix some regressions from #5653 ( #5806 )
2016-07-14 14:43:53 +12:00
Damian Mooyman
3b43145954
Merge pull request #5735 from silverstripe-terraformers/versions
...
FIX: Saving null values to the _versions table.
2016-07-14 13:30:30 +12:00
Damian Mooyman
26d46517ac
API Remove custom DBHTMLText::exists() custom behaviour
...
Fix merge regressions
2016-07-13 18:45:57 +12:00
Damian Mooyman
6a7c1056fe
BUG Fix shortcode parsing in HTMLEditorField::getanchors()
...
Fixes #5678
2016-07-13 17:15:45 +12:00
Damian Mooyman
b7ac5c564d
API / BUG Fix DBField summary methods
...
Cleanup DBField subclasses
Fixes #2929
Fixes #1381
Fixes #5547
Fixes #1751
2016-07-13 17:15:45 +12:00
Damian Mooyman
5c9044a007
API Enforce default_cast for all field usages
...
API Introduce HTMLFragment as casting helper for HTMLText with shortcodes disabled
API Introduce DBField::CDATA for XML file value encoding
API RSSFeed now casts from the underlying model rather than by override
API Introduce CustomMethods::getExtraMethodConfig() to allow metadata to be queried
BUG Remove _call hack from VirtualPage
API Remove FormField::$dontEscape
API Introduce HTMLReadonlyField for non-editable readonly HTML
API FormField::Field() now returns string in many cases rather than DBField instance.
API Remove redundant *_val methods from ViewableData
API ViewableData::obj() no longer has a $forceReturnObject parameter as it always returns an object
BUG Fix issue with ViewableData caching incorrect field values after being modified.
API Remove deprecated DB class methods
API Enforce plain text left/right formfield titles
2016-07-13 17:15:45 +12:00
Damian Mooyman
a0213aa2bf
BUG Fix HTTP url rewriting
2016-07-13 17:15:45 +12:00
Frank Mullenger
6d835a64ad
FIX: Saving null values to the _versions table.
2016-07-13 16:48:42 +12:00
Damian Mooyman
24efc7edf8
BUG Fix sorting ArrayList with sql-like syntax
...
Replaces #5726
2016-07-12 17:00:17 +12:00
Daniel Hensby
5776a03141
Merge branch '3'
2016-07-11 23:45:41 +01:00
Florian Thoma
9fc51dc527
add async and defer attributes to js requirements, replaces #4555
2016-07-08 14:31:39 +10:00
Daniel Hensby
8a21d53a07
Merge branch '3.4' into 3
2016-07-07 10:28:49 +01:00
Daniel Hensby
55e1fd8782
Merge branch '3.3' into 3.4
2016-07-07 10:28:17 +01:00
Daniel Hensby
ce47f8112b
Merge branch '3.2' into 3.3
2016-07-07 10:27:25 +01:00
Loz Calver
27cea80b15
FIX: SS_ConfigStaticManifest_Parser failed to handle ::class syntax ( fixes #5701 ) ( #5781 )
2016-07-07 10:23:38 +01:00
Damian Mooyman
af22a83166
API Apply Framework\Security namespace
2016-07-07 11:32:28 +12:00
Chris Joe
dfe375e87e
Fix MemberDatetime helper description, and shifted them to templates ( #5766 )
...
* Fix MemberDatetime helper description, and shifted them to templates
* added descriptionTemplate for setting the description
* Unit test for description with templates
2016-07-06 09:16:27 +01:00
Daniel Hensby
a449045b09
Merge branch '3.4' into 3
2016-07-04 23:54:27 +01:00
Daniel Hensby
c35dc508cb
Merge branch '3.3' into 3.4
2016-07-04 23:53:55 +01:00
Daniel Hensby
dfc557afd4
Merge branch '3.2' into 3.3
2016-07-04 23:43:44 +01:00
Daniel Hensby
39238d908e
FIX falsey attribute values in shortcodes now work
2016-07-04 15:17:24 +01:00
Daniel Hensby
765f45eaf1
Check for shortcode tag before trying to parse shortcodes
2016-07-04 15:10:42 +01:00
Daniel Hensby
2cdfe6cc21
FIX Use RAW for DBField template helpers
2016-07-04 14:39:56 +01:00
Daniel Hensby
b0f237bb3a
FIX Use RAW instead of Value for parsing shortcodes
2016-07-04 13:53:56 +01:00
Damian Mooyman
4dadc276b5
Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt
...
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
2016-07-04 17:35:47 +12:00
Christopher Joe
1931ed497f
Fix unit test for xml content check
2016-07-04 17:25:53 +12:00
Ingo Schommer
ff846134f2
Merge pull request #5734 from open-sausages/pulls/4.0/namespace-orm
...
API Apply Framework\ORM Namespace to model
2016-07-01 15:04:47 +12:00
Daniel Hensby
9b061edb44
Merge pull request #5605 from open-sausages/pulls/3.3/fix-cmsall-perm
...
BUG fix CMS_ACCESS permission being ignored if in incorrect order in array
2016-06-29 15:25:21 +01:00
Daniel Hensby
f728b144ca
Merge branch '3'
2016-06-29 11:44:18 +01:00
Daniel Hensby
390b1fc6c4
Merge branch '3.4' into 3
2016-06-29 11:43:02 +01:00
Daniel Hensby
2ab0dcf618
Merge branch '3.3' into 3.4
2016-06-29 11:42:05 +01:00
Daniel Hensby
da0b62f853
Merge branch '3.2' into 3.3
2016-06-29 11:40:58 +01:00
Daniel Hensby
3fe8d30c2c
Merge branch '3.1' into 3.2
2016-06-29 11:40:27 +01:00
Hamish Friedlander
80d4af6b6e
API Apply Framework\ORM Namespace to model
2016-06-29 10:02:32 +12:00
Damian Mooyman
fd9f29c515
Merge pull request #5732 from open-sausages/pulls/4.0/convert-lowercase
...
Convert::upperCamelToLowerCamel()
2016-06-29 09:48:35 +12:00
Daniel Hensby
c11ac5d248
Merge pull request #4162 from kinglozzer/pulls/object-parse-class-spec
...
FIX: Object::parse_class_spec failed to parse associative arrays
2016-06-28 16:07:12 +01:00
Damian Mooyman
f1a0aef0d7
BUG fix CMS_ACCESS permission being ignored if in incorrect order in array
2016-06-28 17:45:15 +12:00
Damian Mooyman
24bea79cd9
Merge pull request #5481 from mikenz/file-name-filter-test
...
Explictly set the FileNameFilter replacements before testing them
2016-06-28 17:03:19 +12:00
Ingo Schommer
fd0c8ad4c0
Convert::upperCamelToLowerCamel()
...
Used to expose lowercase web service object keys in SS4,
without requiring an explicit field mapping for these.
The first use case is exposing File data:
[ID => 99, FileName => 'test'] becomes {"id": 99, "fileName": "test"} in JSON.
2016-06-23 12:27:54 +12:00
Hamish Friedlander
51d53f4b50
Merge pull request #5646 from open-sausages/pulls/4.0/config-table-name
...
API Allow table_name to be declared / introduce DataObjectSchema
2016-06-14 15:06:38 +12:00
Daniel Hensby
9e3f76832b
Merge branch '3'
2016-06-13 13:41:20 +01:00
Daniel Hensby
0d36899afa
Merge branch '3.4' into 3
2016-06-13 12:30:33 +01:00
Daniel Hensby
4e392a4d43
Merge branch '3.3' into 3.4
2016-06-13 12:30:16 +01:00
Damian Mooyman
5e8ae41d47
API Refactor dataobject schema management into separate service
...
API Allow table_name to be configured via Config
2016-06-08 13:22:56 +12:00
Damian Mooyman
bf00810e1f
BUG Fix buttonClicked() error
...
Fixes #3208
2016-06-08 12:26:11 +12:00
Loz Calver
429ce55756
FIX: ViewableData::setFailover() didn't remove cached methods
2016-06-07 16:17:49 +01:00
Sam Minnee
a9eebdc7ed
NEW: Allow namespaces in template include statements.
2016-06-07 14:36:00 +12:00
Sam Minnee
65eb0bde6a
API: Look for templates of namespaced classes in subfolders.
...
This change will mean that SilverStripe\Control\Controller will look for its
template in templates/SilverStripe/Control/Controller.ss.
In order to preserve some backwards campatibility, non-namespaced classes
can have the templates stored in any template subfolder, but once you
add a namespace to a class, the namespaced path expression will need to
be a subfolder of <module>/templates or themes/<theme>/templates.
Layout and Content templates are stil supported as special template type,
Includes still functions but is a no-op. Other template subfolders should
not be used.
2016-06-07 14:36:00 +12:00
Loz Calver
946495bcf5
FIX: Regression with <% with / %> ( fixes #5656 )
2016-06-06 10:14:07 +01:00
Nick
dae2295e16
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
2016-06-05 00:05:37 +01:00
Antony Thorpe
39d1ef7a4b
Bugfix: BulkLoader_Result class - Deleted Items ( #5598 )
...
* Bugfix: BulkLoader_Result class - Deleted Items
The Deleted function, within BulkLoader_Result class, calls mapToArrayList, which tries to find the recently deleted dataobjects.
To correct:
- when calling addDeleted, store a map of each dataobject within the $this->deleted array; and,
- have the Deleted function return an ArrayList based upon the $this->deleted array.
* Added tests
- created a new test file for the BulkLoader_Result class
- included tests for other methods of this class
- slightly altered the addDeleted function to be consistent other methods of this class
2016-06-01 09:55:06 +12:00
Simon Erkelens
20fac04637
RFC #5487 Remove Oembed in favor of embed/embed. ( #5536 )
2016-05-27 13:09:03 +12:00
Daniel Hensby
e5f1ca3bbe
Cleaning up Controller::handleRequest
...
1. Separated responsibility of handleAction so that it no longer bootstraps the controller and cleans up after the request is handled.
2. NEW beforeHandleRequest to take responsibility of bootstrapping the controller
3. NEW afterHandleRequest to take responsibility of cleanup for the controller
4. NEW calling init on controllers deprecated in favour of callInit() which takes responsibility of enforcing that "base init" is called and the before and after hooks
5. NEW Added prepareResponse to Controller for dealing with responses from controllers
6. NEW setResponse added to controller for setting response objects on the controller
2016-05-23 00:21:04 +01:00
Damian Mooyman
decd7e5c57
BUG Fix getFinalisedQuery not including all queried columns
...
Fixes #1669
2016-05-23 08:41:58 +12:00
Daniel Hensby
cdb0b07345
Merge branch '3'
2016-05-20 14:20:33 +01:00
Daniel Hensby
be7e0db26e
Merge pull request #3835 from dnadesign/hideFromHierachy3
2016-05-19 11:52:47 +01:00
Damian Mooyman
b634b1a67d
Merge pull request #5537 from IgorNadj/patch-niceformats
...
ENH: moving hardcoded nice date/time formats to config
2016-05-19 14:12:22 +12:00
Damian Mooyman
6035be7e57
Merge pull request #5548 from kinglozzer/4661-extrafields-casting
...
FIX: castingHelper failed to find many_many_extraFields data (fixes #4661 )
2016-05-19 14:10:37 +12:00
Damian Mooyman
574bc6038b
Merge 3 into master
...
# Conflicts:
# CONTRIBUTING.md
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.EditForm.js
# admin/javascript/LeftAndMain.js
# admin/scss/_forms.scss
# dev/Debug.php
# docs/en/05_Contributing/01_Code.md
# forms/DropdownField.php
# model/DataObject.php
# model/Versioned.php
# model/fieldtypes/DBLocale.php
# tests/forms/gridfield/GridFieldExportButtonTest.yml
# tests/model/MoneyTest.php
# tests/model/MoneyTest.yml
# tests/model/SQLQueryTest.php
2016-05-18 18:36:10 +12:00
Damian Mooyman
303f695751
Merge 3.3 into 3
...
# Conflicts:
# admin/javascript/LeftAndMain.EditForm.js
2016-05-18 17:29:30 +12:00
Damian Mooyman
dad7981332
Merge 3.2 into 3.3
2016-05-18 17:27:28 +12:00
Damian Mooyman
8dfeeb0eb6
Merge 3.1 into 3.2
2016-05-18 17:25:42 +12:00
Hamish Friedlander
d350aa4153
Merge pull request #5555 from open-sausages/pulls/3.1/fix-display-errors
...
BUG Fix suppression of display_errors in ErrorControlChain
2016-05-18 16:04:57 +12:00
Damian Mooyman
62bd26d11a
BUG Fix suppression of display_errors in ErrorControlChain
2016-05-18 13:36:54 +12:00
Damian Mooyman
8ed25ae482
BUG Fix DataObject::isChanged() detecting non saveable changes ( #5545 )
2016-05-18 09:00:04 +10:00
Loz Calver
7a81372294
FIX: castingHelper failed to find many_many_extraFields data ( fixes #4661 )
2016-05-17 16:04:28 +01:00
Damian Mooyman
8947bb0245
BUG Fix filtersOnId ignoring WHERE "ID" IN () ( #5546 )
2016-05-17 18:30:33 +12:00
Shawn Lin
2a856300c0
Fix bug, export button cannot export value '0'
2016-05-16 16:49:10 +12:00
John Milmine
c401d9daff
new added hide_from_cms_tree and hide_from_hierarchy
2016-05-16 16:20:14 +12:00
Damian Mooyman
4d1ddf0e62
BUG Prevent session hijackers from resetting a user password
...
BUG Member::checkPassword incorrect for default admin
2016-05-16 10:54:18 +12:00
Igor Nadj
c8eda9fd5c
ENH: moving hardcoded nice date/time formats to config
...
Old PR: #4449
2016-05-15 21:25:57 +12:00
Daniel Hensby
8ebdedf330
Merge pull request #5488 from robbieaverill/bugfix/4835-array-to-string
...
Fix for array to string conversion in DropdownField
2016-05-13 13:54:04 +01:00
Robbie Averill
7d7800e5e7
Fix for array to string conversion in DropdownField
...
* Resolves #4835
* Add unit test to cover array values
* Add value assertion
2016-05-13 10:11:42 +12:00
Daniel Hensby
0594542e7f
Merge branch '3'
2016-05-12 16:42:48 +01:00
Daniel Hensby
19a4a40d8b
Merge branch '3.3' into 3
2016-05-12 16:25:22 +01:00
Daniel Hensby
264d7e8ffe
Merge branch '3.2' into 3.3
2016-05-12 16:23:57 +01:00
Daniel Hensby
e8962b95d0
Merge branch '3.1' into 3.2
2016-05-12 16:05:54 +01:00
Loz Calver
5b275376d3
Many many bug
2016-05-12 12:38:04 +01:00
Daniel Hensby
dd554d883f
Proving bug with Deep nested many_many relations
...
When adding a filter to a many_many with a shared inheritance, the FROM table is removed and added as a LEFT JOIN which causes a syntax error.
This means `$dataList->filter('ManyManyRel.ID', array(1,2))` doesn't work.
2016-05-12 12:38:02 +01:00
Damian Mooyman
f13e44a265
Merge 3 into master
...
# Conflicts:
# admin/javascript/LeftAndMain.Tree.js
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/en.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# css/GridField.css
# forms/gridfield/GridFieldExportButton.php
# javascript/GridField.js
# javascript/lang/ar.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/en.js
# javascript/lang/en_GB.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# scss/GridField.scss
# tests/model/ManyManyListTest.php
# tests/model/SQLQueryTest.php
2016-05-11 15:19:35 +12:00
Damian Mooyman
4f06a43986
Merge 3.3 into 3
...
# Conflicts:
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# javascript/lang/fr.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# lang/it.yml
2016-05-11 14:06:23 +12:00
Damian Mooyman
b165d52f30
Merge 3.2 into 3.3
2016-05-11 14:00:10 +12:00
Damian Mooyman
9da594b326
Merge 3.1 into 3.2
...
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/ar.js
# javascript/lang/bg.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fa_IR.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# lang/nl.yml
# lang/sk.yml
2016-05-11 13:48:22 +12:00
Damian Mooyman
01eaf9ed64
Merge 3.3.2 into 3.3
2016-05-11 13:33:45 +12:00
Damian Mooyman
b612c0549d
Merge 3.1.19 into 3.1
2016-05-11 13:15:10 +12:00
Daniel Hensby
971d561633
Allow ManyManyListTest to run standalone
2016-05-10 15:24:07 +01:00
Daniel Hensby
c97d3961e5
Merge pull request #4869 from kinglozzer/2617-include-scopes
...
FIX: Parameters passed to includes overwrite all scopes (fixes #2617 )
2016-05-10 15:21:45 +01:00
Daniel Hensby
d5ff8ff5f3
Merge pull request #5499 from kinglozzer/sqlselect-count-int
...
FIX: SQLSelect count methods now cast to int (fixes #5498 )
2016-05-10 13:44:30 +01:00
Daniel Hensby
63e363b55c
Merge pull request #5461 from Firesphere/master
...
RFC #5347 remove RestfulService from SS4.
2016-05-10 12:51:01 +01:00
Loz Calver
d1df67d308
FIX: SQLSelect count methods now cast to int ( fixes #5498 )
2016-05-10 12:31:45 +01:00
Loz Calver
6430c66303
Merge pull request #5426 from tractorcow/pulls/3.3/fix-gridfield-autocomplete
...
BUG Fix GridFieldAddExistingAutocompleter
2016-05-10 09:34:59 +01:00
