Lotte Pitcher
|
a3de30934d
|
Re-adding the language keys for login greeting on a Sunday (greeting0) that were accidentally removed
|
2018-10-14 16:56:18 +02:00 |
|
Kim Holzmann
|
7a474c6fa4
|
#3219 Validation error on templates when clicking "save"
Error with use of savebutton fixed, use the suppressNotification value to check state.
|
2018-10-14 15:23:31 +02:00 |
|
Jamie Townsend
|
fb277d80e7
|
Fix for old password not showing/hiding correctly on admin users page #3069 (#3273)
|
2018-10-14 13:34:16 +02:00 |
|
Sebastiaan Janssen
|
c23f01e74d
|
Merge pull request #3278 from tcmorris/patch-2
Update v8 getting started
|
2018-10-14 13:07:32 +02:00 |
|
Thomas Morris
|
00afea61f0
|
Update v8 getting started
Update link so that it doesn't 404 and replace with relevant link.
|
2018-10-14 10:49:50 +01:00 |
|
Sebastiaan Janssen
|
b78f13bd9b
|
Merge pull request #3274 from MMasey/fix-lazyload-reference
Update lazyload.js reference on install pages.
|
2018-10-14 10:49:22 +02:00 |
|
Mike Masey
|
fe906f0e81
|
Update lazyload.js reference on install pages.
|
2018-10-13 17:59:43 +01:00 |
|
Warren Buckley
|
cb0b1ef73d
|
More CodeMirror stuff gone
|
2018-10-12 14:47:23 +01:00 |
|
Warren Buckley
|
69d1fea8f7
|
Thought I updated these already?!
|
2018-10-12 14:36:57 +01:00 |
|
Warren Buckley
|
996c48cc7f
|
Package lock without codemirror
|
2018-10-12 14:35:47 +01:00 |
|
Warren Buckley
|
9495feb94d
|
Updates the tinymce plugin alias to use the code icon for when configuring which toolbar buttons to add in the prevalue editor view
|
2018-10-12 14:21:08 +01:00 |
|
Warren Buckley
|
66d4541fc5
|
Remove codemirror files
|
2018-10-12 14:20:21 +01:00 |
|
Warren Buckley
|
9dcabd24d2
|
Cleanup of console.log, remove unused code and name button better than 'Warrens button'
|
2018-10-12 14:00:15 +01:00 |
|
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
|
91a64c9ea9
|
Merge branch 'temp8-remove-bower' of https://github.com/umbraco/Umbraco-CMS into temp8-remove-bower
|
2018-10-11 14:51:09 +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 |
|
elitsa
|
140e410dcc
|
Revert changes
|
2018-10-11 14:40:18 +02:00 |
|
Warren Buckley
|
e902bb08f6
|
Removes installing bower from the build powershell
|
2018-10-11 13:37:20 +01: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 |
|