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,468 Commits 31 Branches 527 Tags 162 MiB
ac101790d7
Commit Graph

309 Commits

Author SHA1 Message Date
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
Ingo Schommer
89f963c468 Merge pull request #1191 from ARNHOE/patch-1 
Create nl.js for ssbuttons
 2013-02-18 02:26:33 -08:00
ARNHOE
7e88e67621 Create nl.js 2013-02-18 02:20:50 -08:00
ARNHOE
70d20ada3a Create nl.js 2013-02-18 02:20:02 -08:00
Hamish Friedlander
2335c074b3 NEW Make shortcode parser more clever about placement 
Shortcodes have traditionally had a problem that they are inside <p> tags,
but generate block level elements. This breaks HTML compliance.

This makes the shortcode parser now mutate the DOM based on the "class" attribute on
the shortcode to insert the generated block level element at the right place in the DOM

 - for "left" and "right" elements it puts them just before the block level
   element they are inside

 - for "leftAlone" and "center" elements it splits the DOM around the shortcode.

The trade off is that shortcodes are no longer "text level" features. They need
knowledge of the HTML they are in to perform this transformation, so they can
only be used in (valid) HTML
 2013-02-18 10:49:52 +13:00
Hamish Friedlander
4681673896 FIX TinyMCE context menu displaying default dialogs instead of our one 2013-01-31 16:39:00 +13:00
Ingo Schommer
fa84c2d705 Merge remote-tracking branch 'origin/3.0' 2012-12-10 17:50:43 +01:00
Ingo Schommer
ab260d4913 Upgraded jQuery UI from 1.9.1 to 1.9.2 (fixes #8062) 2012-12-04 16:05:48 +01:00
Sean Harvey
6ce6f9a2c1 Merge branch '3.0' 2012-11-26 17:17:41 +13:00
Sean Harvey
220d317f27 Upgrading TinyMCE dependency from 3.5.7 to 3.5.8 
This also fixes 78ab9d3bf6 which strips HTML data attributes
from the editor contents.

See changelog here:
http://www.tinymce.com/develop/changelog/index.php?type=tinymce
 2012-11-26 15:13:48 +13:00
Sean Harvey
6a868e79e1 Removing deprecated prototype/behaviour libraries 2012-11-16 11:37:56 +13:00
Sean Harvey
77337ae58c Removing deprecated TableListField and subclasses 
These have been moved to a module called "legacytablefields"
located at https://github.com/silverstripe-labs/legacytablefields
 2012-11-16 11:04:28 +13:00
Ingo Schommer
ff39f9ad38 Upgrade jQuery UI to 1.9 
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign)
 2012-11-06 19:45:56 +01:00
Martin D.
e30029ba1f Update thirdparty/jquery-ui/datepicker/i18n/jquery.ui.datepicker-en.js 
Syntax error on line 22.
 2012-10-30 12:17:41 -03:00
martimiz
5186bada17 FIX DateField Calendar - make dates with day- and monthnames validate 
In locales other than en_US, as a result of missing jQuery locale
files, the DatePicker defaulted to English whenever day and monthnames
were used, breaking validation. Needed to change official locale files
before adding, because Zend_Date and jQuery day/monthnames not matching
again breaks validation.

Removed hard setting the names to uppercase, breaking validation for
other locales

Changed order in convert_iso_to_jquery_format(), to prevent EEE(E)
settings from being overwritten

Added a check for existing locale files, and made DatePicker fallback
to ISO yyy-MM-dd if a missing locale file would otherwise break
validation.

Added documentation for the DateField
 2012-10-12 10:16:35 +02:00
Normann Lou
9aaa6b1a7b ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty. 2012-10-05 17:00:39 +13:00
Frank Mullenger
a602ba5941 BUGFIX: Old version of SimpleTest does not recognise input fields of 
type 'email'.
 2012-09-28 12:07:54 +12:00
Sean Harvey
8806fd18c5 MINOR Upgrading TinyMCE dependency from 3.5.6 to 3.5.7 2012-09-24 15:05:50 +12:00
Sean Harvey
b075fa29c5 Have tiny_mce_gzip.php use local silverstripe-cache folder if available 
This is a fix for ticket #7670. Some hosting situations don't
allow write access to the system temp path. tiny_mce_gzip.php is currently
using sys_get_temp_dir() by default, and not using a local silverstripe-cache
folder that may exist in the SilverStripe project.

This change moves the getTempFolder() function into a common file, and
includes that in core/Core.php, as well as thirdparty/tinymce/tiny_mce_gzip.php
so both locations share the same code to work out the temp path.
 2012-09-19 16:43:17 +12:00
Sean Harvey
758b4fd173 Upgrading TinyMCE dependency to 3.5.6, and updating language packs. 2012-09-14 15:26:17 +12:00
Ingo Schommer
8a5a4ffd73 BUG TinyMCE UI shows placeholders in mi_NZ (fixes #7797) 2012-09-11 14:31:34 +02:00
jean
85ab39b280 FIX 7832 Lang files for ss macron plugin - correct path to "langs", not "lang" 
MINOR Use consistent ed.getLang method
 2012-08-31 11:57:44 +12:00
Hamish Friedlander
915ae1a966 Upgrade entwine to latest 
Fixes issue where inspector used document.write
 2012-08-20 11:26:11 +12:00
Ingo Schommer
7170eb7dc9 Localized parts of TinyMCE into Te Reo 2012-08-13 00:15:36 +02:00
Ingo Schommer
857afc4ee7 Localization for custom TinyMCE ssmacron module 2012-08-13 00:15:36 +02:00
Ingo Schommer
64357a4522 Merge branch '3.0' 
Conflicts:
	admin/css/screen.css
	admin/scss/_forms.scss
	docs/en/changelogs/3.0.0.md
 2012-07-05 18:01:09 +02:00
Ingo Schommer
9ce0c9a483 Relative include path for RailsYAML PHPUnit tests 
Avoids problems when PHPUnit includes this test through autodiscovery. This is the case when running PHPUnit
with a specific path argument, which overrules phpunit.xml.dist
(e.g. "phpunit sapphire/").
 2012-07-05 12:14:56 +02:00
Ingo Schommer
45a14951a3 Revert "MINOR Updated sfYaml parser dependency to 2.0.14, use it in ConfigManifest and i18nTextCollector" 
This reverts commit 3a01c2ab2e.

Conflicts:

	core/manifest/ConfigManifest.php
	i18n/i18nTextCollector.php
 2012-06-21 21:11:48 +02:00
Ingo Schommer
3a01c2ab2e MINOR Updated sfYaml parser dependency to 2.0.14, use it in ConfigManifest and i18nTextCollector 
Changed class loading to new file structure, moved dependency to framework/thirdparty,
rather than relying on "second level" dependencies through Zend_Translate_RailsYAML.
To be replaced by a composer dependency (+ proper autoloading) once in place.
 2012-06-20 14:06:21 +02:00
Sean Harvey
0ef825301d MINOR Upgrade TinyMCE dependency from 3.5.1.1 to 3.5.3 2012-06-20 22:34:39 +12:00
Ingo Schommer
7ba759e77b MINOR Fixed jQuery.jstree men leaks on 'dnd' and 'context menu' plugins, by removing globally bound event handlers (see #7258) 2012-06-15 01:19:20 +02:00
Ingo Schommer
fa900f70d5 MINOR jQuery UI tabs memory leak (see ##7258) 
Events with closed in DOM elements get bound to window on tab initialisation,
and never unbound. Will be fixed with jQuery UI 1.9
 2012-06-15 01:19:19 +02:00
Hamish Friedlander
bbd1bb7495 API CHANGE: Upgrade jquery entwine 2012-06-15 01:17:55 +02:00
Hamish Friedlander
8177c93c92 BUGFIX: Fix thirdparty library jquery-cookie referencing $ outside a closure, which wont work in noConflict mode 2012-06-15 01:16:49 +02:00
Naomi Guyer
7523f98e04 BUGFIXES: File Uploads 
* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
 2012-06-08 18:40:33 +02:00
Ingo Schommer
ad6b7a40ee BUGFIX Add Maori locale data (mi, mi_NZ) from CLDR 1.9 to avoid Zend_Locale complaining (fixes #7386) 2012-05-29 13:47:24 +02:00
Sean Harvey
9b9bd23820 MINOR Upgrade TinyMCE dependency to 3.5.1.1 2012-05-28 21:42:15 +12:00
Mateusz Uzdowski
d8fdda79be BUGFIX: Add comments and fix IE problems (class is a reserver JS word). 2012-05-25 09:31:15 +12:00
Simon Welsh
bb29ff3611 FEATURE: Allow adding media to the CMS using oEmbed 2012-05-24 17:00:21 +12:00
Hamish Friedlander
7b8e25467e MINOR: Update jquery.entwine to latest version. Brings speed improvements in onmatch, and an inspector. 2012-05-14 16:34:18 +12:00
Stig Lindqvist
dffae1a2e7 API CHANGE: Do not rely on a specific OS mime type detection, use PHP finfo 
This also removes the $global_mimetypes that was generating weird errors when both HTTP and Mailer classes tried to modify and use it.

Support of finfo should be straightforward since PHP 5.3 includes that module that default
 2012-05-11 11:34:07 +12:00
Ingo Schommer
8b4afc01a7 Merge pull request #426 from halkyon/jquery_upgrade 
MINOR Upgrade jQuery dependency to 1.7.2
 2012-05-10 02:49:41 -07:00
Sean Harvey
c9900b7df2 MINOR Upgrade jQuery UI dependency to 1.8.20 2012-05-10 16:39:50 +12:00
Sean Harvey
1e8a89db8f MINOR Upgrade jQuery dependency to 1.7.2 2012-05-10 16:21:11 +12:00
Sean Harvey
c507efcfad MINOR Updated TinyMCE dependency from 3.4.6 to 3.5 2012-05-08 16:29:43 +12:00
Sam Minnee
8eb0814d04 BUGFIX: Put all php file inclusions/exclusions into a single file, because some servers don't seem to allow reenabling of file access in a subdirection .htaccess file. 2012-05-03 13:13:51 +12:00
Simon Welsh
82ca56df25 MINOR Remove .svn folder 2012-04-20 09:54:58 +12:00
Sam Minnee
cc7a012139 BUGFIX: Use the copy of symfony-yaml bundled with Zend_Translate to prevent class conflicts. Remove now-unnecessary symonfy-yaml thirdparty lib. 2012-04-18 09:34:57 +12:00
Sean Harvey
f3137e5b2b BUGFIX Fixed regression where image and link popups don't open 2012-04-17 15:13:55 +12:00
Sean Harvey
5813a94851 MINOR Cleaning up spaces and replace with tabs 2012-04-17 14:44:13 +12:00
Will Rossiter
7a4392ca03 Merge pull request #324 from halkyon/installer_fixes 
MINOR: Fix install not loading because of Zend/Translate.php dependency in i18n.php
 2012-04-16 16:34:53 -07:00
Sean Harvey
e6007c2637 MINOR Removed redundant system temp path discovery in tiny_mce_gzip, 
juse use sys_get_temp_dir() instead which is always available.
 2012-04-17 10:53:40 +12:00
Simon Welsh
df08c2fadf API-CHANGE Move tinymce plugins in thirdparty 2012-04-16 12:25:49 +02:00
Ingo Schommer
ef5e6394d6 MINOR Don't break on empty YAML files 2012-04-15 20:43:32 +02:00
Ingo Schommer
c649fa3acf MINOR Workaround for duplicate require_once calls of same class in two locations (SS core and Zend_Translate_RailsYAML) 2012-04-15 18:46:04 +02:00
Ingo Schommer
9e95ba0045 BUGFIX Disable performance intensive Zend_Locale::isLocale() valiations in Zend_Translate_Adapter, which is only used for i18n class in SilverStripe core, so a controlled environment where valid locales are assumed 2012-04-15 17:17:16 +02:00
Ingo Schommer
bd23a07bba API CHANGE Using Zend_Translate with YAML translation files, replacing the $lang global and PHP files in the /lang folders. 2012-04-15 17:17:15 +02:00
Ingo Schommer
a3e74bb2ef MINOR Added Zend_Translate dependency (v1.11.11) 2012-04-15 17:17:14 +02:00
Ingo Schommer
3342c84abe MINOR Added zend_translate_railsyaml dependency 2012-04-15 17:17:14 +02:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Hamish Friedlander
fc5592ef17 MINOR: PHP-PEG is now triple licensed under BSD, MPL and GPL by request 2012-04-13 15:33:12 +12:00
Hamish Friedlander
7ae9f8af84 BUGFIX: match_function had been partially refactored to take $value as an argument rather than from the instance variable, but that hadnt been completed, causing problems with E_STRICT. This completes that refactoring. 2012-04-13 15:33:12 +12:00
Sean Harvey
0dd4d4386e BUGFIX php-peg E_STRICT fixes 2012-04-12 14:58:21 +12:00
Sean Harvey
972dfee5c3 MINOR Fixing E_STRICT compliance in simpletest 2012-04-12 12:06:47 +12:00
Ingo Schommer
6a10ed19c1 MINOR Added TinyMCE language pack 2012-04-11 18:05:29 +02:00
Andrew O'Neil
501c8f3f31 MINOR: Fix E_STRICT notices in php-peg 2012-04-11 14:40:27 +12:00
Sean Harvey
4b2326cb66 MINOR Fixed use of split which is deprecated 2012-04-10 22:19:17 +12:00
Sean Harvey
dbc4be3e94 API CHANGE Removed Services_JSON library, as we use the built-in json functions instead. 2012-03-31 13:20:19 +13:00
Sean Harvey
cf014dc56d MINOR Replaced use of deprecated split() with preg_split() and fixed use of "&new Class()" which is deprecated in PHP 5.3 
ENHANCEMENT E_DEPRECATED and E_USER_DEPRECATED are now handled as notice level errors in Debug.
 2012-03-27 23:16:52 +13:00
Sean Harvey
fea3a4eea0 MINOR Removed useless .DS_Store files 2012-03-20 20:41:10 +13:00