Commit Graph

16722 Commits

Author SHA1 Message Date
Frank Mullenger
6d835a64ad FIX: Saving null values to the _versions table. 2016-07-13 16:48:42 +12:00
Damian Mooyman
68a9b45a9a Build dist client files 2016-07-13 14:43:07 +12:00
Damian Mooyman
7d82304bb0 BUG Fix route invoking multiple handleStateChanges on single navigation actions
BUG Fix reference to non-existant window.history.state.url property
2016-07-13 14:42:57 +12:00
Damian Mooyman
d54f4dc9c6 Convert tabs to spaces in legacy script files 2016-07-13 14:33:19 +12: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
Daniel Hensby
5776a03141
Merge branch '3' 2016-07-11 23:45:41 +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
Daniel Hensby
327ddb28db Merge pull request #5793 from sminnee/fewer-manual-require
Remove unnecessary require calls.
2016-07-11 11:43:21 +01:00
Sam Minnee
822f9f4390 Remove unnecessary require calls.
Now that we have PSR-4 compliance on these classes, manual include
statements aren’t needed.
2016-07-11 12:08:17 +12:00
Daniel Hensby
f7ba78a8b3 Merge pull request #5791 from aNickzz/master
Move return to end of function.
2016-07-11 00:42:20 +01:00
aNickzz
b271dafffb Move return to end of function. 2016-07-10 19:05:14 +09:30
Daniel Hensby
f6cae80fce Merge pull request #5771 from xini/feature-requirements-async-defer-40
add async and defer attributes to js requirements, replaces #4555
2016-07-08 17:03:17 +01:00
Florian Thoma
9fc51dc527 add async and defer attributes to js requirements, replaces #4555 2016-07-08 14:31:39 +10: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
859acf571e API mute frontend debugging by default (#5777) 2016-07-07 10:22:24 +01:00
Hamish Friedlander
a2cc0690da Merge pull request #5741 from open-sausages/pulls/4.0/namespace-security
API Apply SilverStripe\Security namespace
2016-07-07 13:24:38 +12:00
Damian Mooyman
af22a83166 API Apply Framework\Security namespace 2016-07-07 11:32:28 +12: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
Damian Mooyman
20efb0e8e1 Merge pull request #5687 from silverstripe-terraformers/fixes/new-node-class
remove adding "original classes"
2016-07-06 23:30:11 +12:00
Christopher Joe
b8d634166f remove adding "original classes" 2016-07-06 21:44:11 +12:00
Chris Joe
dfe375e87e Fix MemberDatetime helper description, and shifted them to templates (#5766)
* Fix MemberDatetime helper description, and shifted them to templates

* added descriptionTemplate for setting the description

* Unit test for description with templates
2016-07-06 09:16:27 +01: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
5ba1c477e6 Merge pull request #5751 from open-sausages/pulls/4.0/better-tree-hint
BUG Don't hard-code folder into treedropdownfield search hint
2016-07-05 20:42:48 +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
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
efd35045ec Merge pull request #5768 from silverstripe-terraformers/fixes/xml-unittest-fix
Fix unit test for xml content check
2016-07-04 18:11:56 +12: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