yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,443 Commits 4 Branches 7 Tags
6a4e9f5368d73fe3bcf9b0ba232e02e0384e2edd
Commit Graph

21948 Commits

Author SHA1 Message Date
Warren Buckley
6a4e9f5368 Bye bye codemirror TinyMce Wrapper Plugin 2018-10-12 13:59:39 +01:00
Mads Rasmussen
e805305352 refresh model on save 2018-10-12 13:55:57 +02:00
Warren Buckley
4fb343e8d4 Merge branch 'temp-tinymce' of https://github.com/umbraco/Umbraco-CMS into temp-tinymce 2018-10-12 12:30:01 +01:00
Warren Buckley
1cb4df2750 WIP Ace editor for the HTML source code 2018-10-12 12:29:34 +01:00
Shannon
ffc0ec4556 removes dimensions pre-values from rte 2018-10-12 10:51:43 +02:00
Shannon
93075a82de menu now wraps in classic mode 2018-10-12 10:42:11 +02:00
Shannon
faec132f82 TEMP - removes inline mode adds stub code to have a fixed toolbar dom item 2018-10-12 10:28:36 +02:00
Shannon
ab846ec4f6 Changes default theme to Modern 2018-10-12 10:00:47 +02:00
Shannon
9198d7976f changes the default to classic 2018-10-12 09:50:53 +02:00
Shannon
019bb3ee95 Merge branch 'temp-tinymce' of https://github.com/umbraco/Umbraco-CMS into temp-tinymce 2018-10-12 09:47:47 +02:00
Shannon
08bf996737 Revert "wip for trying tinymce5 (will revert and come back to this later)" 
This reverts commit 8b6ede49b4.
 2018-10-12 09:47:40 +02:00
Shannon
8b6ede49b4 wip for trying tinymce5 (will revert and come back to this later) 2018-10-12 09:47:16 +02:00
Shannon
bf9bd4b1f5 delete the old skin files since we're not using them 2018-10-12 09:46:52 +02:00
Warren Buckley
43d4447498 Something went wrong with a merge temp8 into this after the removal of bower 2018-10-12 08:19:38 +01:00
Warren Buckley
4fd54ba339 Adds a class to the DIV so we can add a border for the inline editor when the RTE is yet to have any content/copy added - to make it obvious there is something there to click into 2018-10-11 15:56:05 +01:00
Warren Buckley
e2c16f15da Adds in skins for tinymce 2018-10-11 15:19:32 +01:00
Warren Buckley
0e8c5f48fe tinymce to correct version - 4.8.3 2018-10-11 15:14:33 +01:00
Warren Buckley
a275b47139 npm install of tinymce 2018-10-11 15:12:05 +01:00
Warren Buckley
7603ab6d47 Merge branch 'temp8' into temp-tinymce 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/package-lock.json
 2018-10-11 15:10:21 +01:00
Shannon
1597dce99e Adds pre-value drop down for theme selection 2018-10-11 15:39:18 +02:00
Warren Buckley
bbc28b132d Merge pull request #3260 from umbraco/temp8-remove-bower 
Temp8 remove bower
 2018-10-11 14:38:45 +01:00
Mads Rasmussen
9800f1bd9c fix paths in karma test 2018-10-11 15:31:39 +02:00
Mads Rasmussen
4f00082dd5 fix angular mocks 2018-10-11 15:06:12 +02:00
Shannon
1902ebd989 Fixes issue with umbsetdirtyonchange.directive 2018-10-11 14:56:22 +02:00
Mads Rasmussen
6071be79be set private to true in package.json. We don't need to publish on npm 2018-10-11 14:50:34 +02:00
Mads Rasmussen
e390d28e29 fix jquery-ui 2018-10-11 14:34:02 +02:00
Warren Buckley
ac5ee9053f Update & match momentjs version 2018-10-11 13:32:15 +01:00
Warren Buckley
ecaedc547a Fixes moment locale copying 2018-10-11 13:31:54 +01:00
Shannon
f816f19d60 Fixes some issues for rte 2018-10-11 14:25:33 +02:00
Mads Rasmussen
a00875089c get the right version of ace 2018-10-11 14:10:18 +02:00
Shannon
926fef43d0 Fixes merge issues 2018-10-11 14:07:04 +02:00
Mads Rasmussen
7a372bf814 fix lazyload 2018-10-11 13:50:52 +02:00
Shannon
f6c99f2bbc Merge remote-tracking branch 'origin/temp8' into temp-tinymce 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
 2018-10-11 13:33:18 +02:00
Mads Rasmussen
09f67c6c43 fix version 2018-10-11 13:26:35 +02:00
Mads Rasmussen
efefa54601 remove all bower logic in gulp + remove bower.json 2018-10-11 13:26:21 +02:00
Mads Rasmussen
bb5817ca92 fixing versions and files 2018-10-11 13:12:10 +02:00
Mads Rasmussen
bd20518d50 move the last dependencies 2018-10-11 12:16:09 +02:00
Warren Buckley
7ebccb1a36 Don't need to globally install bower anymore in this helper batch script 2018-10-11 10:54:45 +01:00
Mads Rasmussen
a0c7a45a4c move, move, move all day loong... 2018-10-11 10:44:14 +02:00
Mads Rasmussen
37d14f7413 moving moments + angular-dynamic-locale 2018-10-11 09:46:23 +02:00
Mads Rasmussen
7e85235e20 delete cssparser and less libraries 2018-10-10 21:32:08 +02:00
Mads Rasmussen
4d13c631ed aaand move some more 2018-10-10 21:29:42 +02:00
Mads Rasmussen
a4903b9581 get jquery libraries to npm 2018-10-10 20:58:35 +02:00
Niels Hartvig
f64cbfae60 Add info on release plan for Umbraco 8 to installer 2018-10-10 13:51:55 -05:00
Niels Hartvig
dd6d292896 Updating installer background 2018-10-10 13:51:42 -05:00
Mads Rasmussen
66333aa5ec fix label for schedule publish invariant content 2018-10-10 15:19:29 +02:00
Robert
a8449a4d01 Merge pull request #3155 from umbraco/temp8-222-variant-invariant-data-updates 
variant to invariant data updates
 2018-10-10 08:44:33 +02:00
Robert
d41251819f RemoveItem now returns a bool 2018-10-10 08:27:20 +02:00
Robert
931fcd565a Removed the override of IsPropertyDirty as is not needed. 2018-10-10 08:26:10 +02:00
Stephan
ee24fb4ef7 Make Tests Green Again 2018-10-09 23:02:22 +02:00