Commit Graph

16996 Commits

Author SHA1 Message Date
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
Damian Mooyman
6e68f38efb API Update react sections to use react-router instead of page.js (#5796)
Fixes #5711
2016-07-14 17:51:01 +12:00
Chris Joe
291c527174 Remove double checking for Code 2016-07-14 16:47:48 +12:00
Damian Mooyman
af5a539c9a Re-enable travis artifacts on framework (#5807) 2016-07-14 14:53:21 +12:00
Damian Mooyman
83c2af72ca BUG Fix some regressions from #5653 (#5806) 2016-07-14 14:43:53 +12:00
Damian Mooyman
3b43145954 Merge pull request #5735 from silverstripe-terraformers/versions
FIX: Saving null values to the _versions table.
2016-07-14 13:30:30 +12: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
60546308f3 Merge pull request #5653 from tractorcow/pulls/4.0/default-cast
API Enforce default_cast
2016-07-13 08:59:28 +01:00
Damian Mooyman
fb6f8a0a04
BUG Fix Security page showing double escaped HTML 2016-07-13 19:08:09 +12:00
Damian Mooyman
26d46517ac
API Remove custom DBHTMLText::exists() custom behaviour
Fix merge regressions
2016-07-13 18:45:57 +12:00
Damian Mooyman
6a7c1056fe BUG Fix shortcode parsing in HTMLEditorField::getanchors()
Fixes #5678
2016-07-13 17:15:45 +12:00
Damian Mooyman
009f2de17c BUG Fix incorrect enum string parsing 2016-07-13 17:15:45 +12:00
Damian Mooyman
b7ac5c564d API / BUG Fix DBField summary methods
Cleanup DBField subclasses
Fixes #2929
Fixes #1381
Fixes #5547
Fixes #1751
2016-07-13 17:15:45 +12:00
Damian Mooyman
5c9044a007 API Enforce default_cast for all field usages
API Introduce HTMLFragment as casting helper for HTMLText with shortcodes disabled
API Introduce DBField::CDATA for XML file value encoding
API RSSFeed now casts from the underlying model rather than by override
API Introduce CustomMethods::getExtraMethodConfig() to allow metadata to be queried
BUG Remove _call hack from VirtualPage
API Remove FormField::$dontEscape
API Introduce HTMLReadonlyField for non-editable readonly HTML
API FormField::Field() now returns string in many cases rather than DBField instance.
API Remove redundant *_val methods from ViewableData
API ViewableData::obj() no longer has a $forceReturnObject parameter as it always returns an object
BUG  Fix issue with ViewableData caching incorrect field values after being modified.
API Remove deprecated DB class methods
API Enforce plain text left/right formfield titles
2016-07-13 17:15:45 +12:00
Damian Mooyman
a0213aa2bf BUG Fix HTTP url rewriting 2016-07-13 17:15:45 +12:00
Damian Mooyman
749d28a3c9 Minor phpdoc / code cleanup 2016-07-13 17:15:45 +12:00
Damian Mooyman
e78bf010b0
BUG Fix augmentWriteVersioned 2016-07-13 17:07:55 +12:00
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