Daniel Hensby
|
6abce3a0b8
|
Merge pull request #5810 from tractorcow/pulls/3/xframe-option
API Allow X-Frame-Options to be configured
|
2016-07-15 09:13:05 +01:00 |
|
Damian Mooyman
|
d08ab6ac81
|
API Allow X-Frame-Options to be configured
Fixes #2970
|
2016-07-15 14:08:14 +12: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
|
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 |
|
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
|
4ce7e9cd5c
|
Merge pull request #5717 from tractorcow/pulls/3/optimistic-connect
API Add optimistic_live_connect to SS_Database
|
2016-07-12 00:13:16 +01:00 |
|
Damian Mooyman
|
e810a9928c
|
API Add optimistic_connect to SS_Database
Fixes #4765
|
2016-07-12 10:19:03 +12:00 |
|
Daniel Hensby
|
3906228fc1
|
Merge branch '3.4' into 3
|
2016-07-11 21:14:21 +01: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 |
|
Loz Calver
|
21cf67f1b4
|
Minor refactor of SS_ConfigStaticManifest_Parser::parse() (#5782)
|
2016-07-07 12:14:54 +01: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
|
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
|
7a1914e645
|
Merge pull request #5775 from SilbinaryWolf/fix-listboxwrite
FIX calling $record->write() on ListboxField::saveInto breaks other 3rd party fields that write to an UnsavedRelationList.
|
2016-07-06 09:14:05 +01:00 |
|
Jake Bentvelzen
|
9afd602007
|
FIX calling $record->write() breaks other 3rd party fields that write to an UnsavedRelationList.
|
2016-07-06 09:42:06 +10: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 |
|
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
|
e7da798914
|
Merge pull request #5770 from tractorcow/pulls/3/restore-icons
BUG Fix missing icons (3 branch)
|
2016-07-04 10:27:02 +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 |
|
Damian Mooyman
|
637167f2f9
|
BUG Fix missing icons
Fixes #5657
|
2016-07-04 18:07:11 +12: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 |
|
Daniel Hensby
|
ee326f6394
|
Merge branch 'hailwood/patch-5' into 3
|
2016-07-01 14:53:02 +01:00 |
|
Matthew Hailwood
|
4f0969f119
|
Make lost password url a config option like login_url and logout_url
Also makes the login_url, logout_url and new lost_password_url functions
return their link relative to the base url rather than assuming the base tag
|
2016-07-01 14:47:51 +01: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
|
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 |
|
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 |
|