tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,393 Commits 31 Branches 527 Tags 162 MiB
6fe5c37d6a
Commit Graph

279 Commits

Author SHA1 Message Date
Daniel Hensby
44930f211b
FIX Allow HTML 5 input tags in FunctionalTest form submissions 2017-12-22 11:15:56 +00:00
Daniel Hensby
2aa1d8f2c4
remove create_function usage 2017-12-05 14:20:13 +00:00
Daniel Hensby
6494bc820c
Move spyc dependency to composer 2017-07-28 13:35:30 +01:00
Christopher Joe
5f5bfa5e70 Fix create temp folder if it does not exist 2017-06-06 09:58:51 +12:00
Christopher Joe
4b9d5dceb8 Fix tinymce image selection issue in newer versions of Chrome 2017-06-02 15:06:16 +12:00
Stephan Bauer
95e96fa2b2 BUG jquery.jstree patched to improve drag-and-drop handling (fixes #4881) 2016-01-03 23:20:22 +01: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
Simon Welsh
85d2a16ad6 Update Zend_Locale_Format to the latest Zend version 2014-05-24 11:28:00 +10:00
Damian Mooyman
e9c3ff933f Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	composer.json
 2014-05-06 10:22:09 +12:00
Damian Mooyman
cff42700ff Removed demo folder 2014-04-29 12:51:47 +12:00
Damian Mooyman
982ad569b9 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:09:51 +12:00
Mateusz Uzdowski
bde16f0eb6 BUG Load just one of each plugin. 2014-04-16 14:40:48 +12:00
Sam Minnee
346d3edb37 Merge branch '3.1' 2014-02-13 17:58:30 +13:00
Ingo Schommer
5e29249593 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	search/filters/PartialMatchFilter.php
 2014-02-12 15:18:27 +13:00
Ingo Schommer
3f9bd383d4 Removed SWFUpload, no longer used 2014-02-12 15:11:46 +13:00
Mario
6c6c0cc630 Norwegian translation issue 
Norwegian translation issue, that breaks the ui in March. 

"mar." should be "mars"
 2014-01-28 14:09:57 +01:00
Ingo Schommer
455e550d9a Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/topics/testing/create-silverstripe-test.md
	forms/Form.php
	i18n/i18n.php
	model/Image.php
 2013-09-27 19:22:14 +02:00
Ingo Schommer
60966898e2 Trailing semicolon to fix TinyMCE bug (fixes #2408) 
Regression introduced by #2386
 2013-09-16 01:09:37 +02:00
Naomi Guyer
52ef14a9ec BUG: Image resize allows skewing of image in IE (fixes CMS #791) 
Including this plugin seemed like the most complete solution to this
problem, and allows it to be removed when tinymce is upgraded (assuming
they have fixed this issue). Uses a compressed version of the
advimagescale fork from sourceforge
(http://sourceforge.net/p/tinymce/plugins/186/), as it allowed for
multiple tinymce instances.
 2013-09-04 15:01:46 +12:00
Ingo Schommer
5f0329c6f2 Re-added entwine src/ in order to use inspector in dev mode 2013-08-30 10:12:50 +02:00
Ingo Schommer
a4c6ae3e90 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:33 +02:00
Ingo Schommer
699cbfe851 Merge branch '3.1.0' into 3.1 
Conflicts:
	thirdparty/jquery-entwine/dist/jquery.concrete-dist.js
	thirdparty/jquery-entwine/spec/SpecRunner.html
	thirdparty/jquery-entwine/spec/spec.entwine.eventcapture.js
	thirdparty/jquery-entwine/spec/spec.entwine.namespaces.js
	thirdparty/jquery-entwine/src/domevents/jquery.entwine.domevents.addrem.js
	thirdparty/jquery-entwine/src/jquery.entwine.eventcapture.js
	thirdparty/jquery-entwine/src/jquery.entwine.js
	thirdparty/jquery-entwine/src/jquery.focusinout.js
 2013-08-20 16:58:40 +02:00
Ingo Schommer
a1419b2f7e Updated entwine dependency 
And removed unnecessary files, just adds
to the security surface of the webroot.
 2013-08-20 15:19:51 +02:00
Hamish Friedlander
68d8ec31a5 FIX Memory leaks in jstree drag & drop 2013-08-20 16:07:54 +12:00
Hamish Friedlander
13377ee4bd Update jQuery Entwine to latest to pull memory leak fix 2013-08-20 15:17:50 +12:00
Ingo Schommer
7ae75c1a89 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	forms/HtmlEditorField.php
 2013-08-16 13:37:44 +02:00
Jeremy Bridson
cf75166d83 MINOR: ISSUE-19 CWP Accessibility fixes - Added macron to Māori toggle button for translations on the CWP demo site. 2013-08-12 15:39:00 +12:00
Hamish Friedlander
d44024b1cf Merge branch 'origin/3.1' 2013-07-24 13:29:55 +12:00
Arno Poot
aa6da4ee4e Fixed CountryDropDownField showing East Germany 2013-07-23 19:13:11 +02:00
carlos barberis
47147eb3df API: delete simplepie from framework thirdparty 2013-07-01 09:41:57 +02:00
Ingo Schommer
4aafe47fbb OEmbed resize on correct attrs (fixes #1950) 2013-05-25 01:26:34 +02:00
Zauberfisch
5008070df1 Hacked Zend_Locale to allow lc_XX locale 2013-05-11 19:42:48 +01:00
Ingo Schommer
0e5b099287 FIX Unquoted shortcodes weren't parsed (fixes #680) 
Since that used to be the default shortcode notation
for our core "insert media" functionality, its important
to have this fixed and keep supporting "legacy" content
created with 3.0.
 2013-04-26 01:00:13 +02:00
Hamish Friedlander
53128c5d2f Make ShortcodeParser use HTMLValue for HTML parsing 2013-03-14 12:49:03 +13:00
Ingo Schommer
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/HTTP.php
 2013-02-26 13:28:35 +01:00
Simon Elvery
384f173a7f Add zh-CN and zh-TW locale files for jQuery UI datepicker. 2013-02-25 16:54:27 +10:00
Hamish Friedlander
5bbf94d2f4 FIX HTML5 parser not tracking context correctly 2013-02-20 10:57:06 +13:00
Ingo Schommer
a86e4ee00c Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/injector/InjectorTest.php
	tests/travis/before_script
 2013-02-18 14:15:42 +01:00