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
Antony Thorpe
39d1ef7a4b
Bugfix: BulkLoader_Result class - Deleted Items ( #5598 )
...
* Bugfix: BulkLoader_Result class - Deleted Items
The Deleted function, within BulkLoader_Result class, calls mapToArrayList, which tries to find the recently deleted dataobjects.
To correct:
- when calling addDeleted, store a map of each dataobject within the $this->deleted array; and,
- have the Deleted function return an ArrayList based upon the $this->deleted array.
* Added tests
- created a new test file for the BulkLoader_Result class
- included tests for other methods of this class
- slightly altered the addDeleted function to be consistent other methods of this class
2016-06-01 09:55:06 +12: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
4afdb630b5
Merge pull request #5579 from tractorcow/pulls/3.3/fix-finalised-query
...
BUG Fix getFinalisedQuery not including all queried columns
2016-05-26 01:32:59 +01:00
Loz Calver
4daaffbe21
Merge pull request #5584 from micmania1/patch-11
...
DOCS incorrect method referenced
2016-05-24 16:31:26 +01:00
Michael Strong
db4dc64fb4
DOCS incorrect method referenced
...
ModelAdmin uses 'getDefaultSearchContext': http://api.silverstripe.org/3.3/source-class-ModelAdmin.html#173
2016-05-24 13:25:02 +12:00
Damian Mooyman
decd7e5c57
BUG Fix getFinalisedQuery not including all queried columns
...
Fixes #1669
2016-05-23 08:41:58 +12:00
Daniel Hensby
706be1210f
Merge branch '3.3' into 3.4
2016-05-22 11:17:28 +01:00
Daniel Hensby
2ae2675a47
Merge branch '3.2' into 3.3
2016-05-22 11:16:04 +01: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
016d39c81e
Merge branch '3.3' into 3.4
2016-05-20 12:34:10 +01:00
Daniel Hensby
4307aa36c8
Merge branch '3.2' into 3.3
2016-05-20 12:25:20 +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
