Commit Graph

310 Commits

Author SHA1 Message Date
Damian Mooyman
8dd644d25d
API Namespace all classes
Namespace all templates
Move difflib and BBCodeParser2 to thirdparty
Remove deprecated API marked for removal in 4.0
2016-09-08 10:23:17 +12:00
Daniel Hensby
65ba709271 Giving composer more responsibility over autoloading (#5572) 2016-05-24 08:40:05 +12:00
Ingo Schommer
99e2ecc89d Merge pull request #5505 from g4b0/italian-datepicker
Added italian localization to jqueryui datepicker
2016-05-11 08:52:39 +12:00
g4b0
b506e09ab2 Added italian localization to jqueryui datepicker 2016-05-10 15:04:28 +02:00
Ingo Schommer
87f2933654 Update tinymce dep, fix "npm run sanity"
ae99a273e updated TinyMCE from 4.3.4 to 4.3.8 directly, instead of through NPM.
This failed "npm run sanity". Updated to the latest (4.3.11) through NPM now.
2016-05-04 20:29:21 +12:00
Damian Mooyman
ae99a273ed Update thirdparty 2016-04-14 12:02:59 +12:00
Damian Mooyman
77b47bac92 Merge pull request #5063 from benmanu/pulls/add-npm-json-js
Moving thirdparty module to npm dependency - json-js
2016-04-04 10:13:33 +12:00
Ingo Schommer
c2b6f6199c Reapplied customisations to tiny_mce_gzip.php
See previously applied customisations at https://github.com/silverstripe/silverstripe-framework/blob/3/thirdparty/tinymce/tiny_mce_gzip.php
See https://github.com/silverstripe/silverstripe-framework/pull/5258
2016-04-04 08:01:17 +12:00
Sean Harvey
b1b85b539e TinyMCE 4 optimisations. Use TinyMCE_Compressor. 2016-04-04 07:58:45 +12:00
Ben Manu
5c7a6166b6 Moving thirdparty module to npm dependency - json-js. 2016-04-01 15:43:09 +13:00
Sam Minnee
0dcccfafb3 MINOR: Whitespace fixes in SimpleTest. 2016-03-22 17:39:08 +13:00
Sam Minnee
680b19a1da FIX: Correct PHP4-style constructors in SimpleTest.
Note that the best solution to this will be to remove the use of
SimpleTest entirely. This is quick fix is intended to help us get PHP7
tests running without needing to cross that bridge.
2016-03-22 17:39:08 +13:00
Damian Mooyman
2d56ea278a API Move ss buttons plugin out of thirdparty
BUG Fix incorrect parsing of shortcode properties
2016-03-21 13:51:33 +13:00
Ingo Schommer
8ae794ee99 API TinyMCE Image shortcodes 2016-03-21 09:23:40 +13:00
Damian Mooyman
2584e55a8d Merge pull request #5060 from benmanu/pulls/remove-jquery-live-extension
Removing unused thirdparty dependency - jquery-live-extension.
2016-03-01 14:29:45 +13:00
Damian Mooyman
f20ad434ce API Update TinyMCE to 4.x
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
2016-02-23 10:10:02 +13:00
Ben Manu
dbe248500c Removing unused thirdparty dependency - jquery-livequery. 2016-02-22 14:12:41 +13:00
Damian Mooyman
1851c45535 Merge pull request #5064 from benmanu/pulls/remove-jquery-validate
API Removing unused thirdparty dependency - jquery-validate.
2016-02-22 09:13:28 +13:00
Damian Mooyman
c98a102121 Merge pull request #5061 from benmanu/pulls/remove-jquery-effen
Removing unused thirdparty dependency - jquery-effen.
2016-02-22 09:07:26 +13:00
Ben Manu
195e1a4d0d Removing unused thirdparty dependency - jquery-validate. 2016-02-19 16:55:13 +13:00
Damian Mooyman
1c3709371e Merge pull request #5059 from benmanu/pulls/remove-tabstrip
Removing unused thirdparty dependency - tabstrip.
2016-02-19 15:33:03 +13:00
Damian Mooyman
8ae0eccce5 Merge pull request #5058 from benmanu/pulls/remove-jquery-metadata
Removing unused thirdparty dependency - jquery-metadata.
2016-02-19 15:32:50 +13:00
Damian Mooyman
23a06776e6 Merge pull request #5057 from benmanu/pulls/remove-jquery-selector
Removing unused thirdparty dependency - query-selector.
2016-02-19 15:32:41 +13:00
Ben Manu
8ac92ffcf9 Removing unused thirdparty dependency - jquery-effen. 2016-02-19 15:12:43 +13:00
Damian Mooyman
beb32e2cb9 Merge pull request #5055 from benmanu/pulls/remove-greybox
Removing unused thirdparty dependency - greybox.
2016-02-19 14:47:57 +13:00
Ben Manu
4d907b5b1d Removing unused thirdparty dependency - jquery-live-extension. 2016-02-19 14:47:19 +13:00
Ben Manu
1902600012 Removing unused thirdparty dependency - tabstrip. 2016-02-19 14:40:16 +13:00
Ben Manu
abfc1d0a6c Removing unused thirdparty dependency - jquery-metadata. 2016-02-19 13:57:55 +13:00
Ben Manu
9c83739721 Removing unused thirdparty dependency - query-selector. 2016-02-19 11:22:17 +13:00
Ben Manu
1a32862540 Removing unused thirdparty dependency - greybox. 2016-02-19 10:44:47 +13:00
Ben Manu
8523e0ceee Removing unused thirdparty dependency - firebug-lite. 2016-02-19 10:42:35 +13:00
David Craig
2140025c20 Implement RFC-7 JavaScript module loader
- Adds ES6 support via Babel
- Transforms existing JavaScript to UMD modules
- Adds module bundling via Browserify
- Existing JavaScript converted to UMD modules
- lib.js and leftandmain.js are bundled using browserify
- JavaScript minifying of bundles handed by gulp
2016-01-26 11:39:20 +13:00
Damian Mooyman
e6b877df27 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +13:00
David Craig
254b942737 Adds npm for managing client-side dependencies
- Includes a package.json file with build and CI scripts
- Includes shrinkwrap file for locking dependency version
- Includes Gulp for running build tasks
- Includes a 'build' task for copying library files from node_modules to thirdparty
- Includes a 'sanity' task for makes sure library files in thirdparty match what's in node_modules
- Includes updates to .travis.yml (new JS_SANITY_CHECK flag) to run the sanity task
2016-01-13 09:23:47 +13:00
Stephan Bauer
95e96fa2b2 BUG jquery.jstree patched to improve drag-and-drop handling (fixes #4881) 2016-01-03 23:20:22 +01:00
Loz Calver
977642daa9 Remove Spyc YAML library
Also had to fix some fixture files - none of the YAML spec versions actually support tabs anyway
2015-10-19 17:07:34 +01:00
Sam Minnee
8b88789c82 Removed Zend/Log. 2015-08-28 15:46:40 +12:00
Ingo Schommer
fb9753ddc4 Retain script tags in editor if allowed (fixes #3611)
TinyMCE strips them by default, but if they're specifically added
to the allowed elements we should respect that setting.

Example PHP config:
$validEls = HtmlEditorConfig::get('cms')->getOption('extended_valid_elements');
$validEls .= ',script[src|type]';
HtmlEditorConfig::get('cms')->setOption('extended_valid_elements', $validEls);
2015-08-21 16:49:43 +01:00
Sam Minnee
a19fe39301 FIX: Avoid PHP 5.6 deprecation with access to HTTP_RAW_POST_DATA. Fixed #4511
PHP 5.6 doesn't like access to HTTP_RAW_POST_DATA and recommends the use of php://input,
which is already supported by this code. I've just removed the deprecated calls.
2015-08-19 16:02:19 +12:00
Sam Minnee
fa4942f3b5 MINOR: Fix line-endings in rpc.php 2015-08-19 16:01:57 +12:00
Damian Mooyman
8331171f2c Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Damian Mooyman
0a8f328947 Fix merge / test regressions 2015-05-28 16:59:05 +12:00
Damian Mooyman
319b96b48b Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/05_Contributing/01_Code.md
	forms/TreeDropdownField.php
	model/DataObject.php
	security/Member.php
	tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
Ingo Schommer
12376637cf Merge pull request #2801 from mmichelli/3.1
Norwegian translation issue
2015-03-08 11:24:06 +13:00
Damian Mooyman
dff65867cc Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
Stephan Bauer
96962a92cf Changed cache_dir to respect TEMP_FOLDER 2015-02-12 15:21:55 +01:00
Simon Welsh
c14d58f585 Merge branch '3.1'
Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Damian Mooyman
66b3d1cae7 Upgrading TinyMCE dependency from 3.5.8 to 3.5.11 2014-07-05 15:06:26 +12:00
Ingo Schommer
bb03f6ba2f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	forms/HtmlEditorField.php
2014-06-15 22:50:20 +12:00
Simon Welsh
8ed5e8490d Use php.internal_encoding instead of iconv.internal_encoding in PHP 5.6+ 2014-05-24 11:35:19 +10:00