15978 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	214a1e967d	Merge pull request #5174 from open-sausages/pulls/4.0/tinymce-image-shortcodes ... Tinymce image shortcodes	2016-03-21 10:29:03 +13:00
Ingo Schommer	8ae794ee99	API TinyMCE Image shortcodes	2016-03-21 09:23:40 +13:00
Hamish Friedlander	98eea60ec9	Merge pull request #5157 from open-sausages/features/triggered-publishing ... API Owned objects are now automatically published	2016-03-17 14:36:03 +13: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
Daniel Hensby	ed267d03bd	Updating required node version	2016-03-16 21:54:07 +00:00
Daniel Hensby	a7a23afe38	Merge pull request #5163 from mikenz/patch-5 ... Build dist assets and added console.warn	2016-03-14 16:38:28 +00:00
Damian Mooyman	6d8c625b31	Merge pull request #5161 from open-sausages/nav-pretty ... New styles for main nav	2016-03-14 12:02:31 +13:00
Paul Clarke	ae31619695	New styles for main nav	2016-03-14 10:18:32 +13:00
Daniel Hensby	37f11f3445	Merge pull request #5264 from mikenz/patch-6	2016-03-11 00:35:34 +00:00
Mike Cochrane	3673a5e141	FIX Inserting a 'Download a file' without selecting an image ... In the html editor, when inserting a 'Download a file' link without selecting a file to link to, no link should be inserted. Currently is inserting a link to an undefined file id: [file_link,id=undefined]	2016-03-11 00:35:13 +00:00
Daniel Hensby	99d6688435	Merge pull request #5166 from tractorcow/pulls/4.0/fix-cleanup-db ... BUG Fix CleanupTestDatabaseTask	2016-03-10 21:40:17 +00:00
Damian Mooyman	e2a377e21e	BUG Fix CleanupTestDatabaseTask	2016-03-10 10:17:36 +13:00
Mike Cochrane	0b81bbef22	FIX attempt to access https iframe from http interface	2016-03-09 21:36:39 +13:00
Mike Cochrane	a3ee9ece90	FIX avoid javascript error when preview is https ... When the admin interface is http but the preview is https, javascript isn't able to read the contentDocument of the secure preview iframe. This currently results in a javascript error. Patch wraps try/catches around the two instances,	2016-03-09 21:19:26 +13:00
Damian Mooyman	02a87796ff	Merge pull request #5133 from mikenz/patch-2 ... Fix i18n.sprintf() parameters being off by one	2016-03-09 13:12:51 +13:00
Damian Mooyman	26cd1a2d5f	Merge pull request #5159 from robbieaverill/patch-2 ... Updated 4.0.0 changelog	2016-03-09 10:22:02 +13:00
Damian Mooyman	3dada00905	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
Robbie Averill	9379914038	Updated 4.0.0 changelog ... Backtick mania	2016-03-09 09:37:06 +13:00
Damian Mooyman	016ea2efb1	Merge pull request #5155 from mikenz/patch-3 ... Don't delete all assets when uploading a file in the root	2016-03-08 13:35:00 +13:00
Mike Cochrane	e03115198f	Don't delete all assets when uploading a file in the root ... Catch "." dirnames in more places. truncateDirectory('.') will delete every asset. That's an undesirable thing. findVariants() wouldn't return any variants if the dirname in "."	2016-03-08 13:12:07 +13:00
Damian Mooyman	7b2124004a	Merge pull request #5149 from kakauandme/patch-1 ... BUG Fix extra semi-colon and double quotes	2016-03-07 20:16:30 +13:00
Kirill Kliavin	1607546b68	Extra semi-colon and double quotes ... Displays extra characters	2016-03-07 17:59:18 +11: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	01ba7c76a4	Merge pull request #5143 from tractorcow/pulls/4.0/fix-versioned-tables ... BUG Better filtering of versionable tables during SQL augmentation	2016-03-07 13:57:53 +13:00
Damian Mooyman	3d99ed24ac	BUG Better filtering of versionable tables during SQL augmentation	2016-03-07 12:47:42 +13:00
Daniel Hensby	08c6aca9a4	Merge pull request #5117 from tractorcow/pulls/4.0/soft-errors ... BUG Prevent fatal errors during test failure halt tests	2016-03-06 23:32:36 +00:00
Damian Mooyman	3317d34276	BUG Prevent fatal errors during test failure halt tests	2016-03-07 10:30:56 +13:00
Ingo Schommer	627fbf9051	Fixed merge regression	2016-03-07 10:17:15 +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	f36b110db3	Merge remote-tracking branch 'origin/3.3'	2016-03-04 17:06:04 +13:00
Damian Mooyman	afe174dc2d	Merge pull request #5136 from sunnysideup/patch-46 ... BUG: cleaner can* methods for Member	2016-03-04 16:16:28 +13:00
Ingo Schommer	466ed29f0e	Merge remote-tracking branch 'origin/3.3' into 3	2016-03-04 14:55:08 +13:00
Ingo Schommer	3c53da0890	Merge remote-tracking branch 'origin/3.2' into 3.3	2016-03-04 14:05:06 +13:00
Damian Mooyman	9a1793a7ef	Merge pull request #5135 from chillu/pulls/3.2/dropdown-window-resize ... Fix TreeDropdownField auto-close regression	2016-03-04 11:26:56 +13:00
Nicolaas	4b5bd2d744	BUG: cleaner can* methods for Member	2016-03-03 21:32:06 +13:00
Ingo Schommer	7bb6295c79	Fix TreeDropdownField auto-close regression ... Causes build failures due to Behat not being able to select a link from a dropdown in "Insert Media". Follow on effect from triggering a window.resize event when the window wasn't actually resized (in order to force a layout redraw). See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context	2016-03-03 17:54:07 +13:00
Ingo Schommer	0f08176c6c	Merge pull request #5095 from open-sausages/pulls/4.0/ownership-api ... API Ownership API Implementation	2016-03-03 17:39:07 +13:00
Ingo Schommer	61a8529d76	More reuseable FormSchema logic, return on save	2016-03-03 13:36:51 +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
Mike Cochrane	8eede847cd	Fix i18n.sprintf() parameters being off by one ... Should be a post increment, not pre. This fixes clicking on specific version history items. This fixes right click on a page and adding a child.	2016-03-03 12:36:33 +13:00
Ingo Schommer	746322a9f1	Replace CMSForm use with new setValidationResponseCallback() API ... Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938	2016-03-03 08:20:55 +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	827d989836	Merge pull request #5106 from chillu/pulls/4.0/npm-shrinkwrap ... "npm run lock", exclude node_modules from manifest	2016-03-02 11:14:12 +00:00
Ingo Schommer	ff5fd7a944	Merge pull request #5112 from tractorcow/pulls/3.2/update-docs-process ... Improve documentation on documentation	2016-03-01 20:24:11 +13:00
Damian Mooyman	2e856e6315	Merge pull request #5103 from hailwood/patch-3 ... API Populate foreign key before getting CMS fields	2016-03-01 15:43:08 +13:00
Damian Mooyman	2584e55a8d	Merge pull request #5060 from benmanu/pulls/remove-jquery-live-extension ... Removing unused thirdparty dependency - jquery-live-extension.	2016-03-01 14:29:45 +13:00
Damian Mooyman	d31a921fad	Merge pull request #5110 from hdpero/patch-1 ... Update it.yml - parse error on line 321 (323)	2016-03-01 14:10:17 +13:00
Damian Mooyman	22c0025d47	Improve documentation on documentation	2016-03-01 12:18:11 +13:00
Petar Simic	dcb83f0c6e	Update it.yml - parse error on line 321 (323) ... Error while building Italian version of framework. There is a wrong formatting in line 321 (ex. 323).	2016-02-29 18:28:07 +01:00