16012 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Loz Calver	de61551885	Merge branch '3.2' into 3.3	2016-07-15 14:33:38 +01:00
Loz Calver	6ee3e458b6	Merge branch '3.1' into 3.2	2016-07-15 14:32:35 +01:00
Daniel Hensby	a6f1544621	Merge pull request #5814 from kinglozzer/2534-form-actions ... FIX: Fixes support for "inline" form actions (fixes #2534)	2016-07-15 14:19:18 +01:00
Loz Calver	b3fea3723f	FIX: Fixes support for "inline" form actions (fixes #2534)	2016-07-15 10:11:47 +01: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	0b869254d5	Merge pull request #5809 from giankdm/5772-notifications ... Quick fix for HTTP/2.0 on OSX/Safari v9.1.1	2016-07-15 00:26:38 +01:00
Giancarlo Di Massa	8f2953f1a0	Quick fix for HTTP/2.0 on OSX/Safari v9.1.1	2016-07-14 16:35:51 +02:00
Daniel Hensby	d766c8559b	Merge branch '3.3' into 3.4	2016-07-14 11:57:15 +01:00
Daniel Hensby	a2581b9cf7	Merge branch '3.2' into 3.3	2016-07-14 11:56:35 +01:00
Daniel Hensby	2025d8c76f	Merge pull request #5805 from Zauberfisch/gridfield-detail-form-fix-3.2 ... only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX	2016-07-13 15:05:08 +01:00
zauberfisch	3482c98cce	only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX (fixes #5801)	2016-07-13 13:32:50 +00:00
Daniel Hensby	6824f0d1a7	Merge pull request #5799 from tractorcow/pulls/3.3/arraylist-sql-sort-compat ... BUG Fix sorting ArrayList with sql-like syntax	2016-07-12 13:49:52 +01:00
Damian Mooyman	24efc7edf8	BUG Fix sorting ArrayList with sql-like syntax ... Replaces #5726	2016-07-12 17:00:17 +12:00
Damian Mooyman	ce11c47d00	Merge pull request #5700 from Ironcheese/patch-1 ... Moving a field between tabs, wrong variable name	2016-07-12 13:58:54 +12:00
Daniel Hensby	f44c47eea1	Merge branch '3.3' into 3.4	2016-07-11 21:11:05 +01:00
Daniel Hensby	e1ccb3b379	Merge branch '3.2' into 3.3	2016-07-11 21:10:06 +01:00
Robbie Averill	04a4d7937e	DOCS Update 02_Relations (#5785) ... * Code formatting on some variable names * Add example for removing scaffolded parent relation fields	2016-07-07 22:32:43 +01:00
Ed Chipman	4aa1fc2d2c	BUGFIX: Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783)	2016-07-07 19:55:37 +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	1c4900969f	Merge pull request #5778 from assertchris/check-for-resource-before-closing-mysql-connection ... Checking for resource before closing MySQL connection	2016-07-07 10:33:17 +12:00
assertchris	8b4311f020	Checking for resource before closing MySQL connection	2016-07-07 10:01:33 +12: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
Damian Mooyman	4bf601ec1f	Merge pull request #5761 from dhensby/pulls/3.2/fix-shortcode-parsing ... [3.2] FIX Parse shortcodes in template helpers	2016-07-05 10:36:20 +12: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
Daniel Hensby	3cb8b5cae5	Merge pull request #5769 from tractorcow/pulls/3.4/restore-icons ... BUG Fix missing icons (3.4 branch)	2016-07-04 10:26:55 +01:00
Damian Mooyman	0b7dab3f66	BUG Fix missing icons ... Fixes #5657	2016-07-04 18:09:22 +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	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
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
Ironcheese	9b1a4b328c	Moving a field between tabs, wrong variable name	2016-06-15 15:36:43 +02:00
Damian Mooyman	7a462cecef	Merge pull request #5684 from patricknelson/issue-5683-iframe-backport-pr-fix-5163 ... FIX for #5683: Address security warning in CMS on 3.3 and above.	2016-06-15 14:47:03 +12:00
Daniel Hensby	4e392a4d43	Merge branch '3.3' into 3.4	2016-06-13 12:30:16 +01:00
Daniel Hensby	695c18ac6d	Merge branch '3.2' into 3.3	2016-06-13 12:29:45 +01:00
Patrick Nelson	f0d4951815	FIX for #5683: Address security warning in CMS when attempting to access <iframe> contents (Back-porting fix from PR #5163)	2016-06-12 17:26:36 -07:00
Damian Mooyman	bf00810e1f	BUG Fix buttonClicked() error ... Fixes #3208	2016-06-08 12:26:11 +12:00
Daniel Hensby	f9ad2e2bbe	Merge pull request #5658 from kinglozzer/5656-up-top ... FIX: Regression with <% with $Up/$Top %> (fixes #5656)	2016-06-06 11:21:14 +01:00
Loz Calver	946495bcf5	FIX: Regression with <% with / %> (fixes #5656)	2016-06-06 10:14:07 +01:00
Damian Mooyman	8a99b4f74e	Merge 3.4.0 into 3.4	2016-06-03 11:33:44 +12:00
Damian Mooyman	8008fcbe97	Update changelog	2016-06-03 10:59:29 +12:00
Damian Mooyman	3fbeab94c8	Added 3.4.0 changelog	2016-06-02 17:27:21 +12:00
Damian Mooyman	ff3b970b71	Update translations	2016-06-02 17:07:41 +12:00