Daniel Hensby
340a48306b
Merge branch '3.4' into 3
2016-07-20 19:48:17 +01:00
Daniel Hensby
cf247534d5
Merge branch '3.3' into 3.4
2016-07-20 19:43:41 +01:00
Daniel Hensby
96b061ffff
Merge branch '3.2' into 3.3
2016-07-20 19:41:46 +01:00
Damian Mooyman
319d6d293e
BUG Fix doclink ( #5827 )
...
Fixes #5721
2016-07-20 10:12:42 +01:00
Daniel Hensby
c587059674
Merge pull request #5823 from madmatt/pulls/3.2-hierarchy-marking-fix
...
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
2016-07-19 15:35:16 +01:00
madmatt
43dcde5197
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
2016-07-19 11:22:36 +12:00
Daniel Hensby
6f164c03fe
Merge pull request #5822 from antons-/patch-1
...
Use columns from gridfield for export
2016-07-18 23:39:44 +01:00
Anton Smith
4c856c4377
Use columns from gridfield for export
2016-07-19 08:26:07 +12:00
Daniel Hensby
a73f08bd88
Merge pull request #5815 from kinglozzer/form-buttonclicked-duplicate-code
...
Refactor duplicate code in Form
2016-07-18 10:13:37 +01:00
Daniel Hensby
9282662293
Fixing bad syntax from PR
2016-07-15 17:00:33 +01:00
Daniel Hensby
51e02e2ed7
Merge remote-tracking branch 'tony/patch-1' into 3
2016-07-15 16:58:48 +01:00
Loz Calver
2b1dd99be1
Refactor duplicate code in Form
2016-07-15 16:47:27 +01:00
Loz Calver
391161208e
Merge branch '3.4' into 3
2016-07-15 14:34:50 +01:00
Loz Calver
44d7919496
Merge branch '3.3' into 3.4
2016-07-15 14:34:18 +01:00
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
Sam Minnée
366224078b
FIX: Allow caching of false config values ( Fixes #4755 ) ( #4762 )
...
False values were indistinguishable from cache misses. This patch solves
this by introducing a new multiple-return-value varation on cache->get().
The new method is named differently so as not to break a public API.
2016-07-15 09:22:58 +01:00
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
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
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
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
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
