Daniel Hensby
|
3859a1d7e7
|
Merge branch '3.4' into 3
|
2016-10-27 16:16:04 +01:00 |
|
Jonathon Menz
|
b0445f72e4
|
FIX Ambiguous column SQL error
Specify the table for the field we’re fetching, in case a joined table has a field with the same name
|
2016-10-18 21:35:37 -07:00 |
|
Daniel Hensby
|
9a6121c867
|
Merge branch '3.4' into 3
|
2016-10-16 22:56:37 +01:00 |
|
Daniel Hensby
|
4c7ba731be
|
Merge branch 'open-sausages/pulls/3.4/fix-checkbox-datalist' into 3.4
|
2016-10-11 20:16:33 +01:00 |
|
Damian Mooyman
|
7368deca8f
|
BUG Fix issue with SS_List as datasource for dropdown field
BUG Fix validation issue with CheckboxSetField
Fixes #6166
|
2016-10-11 14:58:48 +13:00 |
|
Jonathon Menz
|
797be6ac82
|
FIX Revert natural sort
More backwards compatible and more consistent with ORM sorting (fixes #6124)
|
2016-10-04 13:56:12 -07:00 |
|
Stephan van Diepen
|
95b66d19b2
|
Added MySQL support for Bigint.
Conflicts:
model/MySQLDatabase.php
|
2016-09-30 16:38:25 +01:00 |
|
Andrew Aitken-Fincham
|
ad0d68d133
|
add IPUtils.php to control and implement symfony IpUtils (#6062)
|
2016-09-26 12:44:55 +13:00 |
|
Daniel Hensby
|
a9df28c791
|
Merge branch '3.4' into 3
|
2016-09-14 11:40:15 +01:00 |
|
Damian Mooyman
|
c6457c50e9
|
API Allow has_many fixtures to be declared with array format as well as many_many (#5944)
BUG Fix issue with parsing of extrafields in fixtures
BUG Fix issue in duplicate relation name, and ensure FixtureBlueprint fails on these
|
2016-09-12 14:01:08 +01:00 |
|
Daniel Hensby
|
3fd9fe3aa0
|
Merge branch '3.4' into 3
|
2016-09-07 09:22:06 +01:00 |
|
Daniel Hensby
|
f2ed59e185
|
FIX Empty dmyfields on DateField now validate as true
|
2016-09-01 11:55:17 +01:00 |
|
Daniel Hensby
|
060bf6b327
|
Merge branch '3.3' into 3.4
|
2016-08-22 16:22:37 +01:00 |
|
Daniel Hensby
|
088d88e978
|
Merge branch '3.2' into 3.3
|
2016-08-22 16:22:02 +01:00 |
|
Daniel Hensby
|
4998b80445
|
FIX ArrayList sorting now caseinsensitive
|
2016-08-22 11:21:50 +01:00 |
|
Damian Mooyman
|
d88516203c
|
Merge 3.4 into 3
|
2016-08-15 19:05:20 +12:00 |
|
Damian Mooyman
|
bbc865ff67
|
Merge 3.4.1 into 3.4
|
2016-08-15 18:37:55 +12:00 |
|
Damian Mooyman
|
b0ba2015d9
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 15:53:21 +12:00 |
|
Damian Mooyman
|
049cdefacf
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 15:02:58 +12:00 |
|
Damian Mooyman
|
12a6b357e7
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 14:14:42 +12:00 |
|
Jonathon Menz
|
d4114b3dce
|
FIX include related fields on canFilter() check
closes #5576
|
2016-08-11 10:26:18 -07:00 |
|
Damian Mooyman
|
7de5b998e1
|
Merge 3.4 into 3
|
2016-08-05 19:12:25 +12:00 |
|
Damian Mooyman
|
ca754eb887
|
Merge 3.3 into 3.4
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
|
2016-08-05 16:48:26 +12:00 |
|
Daniel Hensby
|
e7c6509196
|
Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3
|
2016-08-02 12:00:04 +01:00 |
|
Damian Mooyman
|
cd80d501f9
|
BUG Fix unset config options returning isset() = true
Fixes #4791
|
2016-08-02 18:07:55 +12:00 |
|
Damian Mooyman
|
7d0b8e6520
|
BUG Fix permission checking code not correctly handling escaped SQL identifiers
Fixes https://github.com/silverstripe/silverstripe-installer/issues/96
|
2016-08-01 18:15:30 +12:00 |
|
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 |
|
madmatt
|
43dcde5197
|
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
|
2016-07-19 11:22:36 +12: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
|
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
|
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 |
|
Damian Mooyman
|
24efc7edf8
|
BUG Fix sorting ArrayList with sql-like syntax
Replaces #5726
|
2016-07-12 17:00:17 +12: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 |
|
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 |
|
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 |
|