yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,061 Commits 4 Branches 7 Tags
3de0b85ae3e1c307b58ad7c63cbf1e7446f486d8
Commit Graph

198 Commits

Author SHA1 Message Date
Claus
01ccf8a6a6 Merge branch 'U4-8664' of https://github.com/DoctaJonez/Umbraco-CMS into temp-U4-8664 2017-06-20 12:59:28 +02:00
Sebastiaan Janssen
c27ca1fb0d U4-9724 Tiny MCE error when adding a link "Cannot read property 'href' of undefined" 2017-06-20 10:16:00 +02:00
Mads Rasmussen
809a3f952e fixes: U4-9578 Increase default font-size for RTE 2017-04-05 12:09:10 +02:00
Shannon
8e03a1ffca Updates tha a and img tags in the rte to use a data-udi attribute when udi's are used 2017-03-22 18:17:59 +11:00
mikkelhm
3f3db006e7 When selecting a local link, also update the data-id to be the udi 2017-03-21 14:43:54 +01:00
mikkelhm
504aac0350 Fixes variable names when selecting a local link in the rich text editor 2017-03-20 14:32:43 +01:00
Shannon
9a57f463ce Updates LocalLinks to be UDI, this will support both INT and UDI as LocalLink but when a new LocalLink is picked, it will use the UDI so eventually the INT will be gone 2017-03-14 15:31:30 +11:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Sebastiaan Janssen
a10b59d03b Revert "Fixes: U4-9217 - Sanitize tags before storing them in the database" 
This reverts commit 47c8e6854e.
 2017-01-05 17:14:14 +01:00
Per Ploug
2ec3278637 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-template-editor 2016-12-29 01:51:10 +01:00
Shannon
90f30c3f3c Ensures tag values are Html encoded both on the client side and on the server side to prevent any xss 2016-12-05 17:13:07 +11:00
Matthew Jones
662bf16a4f Fixed issue: U4-8664 TnyMCE RTE is not in the scope of UI localization. 
The rich text editor previously had no knowledge of the current localisation region.

The complexity arrived from the $locale regions not having a direct mapping to TinyMce regions.  $locale regions are in the format of "de-de", "ru-ru", "en-gb", "en-us", etc.  The TinyMce locales are in the format of "de", "ru" and "en".  I've added some code in rte.controller.js to map from the former to the latter, but a fallback to "en" will need to be added if the current locale isn't supported by TinyMce, otherwise a runtime crash will occur.

The same is true of the codemirror plugin for TinyMce.  Language files don't exist for the plugin, but they are expected when different locales are provided.  I have therefore created placeholders that are equivalent to the TinyMce language files, but all are currently copied from english.
 2016-11-03 16:13:03 +00:00
Per Ploug
ebd2bf149c Basic editor + macro dialog implemented 2016-06-12 18:48:46 +02:00
Mads Rasmussen
7dfc288f93 setup view + load ace editor 2016-06-12 12:26:08 +02:00
Shannon
4aa4a03013 U4-8511 Update moment.js to the version to 2.10.3 for release 2016-05-30 14:25:47 +02:00
Shannon Deminick
4f5b34cdfe Merge pull request #1162 from pynej/codemirror-js-error 
Fix for missing doc.setLine() function breaking code mirror editor.
 2016-03-10 09:58:16 +01:00
Jeremy Pyne
0995b2cb5a Fix for missing doc.setLine() function breaking code mirror editor. 2016-03-09 14:55:15 -05:00
Claus
44f2a9e96f Fixes: U4-7837 Changing document type should refresh the current node 2016-02-05 14:37:01 +01:00
Shannon
aa91b5c68d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-12-16 11:06:37 +01:00
bjarnef
5a9dd11a7c Change margin-top for triangle and re-order config properties 2015-12-15 15:42:14 +01:00
bjarnef
9e6123abd3 Modify properties and styling 2015-12-15 15:42:13 +01:00
bjarnef
6c3ef2aaa9 Add more config properties 2015-12-15 15:42:13 +01:00
bjarnef
88fadcf74e Add slider bootstrap-slider v5.2.6 
Add newer version of script and add addtional properties.
 2015-12-15 15:42:12 +01:00
Shannon
26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
 2015-12-15 10:40:52 +01:00
Sebastiaan Janssen
d5f9dfecc4 U4-7496 Backoffice dropdowns quit working in Chrome after update to v47.0.2526.73 
#U4-7496 Fixed
 2015-12-08 13:54:56 +01:00
Mads Rasmussen
fe9954b674 Fixes: U4-7447 Grid - Touch support 2015-12-01 11:23:10 +01:00
Shannon
6c3b63cf55 fixes issue with legacy dialogs not closing the nav 2015-09-03 16:32:25 +02:00
Shannon
d1bed54cf1 Fixes tabdrop memory leak U4-6907 Bootstrap tab drop has memory leaks, fixes tab/header to use the correct bootstrap tab api, simplifies the header code dramatically and speeds up processing. Fixes mem leak with delayedMouseLeave.directive 2015-08-04 11:59:57 +02:00
Shannon
84cac6ac90 Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror 2015-06-24 19:06:42 +02:00
Shannon
40c35e5851 Fixes: U4-6582 RTE "Link To File" missing rel="nodeId" attribute 2015-06-23 10:53:56 +02:00
Shannon
be84db097a Fixes: U4-6599 TinyMCE autoresize plugin has a bug and needs to be updated, U4-5689 update to latest TinyMCE 4.x version 2015-06-17 15:06:34 +02:00
Shannon Deminick
9dc0999ebd Merge pull request #595 from redmorello/U4-6036 
U4 6036 - Checkbox and Radio button styling incorrect in backend
 2015-05-07 11:49:30 +10:00
kgiszewski
f06a468fb4 Fix for U4-6395, U4-6117 2015-03-13 11:40:04 -04:00
Shannon
d2083673be Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower. 2015-03-10 13:02:34 +11:00
Shannon
2834ccdc2b Fixes: U4-6344 TinyMCE RTE style_formats configuration changes 2015-03-09 17:31:29 +11:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
redmorello
e5ec935128 Update forms.less 
Removed negative left margin from checkbox and radio button inputs.
 2014-12-18 11:08:44 +00:00
Shannon
2d9bd394ae Updates the codemirror plugin for tinymce so that it uses it's own alias: codemirror, so the code and codemirror plugins can be enabled individually. 2014-11-18 14:06:43 +11:00
Shannon
24695948d2 Fixes API compatibility issues with new date picker, moves moment to it's own folder since it might be used for other things. 2014-10-28 16:16:00 +10:00
arknu
0c4d574fe4 add moment.js 2014-10-27 12:57:24 +01:00
arknu
b541fe6b3f U4-5520: Localize date/time picker (with improved compatibiility and other fixes) 2014-10-27 12:56:47 +01:00
Shannon
87db6d672a Revert "U4-5520: Localize datepicker" 2014-10-27 17:47:50 +10:00
Shannon Deminick
a44123f064 Merge pull request #504 from arknu/datetimepicker-locale 
U4-5520: Localize date/time picker
 2014-10-24 12:17:45 +10:00
Shannon
ca58e8f98f Fixes: U4-4176 v7, cannot disable users in right-click-menu. 2014-10-16 18:45:02 +10:00
arknu
f5447e1bc1 remove minified version 2014-10-16 09:48:52 +02:00
arknu
a916686d2e add moment.js 2014-10-16 09:48:47 +02:00
arknu
6adf04eddc U4-5520: Localize datepicker 2014-10-16 09:48:46 +02:00
Shannon
26059ebad0 updated some of the table styling, updated the path to be relative and updated the release config. 2014-10-16 17:38:36 +10:00
Shannon
f48a218456 Merge branch 'tinymce-codemirror' of https://github.com/pynej/Umbraco-CMS into pynej-tinymce-codemirror 2014-10-16 17:06:22 +10:00