16247 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Garion	47179fc808	Update Extend_CMS_Interface.md ... Resurfaces details on actually creating the required handlers for custom buttons in the CMS, which were detailed in a [past version of the docs](https://github.com/silverstripe-droptables/sapphire/blob/side-by-side/docs/en/howto/extend-cms-interface.md#extending-the-cms-actions).	2016-03-10 01:02:28 +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	de044e591b	Merge pull request #5156 from camfindlay/patch-38 ... DOCS Added a useful code example around positioning of tabs in CMS.	2016-03-09 12:06:34 +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
Daniel Hensby	ce560e7b76	Merge pull request #5144 from tractorcow/pulls/3/fix-file-parentid-search ... API Include File.ParentID in fulltext search results	2016-03-08 17:43:49 +00:00
Loz Calver	371c84c22a	Merge pull request #5158 from dhensby/pulls/imagik-installer ... FIX Imagick installer for travis and php 5.3	2016-03-08 16:38:18 +00:00
Daniel Hensby	7c037d8034	trying to fix imagik properly	2016-03-08 15:38:30 +00:00
Cam Findlay	14044fff35	DOCS Added a useful code example around positioning of tabs in CMS. ... This useful example wasn't in the docs when I needed it. I ended up tracking this information down at http://stackoverflow.com/questions/5033028/silverstripe-how-do-i-insert-a-tab-before-another-tab It should really be in the docs.	2016-03-08 16:18:49 +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
Ingo Schommer	5609b9ae25	Merge pull request #5153 from tractorcow/pulls/3.2/imagick-travis ... BUG Don't install imagick on php 5.3	2016-03-08 10:55:26 +13:00
Damian Mooyman	aa57427874	BUG Don't install imagick on php 5.3	2016-03-08 10:37:01 +13:00
Damian Mooyman	661e5ca03a	Merge pull request #5152 from jonom/filesync-fix-3.2 ... FIX file sync removes folders with dot in name	2016-03-08 09:57:16 +13:00
Jonathon Menz	86b1c8fc28	FIX file sync removes folders with dot in name ... Prevent file extension validation being applied to folders during sync (fixes #4746)	2016-03-07 12:27:18 -08: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	6a2245474d	BUG Fix FulltextsearchEnable	2016-03-07 14:47:20 +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
Damian Mooyman	8566825194	Merge pull request #5131 from dhensby/pulls/3.3/fix-help-link ... Fixing user help link	2016-03-07 14:04:45 +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	634e86f949	API Include File.ParentID in fulltext search results ... Fixes https://github.com/silverstripe-labs/silverstripe-secureassets/issues/22	2016-03-07 13:15:40 +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
Damian Mooyman	f35786de0a	Merge pull request #5123 from webbuilders-group/ImagickBackendFix ... BUGFIX: Deleting images with ImagickBackend fails	2016-03-07 10:17:18 +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	ef769da57b	Merge remote-tracking branch 'origin/3.3' into 3	2016-03-07 08:50:18 +13:00
Ingo Schommer	f36b110db3	Merge remote-tracking branch 'origin/3.3'	2016-03-04 17:06:04 +13:00
Ingo Schommer	49888e1bf8	Fixed core release constraint in travis.yml	2016-03-04 16:57:40 +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