Commit Graph

3338 Commits

Author SHA1 Message Date
Normann Lou
433af2515c BUGFIX: merge r92502 from trunk for HtmlEditorConfig.php, merge r93934 from trunk for HtmlEditorField.js, merge r92500 from trunk for sapphire/thirdpart/tinymce-advcode/editor_plugin_src.js, aiming to solve the conflict of folder name tinymce-advcode.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93935 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Sean Harvey
6104d33f9d BUGFIX Fixed incorrect hasDatabaseField() in SearchFilter::getDbName() - use hasOwnTableDatabaseField() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93860 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Sean Harvey
38efb79e6f MINOR Fixed tabs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
40f448f824 API CHANGE: removed Director::Link(). Use Controller::join_links() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Sean Harvey
c888781975 BUGFIX Fixed SearchContextTest failure
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Ingo Schommer
c66446b34d ENHANCEMENT Added parameter to DBLocale->Nice()
ENHANCEMENT Added DBLocale->getNativeName()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Ingo Schommer
73fb1acd65 BUGFIX Fixed drag link event handling on ComplexTableField.js (#4737)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Sean Harvey
6d9ea836c0 MINOR Fixed reference to fieldExists() on SearchFilter which was removed from DataObject
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
a188d2439b MINOR: reverted r93693 due to the field being required for the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
e46a8b8a13 API CHANGE: removed deprecated RestrictedText fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93693 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
eb64eec534 API CHANGE: removed deprecated extend calls (r93632). API CHANGE: removed fieldExists(). Use hasField() (r93633). API CHANGE removed listOfFields() (r93647). API CHANGE: removed Tag() and URL() from Image. Use getTag() and getURL(). BUGFIX: updated Image.php to use getTag() (r93639, r93646). API CHANGE: removed val(). Use XML_val() (r93650). API CHANGE: removed $add_action. Use singlar_name or lang tables (r93658). API CHANGE: removed ConfirmedFormAction (r93674). API CHANGE: removed ajax_render on CTF (r93679).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
d93ee14be1 MINOR Removed calls to ContentNegotiator::disable() since it's disabled by default
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93682 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
07e40ee91f BUGFIX Removed calls to Translatable::is_enabled() since it's deprecated, replaced with Object::has_extension('SiteTree', 'Translatable') instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
e6d104fa50 BUGFIX #4762 Replace Debug::log_errors_to() in ConfigureFromEnv to use SS_Log instead. Thanks simon_w!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93673 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
9c55927a17 API CHANGE Removed ComponentSet::removeByFilter() since it's not flexible enough and fixed calls to this from HtmlEditorField::saveInto() to use custom code instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
24ed6150cf MINOR Removed ContentNegoitator::disable() from FormResponse - it's disabled already
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
bd37d67a48 MINOR Moved static functions in ContentNegotiator above the instance methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93641 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Sean Harvey
b26b7e1228 API CHANGE Removed deprecated static function ContentNegotiator::disable() - it's disabled by default
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
aa51b70188 MINOR Fixed capitalization of JSMin.php include (from r92870)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
311da2d8be MINOR Fixed path for spyc thirdparty library
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93622 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Sean Harvey
9b56088875 BUGFIX Fixed reference to tree.css which doesn't exist because of files moving around
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93620 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
03c5caea72 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
e550de71e3 MINOR Moved jsparty/tiny_mce to sapphire/thirdparty/tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
b65dc33ccb MINOR Moved jsparty/greybox to sapphire/thirdparty/greybox
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:50 +13:00
Ingo Schommer
625808d17a MINOR Removed wrong sapphire/thirdparty/greybox merge from trunk, needs to be copied from jsparty instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:50 +13:00
Ingo Schommer
7ab1932864 MINOR Moved jsparty/jquery/jquery_improvements.js to sapphire/javascript/jquery_improvements.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:50 +13:00
Ingo Schommer
fad4957687 BUGFIX Adjusted YamlFixture to new Spyc API: loadFile() instead of load() (from r92566)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:50 +13:00
Ingo Schommer
2e2b532e23 MINOR Moved jsparty/prototype_improvements.js to sapphire/javascript/prototype_improvements.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:50 +13:00
Ingo Schommer
9f6665ec9e MINOR Moved jsparty/prototype15.js to sapphire/thirdparty/prototype/prototype15.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93576 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
d1c164b9d7 MINOR Moved jsparty/prototype-safe.js to sapphire/thirdparty/prototype/prototype-safe.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93575 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
c8a10f951f MINOR Moved jsparty/prototype.js to sapphire/thirdparty/prototype/prototype.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93574 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
0b04bfab9c MINOR Moved jsparty/loader.js to sapphire/javascript/loader.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
47356d933a MINOR Moved jsparty/layout_helpers.js to sapphire/javascript/layout_helpers.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
6f571b4644 MINOR Moved jsparty/tiny_mce_improvements.js to sapphire/javascript/tiny_mce_improvements.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93567 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
5e6ab67cec MINOR Moved jsparty/tree to sapphire/javascript/tree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93565 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
b734d702d3 MINOR Moved jsparty/tinymce_advcode to sapphire/thirdparty/tinymce-advcode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93562 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
2f30ae7ba5 MINOR Moved jsparty/tabstrip to sapphire/thirdparty/tabstrip
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93560 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:49 +13:00
Ingo Schommer
c60c310cd3 MINOR Moved jsparty/calendar to sapphire/thirdparty/calendar
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
ab588f6584 MINOR Moved jsparty/scriptaculous to sapphire/thirdparty/scriptaculous
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
3d7b4894dc MINOR Moved jsparty/jquery/plugins/greybox to sapphire/thirdparty/greybox
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
ee4c744b04 MINOR Moved jsparty/jquery/plugins/livequery to sapphire/thirdparty/jquery-livequery
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
aef7067734 MINOR Moved jsparty/jquery/plugins/metadata to sapphire/thirdparty/jquery-metadata
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
d593b1c870 MINOR Moved jsparty/jquery/plugins/form to sapphire/thirdparty/jquery-form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93550 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
acf50807e4 MINOR Moved jsparty/jquery/plugins/effen to sapphire/thirdparty/jquery-effen
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93549 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
65c7894b26 MINOR Added jquery.cookie library to allow saving of last selected jQuery UI tab (from r92507)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
87689aa8e3 MINOR Moved jsparty/jquery/themes to sapphire/thirdparty/jquery-ui-themes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93547 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:48 +13:00
Ingo Schommer
27abbbf4ff MINOR Moved jsparty/jquery/ui to sapphire/thirdparty/jquery-ui
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93546 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:46 +13:00
Ingo Schommer
2a1b6fec84 MINOR Moved jsparty/jquery/jquery.js to sapphire/thirdparty/jquery
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93544 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:43 +13:00
Ingo Schommer
70af168f6a MINOR Added sapphire/thirdparty/firebug-lite (from r92496)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93543 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:43 +13:00
Ingo Schommer
2093c7641c BUGFIX: applied patch from #4381. Observable doesnt play nice with jQuery (manual jsparty merge from r90857) (from r92571)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:43 +13:00