15053 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hamish Friedlander	b2cb82097e	Merge pull request #4836 from open-sausages/pulls/fix-versioned-canviewstage ... BUG Fix regression in canViewStage	2015-12-09 16:30:19 +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	8368ba7960	Merge pull request #4818 from nyeholt/3 ... NEW Use Config for determining Vary header	2015-12-09 13:07:44 +13:00
Damian Mooyman	6089a7c5bd	API Create default security permission model for versioned data objects	2015-12-09 11:33:53 +13:00
Daniel Hensby	9353751131	Merge pull request #4829 from SilbinaryWolf/manifest-optimizations-v2 ... Optimization: Swapped is_array for faster casting compare, shaved ~4s off flushing on 3.2ghz i5 dual core system	2015-12-08 12:12:48 +00:00
Marcus Nyeholt	fc5e584201	Format for SS3 using tabs instead of spaces	2015-12-08 15:19:24 +11:00
Silbinary Wolf	63dddacba7	Optimization: Swapped is_array for faster casting compare, shaved ~4s off flushing on 3.2ghz i5 dual core system	2015-12-05 19:39:37 +11: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
Damian Mooyman	1bc7297c8f	Merge branch 'pr/4797' into 3	2015-11-27 13:55:56 +13:00
Novusvetus	6266f909e0	API Increased Permission.Code db field to 255 characters	2015-11-27 13:54:37 +13:00
Daniel Hensby	d9c38aa3cf	Merge pull request #4787 from marijnkampf/patch-6 ... Fix Fatal error on invalid image	2015-11-25 14:25:15 +00:00
Marijn Kampf	006717a3cc	Fix Fatal error on invalid image ... If user has uploaded an invalid image the original code would crash when called from template	2015-11-25 12:17:50 +00:00
Jono Menz	fa68b4d4c5	Merge pull request #4785 from muskie9/docs/LinkingModes ... DOCS update LinkingModes description	2015-11-23 19:51:03 -08:00
muskie9	fc3b06dbf9	DOCS update LinkingModes description	2015-11-23 14:10:47 -06:00
Daniel Hensby	ba6078ee5b	Merge pull request #4747 from muskie9/CurrencyFieldConfig ... ENHANCEMENT CurrencyField to use Currency.currency_symbol	2015-11-10 07:31:53 +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	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	e07f80014c	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: lang/cs.yml lang/sk.yml	2015-11-03 11:10:46 +13:00
Damian Mooyman	6fd2923d3b	Merge pull request #4732 from silverstripe/revert-4720-pulls/3.1/fix-js-includes ... Revert "BUG Fix duplicate files being included in case of flush"	2015-11-02 18:40:12 +13:00
Damian Mooyman	074718fcfa	Revert "BUG Fix duplicate files being included in case of flush"	2015-11-02 17:11:22 +13:00
Ingo Schommer	a1dd4651da	Merge pull request #4726 from edlinklater/3-docs-jquery-delegation ... DOCS: jQuery delegation in Admin interface	2015-11-02 10:42:59 +13:00
Ingo Schommer	fc7f574920	Merge pull request #4727 from edlinklater/3-iframe-contents ... Don't try to unbind events from inside top-level iframes	2015-11-02 10:42:08 +13:00
Damian Mooyman	0d1bdd58b3	Merge pull request #4728 from madmatt/pulls/gridfield-list-fix ... BUGFIX: Use Object->hasMethod() instead of method_exists()	2015-11-02 10:39:18 +13:00
madmatt	275ecfd8a9	BUGFIX: Use Object->hasMethod() instead of method_exists() ... This fixes an issue when you pass a `PaginatedList` back from `ModelAdmin::getList()`	2015-11-01 09:10:29 +13:00
Ed Linklater	42d2e0ebbf	Don't try to unbind events from inside top-level iframes	2015-11-01 06:14:30 +13:00
Ed Linklater	cacbbd75bc	DOCS: jQuery delegation in Admin interface	2015-11-01 05:46:13 +13:00
Daniel Hensby	6d1d21f019	Merge pull request #4724 from tractorcow/pulls/3.2/cms-reauth-route ... BUG Add missing CMSSecurity route	2015-10-30 17:49:34 +00:00
Sam Minnée	77b084c324	Merge pull request #4725 from tractorcow/pulls/3.2/fix-id-filter ... BUG Ensure that filters on any fixed field are scoped to the base data table	2015-10-30 17:00:31 +00: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	38ca9632c4	BUG Add missing CMSSecurity route	2015-10-30 15:31:54 +13:00
Ingo Schommer	9c4443629e	Merge pull request #4719 from tractorcow/pulls/3.2/fix-folder-fixtures ... BUG Fix regression from #4396 in test fixtures	2015-10-30 09:12:08 +13:00
Daniel Hensby	587b065fc2	Merge pull request #4669 from nickspiel/patch-4 ... Adding SVG to allowed file types	2015-10-29 17:33:12 +00:00
Damian Mooyman	b857bdf209	BUG Fix duplicate files being included in case of flush ... Fixes #4553	2015-10-29 17:48:30 +13:00
Damian Mooyman	daa86d3a4c	BUG Fix regression from #4396 in test fixtures	2015-10-29 17:36:38 +13:00
Ingo Schommer	aada7a7334	Merge pull request #4716 from dm-0/patch-1 ... Update 01_Code.md	2015-10-29 12:13:34 +13:00
Damian Mooyman	1303fc5ff3	Merge pull request #4717 from chillu/pulls/3.2/fix-inlineformaction ... BUG Fix broken InlineFormAction	2015-10-29 11:11:36 +13:00
Damian Mooyman	db16248b9a	BUG Fix broken InlineFormAction	2015-10-29 10:48:49 +13:00
Damian Kissick	0197b46001	Update 01_Code.md ... Corrected 'submiting' spelling	2015-10-28 21:28:45 +13:00
Damian Mooyman	82f2f63a01	Merge pull request #4714 from mparkhill/patch-1 ... Fix broken link to DataObject api	2015-10-28 12:00:41 +13:00
Michael Parkhill	e44f22c6b2	Fix broken link to DataObject api	2015-10-28 11:52:35 +13:00
Damian Mooyman	bf966a78ab	Merge pull request #4713 from patricknelson/issue-4712-image-doc ... FIX for #4712: Dropping in some PHP documentation on return types for dynamically generated image methods.	2015-10-28 11:51:40 +13:00
Patrick Nelson	293d84721e	FIX for #4712: Dropping in some PHP documentation on return types for dynamically generated image methods.	2015-10-27 18:42:03 -04:00
Will Rossiter	267ec9bb97	Merge pull request #4706 from christopherdarling/patch-4 ... DOCS: correct config setting for custom editor.css	2015-10-27 09:16:46 +13:00
Christopher Darling	a1e343629b	DOCS: correct config setting for custom editor.css ... see a964e7636e/admin/code/LeftAndMain.php (L287-L308)	2015-10-26 11:02:47 +00:00
Loz Calver	417bccfe8d	Merge pull request #4698 from SpiritLevel/patch-2 ... DOCS : spelling	2015-10-23 09:11:25 +01:00
David Alexander	e88032a7aa	DOCS : spelling	2015-10-23 13:49:03 +13:00
Damian Mooyman	6ff29065b3	Merge pull request #4688 from camfindlay/patch-31 ... DOCS Module standard 1.0	2015-10-21 09:01:35 +13:00
Damian Mooyman	cd12ce584a	Merge pull request #4690 from camfindlay/patch-32 ... FIX only use sethasemptydefault if exists.	2015-10-20 16:04:46 +13:00
Cam Findlay	c3641587a5	FIX only use sethasemptydefault if exists. ... Backport of #4672 with a slight rewrite incase of subclasses of the field.	2015-10-20 12:39:04 +13:00