3585 Commits

Author	SHA1	Message	Date
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
Loz Calver	196c211984	Merge pull request #5425 from tractorcow/pulls/4.0/error-invalid-relationships ... API Filtering on invalid relation is no longer a silent error	2016-05-10 09:27:31 +01:00
Simon Erkelens	c0de5dd11e	RFC #5347 remove RestfulService from SS4. Rebuild OEmbed on using curl	2016-05-10 18:55:08 +12:00
Craig Weber	e732aee6eb	Fixes #3182 Fixes lazy loading of fields when query was created in default stage ... When a DataObject query is created in the default stage (stage.Stage), then the stage is changed to something else (stage.Live), the query itself runs correctly against stage.Stage. However, lazy loaded fields incorrectly run against stage.Live. This is due to DataQuery parameters not being saved when the default stage is active. This commit fixes this bug by always saving query params, even when the default stage was active at the time of query creation.	2016-05-10 15:44:22 +12:00
Cochrane, Mike	faffdf4981	Explictly set the FileNameFilter replacements before relying on them	2016-05-09 20:12:29 +12:00
Cochrane, Mike	e2d180a754	Explictly set the FileNameFilter replacements before testing them	2016-05-09 20:03:58 +12:00
Damian Mooyman	8b94dd83df	API Add CSRF to Campaign delete	2016-05-09 17:33:10 +12:00
Frank Mullenger	b4cd617ee3	FIX: Renaming to HTMLEditorConfig. ... FIX: Renaming to HTMLEditorField*. FIX: Renaming to HTMLEditorSanitiser*.	2016-05-06 14:16:34 +12:00
Daniel Hensby	d1751e3310	Merge remote-tracking branch '3.2.4' into 3.3.2	2016-05-05 12:33:21 +01:00
Daniel Hensby	cf29b2c146	Merge remote-tracking branch '3.1.19' into 3.2.4	2016-05-05 11:17:45 +01:00
Daniel Hensby	b11bbffb7d	Merge branch '3'	2016-05-04 23:36:10 +01:00
Daniel Hensby	457931d664	Merge branch '3.3' into 3	2016-05-04 23:32:10 +01:00
Loz Calver	24660afabd	FIX: Parameters passed to includes overwrite all scopes (fixes #2617)	2016-05-04 16:49:12 +01:00
Loz Calver	4bd9a04896	Merge pull request #5440 from tractorcow/pulls/4.0/api-explicit-injector-inheritance ... API Injector dependencies no longer inherit from parent classes	2016-05-04 09:31:51 +01:00
Damian Mooyman	4bc04e795a	Excuse php7 errors due to regressions in 7.0.6	2016-05-04 16:33:40 +12:00
Christopher Darling	220290d61c	test to prove #5222	2016-05-04 12:05:02 +12:00
Damian Mooyman	8ce3d90e18	API Injector dependencies no longer inherit from parent classes automatically ... API Allow classes to inherit service definitions explicitly	2016-05-03 18:39:31 +12:00
Damian Mooyman	0d4c71f393	API Filtering on invalid relation is no longer a silent error ... Fixes #5331	2016-05-03 17:51:16 +12:00
Damian Mooyman	f88d708ee9	BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton ... Based on https://github.com/silverstripe/silverstripe-framework/pull/5426 Fixes #5267	2016-05-03 17:45:46 +12:00
Damian Mooyman	70480f5ee4	[ss-2015-027] FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs ... Fixes #4947	2016-05-03 15:29:18 +12:00
Damian Mooyman	096f30ebe5	BUG Fix GridFieldAddExistingAutocompleter ... This fix exchanges references to sub-components by ID with class references Fixes #5382	2016-05-03 14:28:41 +12:00
Damian Mooyman	e7d5c92ec1	Fix merge regressions	2016-05-02 09:08:37 +12:00
Damian Mooyman	d52db0ba34	Merge 3 into master ... # Conflicts: # .travis.yml # admin/css/ie7.css # admin/css/ie7.css.map # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.js # admin/scss/_style.scss # admin/scss/_uitheme.scss # control/HTTPRequest.php # core/Object.php # css/AssetUploadField.css # css/AssetUploadField.css.map # css/ConfirmedPasswordField.css.map # css/Form.css.map # css/GridField.css.map # css/TreeDropdownField.css.map # css/UploadField.css # css/UploadField.css.map # css/debug.css.map # dev/Debug.php # docs/en/00_Getting_Started/00_Server_Requirements.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md # filesystem/File.php # filesystem/Folder.php # filesystem/GD.php # filesystem/Upload.php # forms/ToggleField.php # forms/Validator.php # javascript/lang/en_GB.js # javascript/lang/fr.js # javascript/lang/src/en.js # javascript/lang/src/fr.js # model/Image.php # model/UnsavedRelationList.php # model/Versioned.php # model/connect/MySQLDatabase.php # model/fieldtypes/DBField.php # model/fieldtypes/Enum.php # scss/AssetUploadField.scss # scss/UploadField.scss # templates/email/ChangePasswordEmail.ss # templates/forms/DropdownField.ss # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php # tests/forms/EnumFieldTest.php # tests/security/MemberTest.php # tests/security/MemberTest.yml # tests/security/SecurityTest.php	2016-04-29 17:50:55 +12:00
Daniel Hensby	8673ac15bc	MINOR Empty YAML config causes invalid argument error	2016-04-26 12:58:27 +01:00
Loz Calver	61a9b2a41a	FIX: GridFieldPaginator now prevents viewing pages with no results (fixes #3192)	2016-04-26 09:34:03 +01:00
Damian Mooyman	da8f4a7eb6	Merge pull request #3828 from dhensby/pulls/byids-arraylist ... API `byIDs` added to `ArrayList`	2016-04-26 17:52:22 +12:00
David Craig	7fcdf35438	Add DetailEditForm to Campaign admin ... - Add edit form to campaigns section - Handle form submissions with FormBuilder - Handle form state via Redux - Garbage collect form state - Removes $itemID as a required param for schema requests. Developers should be able to scaffold forms without populating values from an existing record. For example when building a form for creating new records.	2016-04-26 15:32:07 +12:00
Daniel Hensby	679185514d	Merge 3.3 into 3 ... Conflicts: admin/css/screen.css.map	2016-04-26 00:24:59 +01:00
Daniel Hensby	745faebd81	Merge 3.2 into 3.3 ... Conflicts: .travis.yml	2016-04-26 00:17:09 +01:00
Daniel Hensby	a0812f987a	Merge 3.1 into 3.2 ... Conflicts: admin/javascript/LeftAndMain.js control/HTTPRequest.php docs/en/00_Getting_Started/00_Server_Requirements.md	2016-04-26 00:09:33 +01:00
Damian Mooyman	daf5385833	API Change in behaviour to flysystem reporting for root folders ... See 847841974f	2016-04-26 09:36:08 +12:00
Damian Mooyman	8b239a5011	Docs and tests for exempt validation actions	2016-04-22 14:52:38 +12:00
Damian Mooyman	fa5b8b8fb1	BUG Fix error when modals are displayed	2016-04-22 10:31:49 +12:00
JorisDebonnet	9eac541740	Enhance GD::greyscale to allow darker or lighter results, and change color weights for greyscale (#5332) ... Tweaking the first three parameters (R, G, B) allows you to get a different mix of colors into grey, but it does not allow you to make the result lighter or darker because their total is normalized. This is quite a common operation on greyscaled images though, so I added a fourth parameter: brightness. It defaults to 100% so that it does not have any effect when not used (making this backwards compatible). $brightness = 50 will make it darker, $brightness = 150 will overlight it.	2016-04-21 19:26:46 +12:00
Jeffrey Guo	4f14175022	setup CMS Settings in one test step	2016-04-20 22:40:04 +12:00
Ingo Schommer	8cf38720b5	Fix Chosen.js selector for Behat feature ... The recent upgrade to Chosen.js 1.5 changes the generated markup: It still renders an <a> tag, but without the "href" attribute. This attribute isn't actually required to uniquely identify the link in this structure.	2016-04-20 13:52:51 +12:00
Daniel Hensby	f32c893546	[SS-2016-005] FIX Apply brute force protection to default admin	2016-04-19 23:20:29 +01:00
Damian Mooyman	0bd62735bc	BUG Fix issue with Requirements mangling custom scripts (#5337) ... API Remove deprecated $template parameter from Requirements::includeInHTML	2016-04-19 17:20:30 +12:00
Daniel Hensby	52226dc462	Merge pull request #5322 from tractorcow/pulls/5105 ... fix to support facebook autodiscover	2016-04-15 14:27:19 +01:00
Hamish Friedlander	9a5db5f760	Fix ChangeSet test mixing Object ID and ChangeSetItem ID up	2016-04-15 14:42:32 +12:00
Hamish Friedlander	35e642d0bf	Add two new accessors to ChangeSetItem ... You shouldn't have to worry about exactly formatting the reference to get a ChangeSetItem related to a DataObject, and doing it that way makes you vulnerable to breakages like introduced in previous API change	2016-04-15 14:42:24 +12:00
Hamish Friedlander	2d16d69ddb	API Use base data class for ChangeSetItem#ObjectClass, not just ClassName ... This is a data structure change, but makes ChangeSetItems less likely to break on /dev/build where a ClassName changes	2016-04-15 14:41:26 +12:00
Damian Mooyman	6f548a0ed0	Add unit tests for oembed autodiscover and thumbnail detection	2016-04-15 14:00:10 +12:00
Roman Schmid	9146450c49	Fix Email test issue discovered in #5271. ... Updated/added tests for changed- and forgot-password Emails. Updated fixture and tests to no longer use a real Email address.	2016-04-11 13:46:41 +02:00
Daniel Hensby	d7289a17fc	Merge pull request #5271 from bummzack/5244-remove-email-subclasses ... Fix 5244: Removed Email Subclasses	2016-04-08 17:09:44 +01:00
Roman Schmid	ca4036b882	Removed Email Subclasses used by the Member class (Member_ChangePasswordEmail and Member_ForgotPasswordEmail). ... Added a test for the forgot password email. Improved the test for the change-password email. Fixed issue where `SapphireTest::mailer` was cleared during `setUp` by moving instantiation of the mailer at the end of the `setUp` method. No longer use deprecated i18n method in test-setup. Replace potentially real Email Address with a fake one.	2016-04-06 09:54:17 +02:00
Ingo Schommer	f0906f6e92	Merge pull request #5261 from tractorcow/pulls/4.0/fixup-tinymce ... BUG fix missing language on non-global TinyMCE Configs	2016-04-06 19:32:55 +12:00
Damian Mooyman	3c2b53157e	API Update Versioned methods	2016-04-04 14:50:16 +12:00
Damian Mooyman	87ee4365e7	API Implement ChangeSets for batch publishing	2016-04-04 14:46:38 +12:00
Damian Mooyman	640691f544	BUG fix missing language on non-global configs ... BUG Prevent external plugins from being passed to the minifier API Change TinyMCEConfig::requireJS to getScriptURL() for testabilitiy	2016-04-04 09:59:31 +12:00
Damian Mooyman	6ec2656201	BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false ... Fixes #5250	2016-04-01 11:04:06 +13:00
Damian Mooyman	d8d005d1e2	BUG move test file to correct folder and fix class_exists	2016-03-31 17:06:23 +13:00
Damian Mooyman	e8a68c42ce	BUG Prevent live manifest loading files from nested test directories ... E.g. framework/admin/tests	2016-03-31 15:58:23 +13:00
Damian Mooyman	0fa7271ec2	Merge pull request #5239 from open-sausages/pulls/4.0/form-schema-fixes ... Form schema fixes	2016-03-31 09:49:55 +13:00
Ingo Schommer	fb660225c2	Behat: Wait until CMS loading overlay is removed ... This makes tests more robust at the expense of an additional check with every step. The "ajax steps" logic works similarly, but does not respect the loading indicator. While this logic waits for a short time after ajax requests are finished, in some cases that isn't enough time for the browser to process the response and remove the loading indicator. Since the "ajax steps" logic applies to operations outside of the CMS as well, we can't add the loading indicator check there.	2016-03-29 17:24:47 +13:00
Ingo Schommer	7ba4b5b6ef	Merge pull request #5241 from timkung/pulls/upload-validator-filesize-spelling ... BUG changing all cases of filesize spelling to file size	2016-03-29 16:15:27 +13:00
Ingo Schommer	1049288cb5	Merge pull request #5240 from madmatt/pulls/fix-dbstringtest-annotations ... MINOR: Fix PHPUnit @covers assertions for DBStringTest	2016-03-29 16:13:50 +13:00
Tim Kung	7907d20da7	BUG changing all cases of filesize spelling to file size	2016-03-29 13:38:24 +13:00
Hamish Friedlander	700cf9bd56	Merge pull request #5223 from tractorcow/pulls/4.0/transactions ... API Add SS_Database::withTransaction for nice enclosed transactions	2016-03-29 10:54:04 +13:00
Ingo Schommer	8ae2894890	Fix form schema ID getter ... Also moved keys of higher importance to start of array, easier to review this way	2016-03-28 21:54:24 +13:00
madmatt	41a3a86862	MINOR: Fix PHPUnit @covers assertions for DBStringTest ... This resolves issues when PHPUnit is run strictly, where it exits when it hits an @covers annotation that references a method that doesn't exist	2016-03-26 17:58:28 +13:00
madmatt	c972692313	MINOR: Fix PHPUnit @covers assertions for GridFieldTest ... This resolves issues when PHPUnit is run strictly, where it exits when it hits an @covers annotation that references a method that doesn't exist	2016-03-26 11:55:01 +13:00
Damian Mooyman	8abede1339	API Add SS_Database::withTransaction for nice enclosed transactions	2016-03-24 09:57:07 +13:00
Damian Mooyman	094745ec0f	API Formally support custom ownership relations ... API 'owned_by' is no longer mandatory for relations backed by normal db relations API Extension setOwner/clearOwner is now nested	2016-03-23 14:49:34 +13:00
Roman Schmid	25c453fe7b	Fixed issue where canViewVersioned caused a DB error when Versioned was used with stages other than the default "Stage" and "Live". ... Updated VersionedTest to also check an Object with a single stage in the canView test.	2016-03-22 09:42:21 +01:00
Sam Minnee	aeccb8b8e0	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace ... API: Deprecate SS_Datetime. The DBField subclasses are have all been renamed to start with “DB” and be in the SilverStripe\Model\FieldType namespace. To keep DataObject definitions concise, the original short variations of their names are preserved as service definitions. Most of the field generation code doesn’t need to change, but where field classes are referenced directly, changes will be needed. SS_Datetime, which is commonly referenced outside the model system itself, has been preserved as a subclass of DBDatetime. This has been marked as deprecated and can be removed in SilverStripe 5. A few places that referred to $db and $casting values weren’t using the Injector to instantiate the relevant classes. This meant that the remapping we have created as part of moving classes into a namespace didn’t work.	2016-03-22 18:09:30 +13:00
Sam Minnee	262f487053	MINOR: Avoid access-changing subclass in test. ... Using a subclass to change the visibility of protected items didn’t seem necessary in this case, if we add a reasonably logical getter method.	2016-03-22 17:39:09 +13:00
Sam Minnee	083799ec03	FIX: Minimal data-model changes to support PHP7. ... The tidiest fix for this will be to update the namespace/naming of all field types to follow this pattern. I’ve broken out the minimum necessary to support PHP7 as its own commit, in case anyone needs to backport that (e.g. if someone wanted to patch a SS 3 system to get PHP7 support). Rather than introduce a new API for fieldtype namespace simplification, I’ve just used Injector. We may come up with a new configuration tool that is better, but this has the advantage of existing now, and as such I think is a good first step.	2016-03-22 17:39:08 +13:00
Damian Mooyman	78f19bd2ed	Merge pull request #5175 from Firesphere/pulls/feature-set-owner-allmethods ... Enhancement: Set the owner on an extension	2016-03-21 17:30:37 +13:00
Simon Erkelens	debe8ba2a3	Improvement: Set the owner on an extension, before getting all the available method names. ... This enhances the extensions to enable certain features like adding wrapper methods instead of having to have them on the object itself.	2016-03-21 02:36:34 +01:00
Ingo Schommer	8ae794ee99	API TinyMCE Image shortcodes	2016-03-21 09:23:40 +13:00
Joris Debonnet	4c741125c5	fix #5195: allow empty values in Enum	2016-03-17 22:43:26 +01:00
Damian Mooyman	0848aca462	API Massive refactor of Versioned ... API Implemented recursive versioned actions (publish, etc) API Un-deprecate delete batch action API Changed Versioned getters and setters for stages BUG Inject query parameters during DataObject construction to prevent incorrect lazy loading	2016-03-17 13:43:53 +13:00
Damian Mooyman	3dada00905	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
Damian Mooyman	6d88caa9b3	Merge pull request #5132 from open-sausages/features/form-schema ... API Form schema	2016-03-07 14:08:36 +13:00
Ingo Schommer	3b11d73c46	Merge remote-tracking branch 'origin/3' ... # Conflicts: # forms/gridfield/GridFieldDetailForm.php # javascript/GridField.js	2016-03-07 09:26:35 +13:00
Ingo Schommer	e1fcc64c41	Form field schema state ... See https://github.com/silverstripe/silverstripe-framework/issues/4938	2016-03-03 13:36:48 +13:00
David Craig	404ac4ae43	Initial schemaState implementation	2016-03-03 08:20:54 +13:00
David Craig	afccef718c	Initial Form Field Schema implementation ... - Adds FormSchema class - Adds FormSchema dependency to LeftAndMain via Injector - Adds schema allowed_action method to LeftAndMain for generating Form schemas - Adds FormFieldSchemaTrait to for schema getters and setters on FormFields	2016-03-03 08:20:54 +13:00
Daniel Hensby	817b836870	FIX getIP from behind a load-balancer that adds many IPs to the header	2016-03-01 21:07:48 +00:00
Damian Mooyman	b196d33bfa	API Ownership API ... API Filter Relation. query parameters from relations when creating objects API Versioned::publish now triggers invokeWithExtensions API Update behaviour of versioned for all_versions mode to respect ID filters API Tweak behaviour of inherited query parameters	2016-02-29 14:38:44 +13:00
Damian Mooyman	e1865151c5	Merge pull request #5098 from bummzack/5086-fix-member-validator ... Fix for issue #5086	2016-02-26 14:39:53 +13:00
Ingo Schommer	e88c3c8098	Merge pull request #5094 from tractorcow/pulls/4.0/invokewithextensions ... API Extensible::invokeWithExtension has same method signature as Extensible::extend	2016-02-26 13:09:40 +13:00
Roman Schmid	f691a5da32	Improve Member_Validator to: ... - properly check for existing members. - allow extensions. - remove old code and replace with new syntax and add config API. Fix issue in Group code where Member_Validator was instantiated via "new" which didn't allow injector overrides. Added unit-tests. Establish a link between the member and the validator for said member.	2016-02-25 16:10:52 +01:00
Damian Mooyman	c275c21057	API Extensible::invokeWithExtension has same method signature as Extensible::extend	2016-02-25 17:32:41 +13:00
Damian Mooyman	0ee1564896	BUG Fix deprecated API usage in DataFormatter API and DataObjectTest ... PHPDoc Cleanup API DataFormatter::convertStringToArray is now abstract	2016-02-25 17:10:09 +13:00
Damian Mooyman	3b0a9f4ba2	Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss	2016-02-25 14:51:59 +13:00
Daniel Hensby	2fdc96a0de	Update PHPUnit from 3.7 to 4.8	2016-02-24 21:42:20 +13:00
Damian Mooyman	9fed5561f4	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # core/Constants.php # dev/DevelopmentAdmin.php	2016-02-24 17:39:04 +13:00
Damian Mooyman	5f2d3f31d7	Merge remote-tracking branch 'origin/3.2' into 3.3 ... # Conflicts: # dev/DevelopmentAdmin.php # docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md # lang/cs.yml # lang/lt.yml	2016-02-24 17:29:06 +13:00
Damian Mooyman	ff5ed6efeb	Merge remote-tracking branch 'origin/3.2.2' into 3.2	2016-02-24 17:03:43 +13:00
Damian Mooyman	013524af50	[ss-2016-002] Ensure Gridfield actions respect CSRF	2016-02-24 11:47:15 +13:00
Damian Mooyman	e2c77c5a8f	[ss-2016-002] Ensure Gridfield actions respect CSRF	2016-02-24 11:33:53 +13:00
Tyler Kidd	375bbf954e	Enhancement and fix for issue #3186	2016-02-23 14:53:52 -06:00
Ingo Schommer	589fee1a8a	Removed obsolete TestRunner->$skipTests flag ... Taken care of by the default PHPUnit implementation of markTestSkipped()	2016-02-23 22:29:58 +13:00
Ingo Schommer	d1af214ef5	API Removed custom dev/tests/ execution ... Rely on standard vendor/bin/phpunit via CLI instead. See https://github.com/silverstripe/silverstripe-framework/issues/4254 - Not disabling xdebug. That should be harmful, and is actively harming test development - No longer able to specifically skip tests via the `SkipTests` request parameter. Use phpunit.xml groups and the `--exclude-group` CLI argument instead - No longer able to specify multiple comma-separated module folders. use phpunit.xml groups and the `--group` CLI argument instead - Not explicitly calling `SSViewer::flush_template_cache()` (was never the case on running `phpunit` CLI anyway, and shouldn't be required any more)	2016-02-23 20:19:35 +13:00
Damian Mooyman	510c556739	API File has Versioned extension ... API Improved support for versioned DataObject API GridField extensions for versioned dataobjects API De-couple File and ErrorPage API File::handle_shortcode now respects canView() API AssetControlExtension is now able to delete, publish, or protect files API Upload now protects new assets by default	2016-02-23 13:46:28 +13:00
Damian Mooyman	65a0981c08	BUG Correct behaviour of publish with $createNewVersion = true ... Fixes #5040 Cleanup code to make behaviour more apparent	2016-02-23 10:15:49 +13:00
Damian Mooyman	f20ad434ce	API Update TinyMCE to 4.x ... API Allow HtmlEditorField to be individually configured BUG Fix incorrect change detection BUG Fix missing i18n files	2016-02-23 10:10:02 +13:00
Damian Mooyman	56e92f5a32	[ss-2016-002] Ensure Gridfield actions respect CSRF	2016-02-18 17:28:54 +13:00
Damian Mooyman	829135a85a	API remove Object::useCustomClass ... API Broke out Injectable, Configurable, and Extensible from Object into traits BUG Fix missing extraDataObjects in tests	2016-02-17 10:22:04 +13:00
Jean-Fabien Barrois	bab1f230bf	NEW Cross device "Remember Me" feature ... At the moment, using the "Remember me" function on more than one device will only work with the last device used. Previous devices will not auto login. This PR introduces a new DataObject for storing hashed tokens against multiple devices. Developers can configure if logging out should discard all tokens, or only the one used on the device logging out; token expiry date is 90 days by default but configurable. For added security, the old behaviour can still be enforced if multiple tokens are not desired. See silverstripe#1574 for additional background	2016-02-10 09:42:08 +13:00
Mark Stephens	3fcf1e2c98	BUG edge case on many many extra fields (fixes 4991) ... Fixes an edge case where extraFields are not returned if one side of a many many is added via extension (although this may not be the only failure case). Fixes a downstream issue with dms breaking the CMS on framework 3.2. The bug is where a many many relationship exists on a class, and a sub-class attempts to get the extra fields of the relationship. The change fixes the test for exact matching of the relationship class to the instance class, to checking if the instance is the class or a subclass of the relationship. The unit tests check the dms failure case, which is a more complex failure case.	2016-02-04 12:47:07 +13:00
Damian Mooyman	6cebffd89b	BUG Fix SSViewerTest not restoring old requirements ... BUG Fix incorrect js path in UploadField.php Restore changes missing from merge	2016-01-26 11:39:53 +13:00
David Craig	2140025c20	Implement RFC-7 JavaScript module loader ... - Adds ES6 support via Babel - Transforms existing JavaScript to UMD modules - Adds module bundling via Browserify - Existing JavaScript converted to UMD modules - lib.js and leftandmain.js are bundled using browserify - JavaScript minifying of bundles handed by gulp	2016-01-26 11:39:20 +13:00
Daniel Hensby	e74665b639	Merge pull request #4964 from tractorcow/pulls/4.0/tomap-standardise ... API Standardise SS_List::map() implementation	2016-01-25 13:31:05 +00:00
Damian Mooyman	69c9ad1428	Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/scss/_style.scss # css/AssetUploadField.css # css/GridField.css.map # docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md # lang/fi.yml	2016-01-25 16:15:41 +13:00
Damian Mooyman	e091bb8474	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # admin/scss/_forms.scss # admin/scss/_style.scss # tests/model/VersionedTest.yml	2016-01-25 15:57:37 +13:00
Damian Mooyman	7c448bb4a2	Merge remote-tracking branch 'origin/3.2' into 3.3 ... # Conflicts: # tests/model/DataObjectLazyLoadingTest.php # tests/model/VersionedTest.yml	2016-01-25 14:11:37 +13:00
Damian Mooyman	e77389d0c8	API Standardise SS_List::map() implementation ... Fixes #1593	2016-01-25 10:22:47 +13:00
Damian Mooyman	f8ce2d7631	Merge pull request #4973 from dhensby/pulls/multibyte-char-fix ... Remove question marks, equal signs and hashes	2016-01-25 10:00:07 +13:00
assertchris	c66f973fce	Replaced obsolete mime types	2016-01-24 18:15:47 +13:00
Daniel Hensby	119bd2f873	Merge pull request #4845 from tractorcow/pulls/3/extension-hook-byref ... API before/afterExtend now support parameters passed by reference	2016-01-22 16:08:20 +00:00
Damian Mooyman	bf8bf5e4d5	BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects ... Document correct configuration of Versioned DataObjects Fixes #4936	2016-01-22 15:35:58 +13:00
Daniel Hensby	612772728e	Merge pull request #4962 from tractorcow/pulls/4.0/defaultclass ... API Refactor out Page default classname hack	2016-01-21 22:40:28 +00:00
Jarkko Linnanvirta	cf8e9f2427	Test removing some bad characters when multibyte is allowed	2016-01-21 12:57:50 +02:00
Damian Mooyman	5138bf1b7f	API Refactor out Page default classname hack ... Fixes #1932	2016-01-21 17:12:55 +13:00
Damian Mooyman	bdb1a95758	API Cleanup and refactor of select fields ... API Standardise Relation interface	2016-01-21 15:40:19 +13:00
Damian Mooyman	df76d783fe	BUG Fix VersionedTest sometimes failing given certain querystring arguments	2016-01-20 14:49:46 +13:00
Damian Mooyman	e6b877df27	Merge remote-tracking branch 'origin/3' ... # Conflicts: # control/Director.php # control/HTTP.php # core/startup/ParameterConfirmationToken.php # docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md # docs/en/00_Getting_Started/04_Directory_Structure.md # docs/en/00_Getting_Started/05_Coding_Conventions.md # docs/en/01_Tutorials/01_Building_A_Basic_Site.md # docs/en/01_Tutorials/02_Extending_A_Basic_Site.md # docs/en/01_Tutorials/03_Forms.md # docs/en/01_Tutorials/04_Site_Search.md # docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md # docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md # docs/en/02_Developer_Guides/13_i18n/index.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md # docs/en/03_Upgrading/index.md # docs/en/changelogs/index.md # docs/en/howto/customize-cms-menu.md # docs/en/howto/navigation-menu.md # docs/en/index.md # docs/en/installation/index.md # docs/en/installation/windows-manual-iis-6.md # docs/en/misc/contributing/code.md # docs/en/misc/contributing/issues.md # docs/en/misc/module-release-process.md # docs/en/reference/dataobject.md # docs/en/reference/execution-pipeline.md # docs/en/reference/grid-field.md # docs/en/reference/modeladmin.md # docs/en/reference/rssfeed.md # docs/en/reference/templates.md # docs/en/topics/commandline.md # docs/en/topics/debugging.md # docs/en/topics/email.md # docs/en/topics/forms.md # docs/en/topics/index.md # docs/en/topics/module-development.md # docs/en/topics/modules.md # docs/en/topics/page-type-templates.md # docs/en/topics/page-types.md # docs/en/topics/search.md # docs/en/topics/testing/index.md # docs/en/topics/testing/testing-guide-troubleshooting.md # docs/en/topics/theme-development.md # docs/en/tutorials/1-building-a-basic-site.md # docs/en/tutorials/2-extending-a-basic-site.md # docs/en/tutorials/3-forms.md # docs/en/tutorials/4-site-search.md # docs/en/tutorials/5-dataobject-relationship-management.md # docs/en/tutorials/building-a-basic-site.md # docs/en/tutorials/dataobject-relationship-management.md # docs/en/tutorials/extending-a-basic-site.md # docs/en/tutorials/forms.md # docs/en/tutorials/index.md # docs/en/tutorials/site-search.md # main.php # model/SQLQuery.php # security/ChangePasswordForm.php # security/MemberLoginForm.php # tests/control/ControllerTest.php # tests/core/startup/ParameterConfirmationTokenTest.php # tests/model/SQLQueryTest.php # tests/security/SecurityTest.php # tests/view/SSViewerTest.php # view/SSTemplateParser.php # view/SSTemplateParser.php.inc # view/SSViewer.php	2016-01-20 13:16:27 +13:00
Damian Mooyman	8e4db95f72	Fix merge regressions	2016-01-19 17:08:40 +13:00
Damian Mooyman	8c1cafd1a0	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # admin/scss/_forms.scss # admin/scss/_style.scss # admin/scss/_tree.scss # javascript/TreeDropdownField.js	2016-01-19 17:08:26 +13:00
Damian Mooyman	5d240feaec	Merge remote-tracking branch 'origin/3.2' into 3.3	2016-01-19 15:08:24 +13:00
Damian Mooyman	46cbe809ac	Merge remote-tracking branch 'origin/3.1' into 3.2 ... # Conflicts: # docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md # docs/en/02_Developer_Guides/14_Files/01_Image.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md # docs/en/03_Upgrading/index.md # docs/en/05_Contributing/01_Code.md # forms/TreeMultiselectField.php # security/Permission.php	2016-01-19 14:00:19 +13:00
Damian Mooyman	8e1ae55ff6	API Enable single javascript files to declare that they include other files	2016-01-15 09:49:28 +13:00
Damian Mooyman	738e1db756	Update Nginx rules ... Prevent disclosure of secure assets	2016-01-13 18:18:22 +13:00
Damian Mooyman	037467beae	API Asset Access Control implementation	2016-01-13 18:18:22 +13:00
Daniel Hensby	2dd8d5e518	Fixing anchor selection	2016-01-12 17:35:06 +00:00
Sam Minnee	4aa50534d5	FIX: Fixes needed to adapt to whitespace changes. ... API: Whitespace trimmed from custom form field templates The introduction of trailing newlines on all template files introduced some changes that needed to be made. Notably, whitespace has been trimmed from rendered form field templates. This is the minimal impact to SilverStripe developers, as it preserves the behaviour of the default field types, but I’ve still noted as a change.	2016-01-07 14:17:57 +13:00
Sam Minnee	3ee8f505b7	MINORE: Remove training whitespace. ... The main benefit of this is so that authors who make use of .editorconfig don't end up with whitespace changes in their PRs. Spaces vs. tabs has been left alone, although that could do with a tidy-up in SS4 after the switch to PSR-1/2. The command used was this: for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+ find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//' done	2016-01-07 10:15:54 +13:00
Loz Calver	c9ba0e48fc	NEW: Add ViewableData::setFailover() to refresh detected methods when changing failover	2016-01-06 15:19:33 +00:00
Daniel Hensby	4335d8ed22	FIX Members with no ID inherit logged in user permission	2016-01-05 08:16:18 +00:00
Damian Mooyman	bb09340605	Merge pull request #4876 from SilbinaryWolf/remove-validation-from-lookupfield ... Added unit test to ensure LookupField can't save into a DataObject	2016-01-05 10:18:36 +13:00
Jake Ben	c07dcaa3af	Added unit test to ensure LookupField can't save into a DataObject	2015-12-24 14:30:50 +11:00
Damian Mooyman	fce82519bd	BUG Workaround for issues in testing version	2015-12-22 17:47:53 +13:00
Damian Mooyman	19b10044ec	Merge remote-tracking branch 'origin/3.2' into 3	2015-12-22 17:05:07 +13:00
Damian Mooyman	66b3a6a2c5	Merge pull request #4840 from mateusz/guard ... BUG Guard against users being added to all groups on unsaved Group.	2015-12-22 16:29:09 +13:00
Damian Mooyman	48a30909f3	Merge remote-tracking branch 'origin/3.2' into 3 ... # Conflicts: # admin/javascript/LeftAndMain.BatchActions.js # css/UploadField.css # forms/HtmlEditorField.php	2015-12-22 14:07:52 +13:00
Loz Calver	d265c9b733	FIX: Allow omitting a value for OptionsetField submissions (fixes #4824)	2015-12-14 16:50:22 +00:00
Loz Calver	9467ab9a7e	NEW: Implement unshift() in field list classes (closes #4834)	2015-12-14 16:18:57 +00:00
Damian Mooyman	62f183d037	API before/afterExtend now support parameters passed by reference ... Closes #4810	2015-12-14 10:10:45 +13:00
Mateusz Uzdowski	5a21b2fb15	BUG Guard against users being added to all groups on unsaved Group. ... If ->Members()->add() is called on an unsaved group (with ID 0), the collateFamilyIDs() will errorneously return all root Groups thinking it's looking for Groups with ParentID=0. As a result, the Member will be added to all root groups, instead of just the selected group and all its children.	2015-12-11 14:51:51 +13:00
Ingo Schommer	0175167761	Merge pull request #4830 from open-sausages/pulls/3/fix-querystring-stage ... API Disable unauthenticated get parameter access to site stage mode	2015-12-10 10:44:43 +13:00
Damian Mooyman	fa0160a874	BUG Fix regression in canViewStage	2015-12-09 14:53:21 +13:00
Hamish Friedlander	1eda9151a4	Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview ... API Create default security permission model for versioned data objects	2015-12-09 14:17:27 +13:00
Damian Mooyman	6089a7c5bd	API Create default security permission model for versioned data objects	2015-12-09 11:33:53 +13:00
Marcus Nyeholt	fc5e584201	Format for SS3 using tabs instead of spaces	2015-12-08 15:19:24 +11:00
Damian Mooyman	38e154af0a	API Disable get parameter access to site stage mode ... BUG Fix missing and undocumented response from Security::permissionFailure()	2015-12-07 17:39:18 +13:00
Marcus Nyeholt	f7c270a3ba	NEW Use Config for determining Vary header ... Existing implementation hardcodes the Vary header; swap to using Config layer instead Added test for changing the variable from config	2015-12-02 10:28:24 +11:00
Daniel Hensby	b694829084	Merge pull request #4812 from tractorcow/pulls/4.0/api-composite-sort ... API Enable DataList::sort to support composite field names	2015-11-30 23:54:45 +00:00
Damian Mooyman	c13b5d989f	API Enable advanced configuration options for requirements combined files ... API Enable relative root paths for the default Flysystem AssetAdapter	2015-12-01 11:07:13 +13:00
Damian Mooyman	641c26299c	API Enable linear-only restriction for DataList::applyRelation ... API Remove DataList::getRelation	2015-12-01 09:58:27 +13:00
Damian Mooyman	2b1e5ee071	API Enable DataList::sort to support composite field names (similar to filter)	2015-12-01 09:35:33 +13:00
Damian Mooyman	ce28259c5f	API Replace CacheGeneratedAssetHandler with FlysystemGeneratedAssetHandler ... API Reduce GeneratedAssetHandler API API Re-introduce Requirements::delete_all_combined_files(); API Re-introduce Requirements::flush() API Combined files now uses new filenames distinguished by sha1 of sources	2015-11-26 16:12:05 +13:00
Christopher Darling	e9b833f5f0	FIX: ConfirmedPassword field correctly reports mismatching passwords ... added testFormValidation to prove #4780	2015-11-20 15:56:27 +00:00
Loz Calver	68d99be24b	FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773)	2015-11-17 16:34:17 +00:00
Damian Mooyman	fd6ae72e1d	Merge remote-tracking branch 'origin/3.2.1' into 3.2	2015-11-16 16:39:15 +13:00
Hamish Friedlander	b61d6dcd57	[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs	2015-11-13 15:20:09 +13:00
Damian Mooyman	fea1158d19	BUG Fix print button only displaying first page	2015-11-12 14:59:08 +13:00
Damian Mooyman	245e0aae2f	[ss-2015-026]: BUG Fix FormField error messages not being encoded safely	2015-11-11 17:50:02 +13:00
Ingo Schommer	ac4342d81d	[ss-2015-022]: XML escape RSSFeed $link parameter	2015-11-11 17:46:39 +13:00
Damian Mooyman	97f21fddb3	[ss-2015-021] Fix rewrite hash links XSS	2015-11-11 17:46:27 +13:00
Damian Mooyman	bc1b2893ac	[ss-2015-026]: BUG Fix FormField error messages not being encoded safely	2015-11-11 16:56:19 +13:00
Ingo Schommer	4f55b6a115	[ss-2015-022]: XML escape RSSFeed $link parameter	2015-11-11 16:54:04 +13:00
Damian Mooyman	132e9b3e2f	[ss-2015-021] Fix rewrite hash links XSS	2015-11-11 16:52:53 +13:00
Damian Mooyman	0272e443f4	BUG Prevent dev/build continually regenerating Number field type	2015-11-11 09:21:50 +13:00
Daniel Hensby	d380252488	Merge pull request #4760 from tractorcow/pulls/3.2/fix-empty-filter ... BUG Correct behaviour for empty filter array (as per 3.1)	2015-11-10 01:48:47 +00:00
muskie9	603caccb90	ENHANCEMENT CurrencyField to use Currency.currency_symbol ... fixes #4035 I have limited experience with regex, so I hope I did it correctly. I was able to save/save & publish with the curent regex and the values look good.	2015-11-09 19:38:51 -06:00
Damian Mooyman	732e705bbf	BUG Correct behaviour for empty filter array (as per 3.1)	2015-11-10 14:24:45 +13:00
Will Morgan	6d85d618b6	Merge pull request #4751 from dhensby/pulls/plural-fix ... Fixing issue where words ending ay/ey/iy/oy/uy are not pluralised correctly	2015-11-06 16:55:25 +00:00
Daniel Hensby	dad3784621	Fixing issue where words ending ay/ey/iy/oy/uy are not pluralised correctly	2015-11-06 16:23:45 +00:00
Daniel Hensby	ef35c2bb6b	Merge pull request #4457 from tractorcow/pulls/4.0/no-query ... API Remove SQLQuery	2015-11-03 16:41:07 +00:00
Garion Herman	6a1a3bf182	Corrected TotalItems() method to use Count(). Added test coverage. (fixes #4646)	2015-11-04 00:20:45 +13:00
Damian Mooyman	1e1a7a345c	Merge remote-tracking branch 'origin/3' ... Conflicts: control/Director.php filesystem/File.php filesystem/GD.php filesystem/ImagickBackend.php forms/HtmlEditorField.php javascript/UploadField_uploadtemplate.js model/Image.php model/Image_Backend.php model/fieldtypes/Enum.php templates/AssetUploadField.ss tests/model/ImageTest.php tests/search/FulltextFilterTest.php	2015-11-03 14:23:16 +13:00
Damian Mooyman	c4dc10b255	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: forms/DropdownField.php tests/model/ImageTest.php	2015-11-03 13:06:39 +13:00
Damian Mooyman	2813f94124	BUG Ensure that filters on any fixed field are scoped to the base data table ... Fixes #4700	2015-10-30 16:26:14 +13:00
Damian Mooyman	db16248b9a	BUG Fix broken InlineFormAction	2015-10-29 10:48:49 +13:00
Damian Mooyman	d1ea74e40d	API Implement AssetField to edit DBFile fields	2015-10-23 16:57:44 +13:00
Damian Mooyman	3e7eecf978	API Remove SQLQuery	2015-10-23 16:26:04 +13:00
Damian Mooyman	e17a49f8a5	API Restore JS Minification ... BUG Fix incorrect cache on CacheGeneratedAssetHandler	2015-10-23 14:14:38 +13:00
Ingo Schommer	f252cfad20	Merge pull request #4680 from open-sausages/features/dbfile-generated-files ... API Generated files API	2015-10-23 13:19:56 +13:00
Damian Mooyman	fe3d23f0d4	BUG Fix GeneratedAssetHandler crashing on expired resources	2015-10-23 11:46:58 +13:00
Damian Mooyman	f9892c628c	API Generated files API ... API Refactor Requirements_Backend to use new APL	2015-10-23 10:07:48 +13:00
Loz Calver	977642daa9	Remove Spyc YAML library ... Also had to fix some fixture files - none of the YAML spec versions actually support tabs anyway	2015-10-19 17:07:34 +01:00
Daniel Hensby	1974e79d71	Allow multi-line enum declarations	2015-10-15 16:23:19 +01:00
Damian Mooyman	d884c859d1	BUG Fix file link tracking for new asset abstraction	2015-10-15 12:15:00 +13:00
Damian Mooyman	be239896d3	API Refactor of File / Folder to use DBFile ... API Remove filesystem sync API to handle file manipulations	2015-10-13 11:57:39 +13:00
Patrick Nelson	f192a6ecaf	FIX #4392: Ensure headers are checked first before being clobbered by globally maintained state. Also ensuring tests utilize separate responses for isolation.	2015-10-09 13:50:33 -04:00
Daniel Hensby	95ae107c4c	Merge pull request #4486 from uniun/patch-2 ... BUGFIX. FulltextFilter requires table identifiers in match query	2015-10-07 10:28:15 +01:00
Elvinas L.	630062c0e0	Removed whitespaces	2015-10-07 09:33:02 +03:00
Elvinas L.	19c754bf9a	Fixed tests	2015-10-06 18:59:39 +03:00
Damian Mooyman	df805af67b	BUG Imagick tests compare image dimensions rather than image hashes	2015-10-06 16:35:44 +13:00
Damian Mooyman	b8335793d6	Merge pull request #4620 from kinglozzer/pulls/manymanyextrafields-compat ... FIX: GridFieldDetailForm failing to save many_many relations	2015-10-06 11:49:56 +13:00
Loz Calver	1aa1d65932	Merge pull request #4610 from tractorcow/pulls/3/suppress-custom-theme ... Minor: Suppress custom themes in Formtest	2015-09-24 16:17:11 +01:00
Sam Minnée	9fdd8f43db	Merge pull request #4627 from tractorcow/pulls/4.0/trait-autoloading ... API Support trait loading	2015-09-24 15:02:14 +12:00
Damian Mooyman	ac27836d2b	API Implementation of RFC-1 Asset Abstraction	2015-09-24 12:57:28 +12:00
Damian Mooyman	f26c220d86	API Support trait loading	2015-09-24 11:57:45 +12:00
Nicola Fontana	c39cf2d55f	Do not hang on nested parameters in search context	2015-09-23 09:12:02 +02:00
Loz Calver	0d89a13c2d	FIX: GridFieldDetailForm failing to save many_many relations	2015-09-22 14:46:57 +01:00
Damian Mooyman	10dece653f	API Consolidate DataObject db methods ... BUG Fix namespace and getField on composite fields	2015-09-22 10:38:12 +12:00
Damian Mooyman	9872fbef4d	API Refactor CompositeDBField into an abstract class ... API Refactor ClassName into DBClassName API Update PolymorphicForeignKey to use new CompositeDBField and DBClassName CompositeDBField is now an interface to nested fields on an underlying dataobject, allowing field manipulation to be performed at the field and dataobject level without having to synchronise them manually.	2015-09-22 10:28:07 +12:00
Damian Mooyman	e97b14ea65	Minor: Suppress custom themes in Formtest	2015-09-17 14:23:52 +12:00
Damian Mooyman	34b71cf6c8	Merge remote-tracking branch 'origin/3'	2015-09-15 13:42:17 +12:00
Damian Mooyman	71b8aec306	Merge remote-tracking branch 'origin/3.2' into 3	2015-09-15 13:35:51 +12:00
Damian Mooyman	c4710b2272	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: admin/code/GroupImportForm.php admin/code/MemberImportForm.php tests/model/DataListTest.php	2015-09-15 13:18:47 +12:00
Damian Mooyman	8c99659e3f	Merge pull request #4563 from assertchris/split-bulk-loader-imports-to-reduce-memory-consumption ... Splitting BulkLoader imports to reduce memory consumption	2015-09-15 10:22:45 +12:00
Christopher Pitt	1c5089f7fc	Splitting BulkLoader imports to reduce memory consumption	2015-09-15 10:06:06 +12:00