yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,537 Commits 4 Branches 7 Tags
7f4280c67f4fcce342b6ea9e9e41074c5cd6ffb4
Commit Graph

220 Commits

Author SHA1 Message Date
Sebastiaan Janssen
c07780caff Merge pull request #2481 from SaDa1337/dev-v7.9 
fix x alignment in colorpicker transparent option in umbraco skin
 2018-08-26 22:08:24 +02:00
Sebastiaan Janssen
386dc1a14d U4-11253 New Chrome 66 trimStart function is overriding the Umbraco Core trimStart polyfill 2018-04-19 19:54:53 +02:00
Maciej Sadowski
5bfac6c5b4 fix x alignment in colorpicker in umbraco skin 2018-02-27 09:23:35 +01:00
Mads Rasmussen
3c7c6b4ad7 Update thumbnails.less 
Use new color variables
 2017-11-08 11:38:32 +01:00
Mads Rasmussen
5af9712d51 Merge branch 'dev-v7' into U4-9144 2017-11-08 10:43:58 +01:00
Sebastiaan Janssen
880ae5cb95 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 2017-09-28 20:01:44 +02:00
Shannon
d2d43255aa U4-5222 Rollback Feature fails to update the UI to show the rolled back content - requires refresh 2017-09-28 02:38:53 +10:00
Shannon
65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2017-09-07 22:43:03 +10:00
Mads Rasmussen
ed850629da Merge branch 'dev-v7' into temp-gulp-spike 2017-08-29 11:47:17 +02:00
Claus
3885454b26 updating name of usersResource for v. 7.7 2017-08-16 13:42:19 +02:00
Shannon
98a545bdc6 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-09 23:18:51 +10:00
Mads Rasmussen
08150c05e9 Merge pull request #1971 from Bitmapped/U4-9977 
Fix U4-9977
 2017-08-09 13:28:04 +02:00
Bitmapped
7db1055a0d Remove JSON files, which appear to be unnecessary. 2017-08-08 13:54:36 -04:00
Per Ploug
ba82885b6d Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-gulp-spike 
# Conflicts:
#	build/BuildBelle.bat
 2017-08-07 14:05:53 +02:00
Shannon
a875ede3da Removes a ton of old unused legacy files 2017-07-20 18:55:38 +10:00
Shannon
3eba5e5c19 Merge branch 'dev-v7.7' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Tests/Services/UserServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-06-23 16:37:56 +10:00
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
Brian Powell
70a0bbbe61 Change font references: icomoon -> tinymce 2017-06-03 12:49:42 -04:00
Brian Powell
24d9c60bdf Update fonts and stylesheet to include table icons missing per U4-9977 2017-06-01 21:59:31 -04:00
Shannon
b130ccf9c1 removes userResource and adds the disableUser to the usersResource 2017-05-18 15:53:54 +10:00
Mads Rasmussen
28d7a4a6dc Merge branch 'dev-v7.6' into temp-gulp-spike 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
 2017-05-05 13:01:24 +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
Per Ploug
cc3355b1f9 fixes issues with bootstrap2 navbar and less2 syntax 2017-01-07 01:27:26 +01: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
Chris Houston
a4f83e0125 Style changes to the developer dashboard area. 2016-11-03 14:41:41 +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