Loz Calver
6ee3e458b6
Merge branch '3.1' into 3.2
2016-07-15 14:32:35 +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
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
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
27cea80b15
FIX: SS_ConfigStaticManifest_Parser failed to handle ::class syntax ( fixes #5701 ) ( #5781 )
2016-07-07 10:23:38 +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
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
Daniel Hensby
0dcffda0e8
Merge pull request #5620 from webbuilders-group/field-visibility-refocus-fix
...
BUGFIX: Fixed lookup of next closest visible field for focus restoring (fixes #5618 )
2016-05-31 15:57:58 +01:00
UndefinedOffset
341f49c630
BUGFIX: Fixed lookup of next closest visible field for focus restoring ( fixes #5618 )
2016-05-31 11:09:40 -03:00
Daniel Hensby
f3cf55074f
Merge branch '3.1' into 3.2
2016-05-22 11:10:37 +01:00
Loz Calver
4e6d0b3982
Merge pull request #5573 from dhensby/pulls/3.1/fix-no-db-tests
...
FIX #5557 Tests with no DB requirements wont create test DB
2016-05-20 16:43:33 +01:00
Daniel Hensby
8382685034
FIX #5557 Tests with no DB requirements wont create test DB
2016-05-20 15:37:52 +01:00
Daniel Hensby
0c3d30e621
Merge branch '3.1' into 3.2
2016-05-20 12:24:47 +01:00
Will Rossiter
0a67052d6c
Merge pull request #5564 from dhensby/pulls/3.1/manifest-optimisation
...
Efficiency improvement to class manifest
2016-05-20 14:32:43 +12:00
Daniel Hensby
118af06c3f
Efficiency improvement to class manifest
2016-05-19 12:47:29 +01:00
Damian Mooyman
8dfeeb0eb6
Merge 3.1 into 3.2
2016-05-18 17:25:42 +12:00
Hamish Friedlander
d350aa4153
Merge pull request #5555 from open-sausages/pulls/3.1/fix-display-errors
...
BUG Fix suppression of display_errors in ErrorControlChain
2016-05-18 16:04:57 +12:00
Damian Mooyman
62bd26d11a
BUG Fix suppression of display_errors in ErrorControlChain
2016-05-18 13:36:54 +12:00
Daniel Hensby
e8962b95d0
Merge branch '3.1' into 3.2
2016-05-12 16:05:54 +01:00
Loz Calver
be496c4e54
Merge pull request #5530 from dhensby/pulls/empty-from-clause
...
FIX Empty from clause when joining to same base table
2016-05-12 15:56:57 +01:00
Daniel Hensby
3738d888e0
FIX Empty FROM clause
2016-05-12 12:38:05 +01:00
Loz Calver
5b275376d3
Many many bug
2016-05-12 12:38:04 +01:00
Daniel Hensby
dd554d883f
Proving bug with Deep nested many_many relations
...
When adding a filter to a many_many with a shared inheritance, the FROM table is removed and added as a LEFT JOIN which causes a syntax error.
This means `$dataList->filter('ManyManyRel.ID', array(1,2))` doesn't work.
2016-05-12 12:38:02 +01:00
Damian Mooyman
79602dc44d
Remove stale commits from release notes
2016-05-11 15:34:32 +12:00
Damian Mooyman
9da594b326
Merge 3.1 into 3.2
...
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/ar.js
# javascript/lang/bg.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fa_IR.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# lang/nl.yml
# lang/sk.yml
2016-05-11 13:48:22 +12:00
Damian Mooyman
18fcd68acf
Merge up changes from 3.1.19 changelog
2016-05-11 13:41:02 +12:00
Damian Mooyman
0fa9ba5d64
Merge 3.2.4 into 3.2
2016-05-11 13:29:51 +12:00
Damian Mooyman
b612c0549d
Merge 3.1.19 into 3.1
2016-05-11 13:15:10 +12:00
Damian Mooyman
cfb3d96a03
Added 3.2.4 changelog
2016-05-11 11:24:49 +12:00
Damian Mooyman
68dca6f6c0
Added 3.1.19 changelog
2016-05-11 11:09:20 +12:00
Damian Mooyman
c27cb2dae7
Update translations
2016-05-11 11:05:37 +12:00
Damian Mooyman
60644a5be8
Update translations
2016-05-11 10:58:25 +12:00
Loz Calver
dc331347a0
Merge pull request #5506 from dhensby/pulls/3.1/fix-manymanylisttest
...
Allow ManyManyListTest to run standalone
2016-05-10 16:21:04 +01:00
Daniel Hensby
971d561633
Allow ManyManyListTest to run standalone
2016-05-10 15:24:07 +01:00
Daniel Hensby
73b922d43b
Added 3.2.4-rc1 changelog
2016-05-05 11:48:07 +01:00
Daniel Hensby
2edef65d7a
Update translations
2016-05-05 11:18:02 +01:00
Daniel Hensby
cf29b2c146
Merge remote-tracking branch '3.1.19' into 3.2.4
2016-05-05 11:17:45 +01:00
Daniel Hensby
ee5133f355
Added 3.1.19-rc1 changelog
2016-05-05 09:33:57 +01:00
Daniel Hensby
686db04a0a
Update translations
2016-05-05 02:05:54 +01:00
Daniel Hensby
92599727b9
Merge remote-tracking branch 'security/patch/3.1/ss-2016-006' into 3.1.19
2016-05-05 01:01:49 +01:00
Daniel Hensby
7af7f8dd65
Merge remote-tracking branch 'security/patch/3.1/ss-2016-005' into 3.1.19
2016-05-05 01:01:44 +01:00
Daniel Hensby
e8cfe1cc72
Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19
2016-05-05 01:01:37 +01:00
Daniel Hensby
09370290dc
Merge remote-tracking branch 'security/patch/3.1/ss-2016-001' into 3.1.19
2016-05-05 01:01:27 +01:00
