Commit Graph

872 Commits

Author SHA1 Message Date
Robert 67ff827d67 Tours will only load if the current user has access to the same sections the tours has access to 2018-01-29 13:13:43 +01:00
Shannon e25f6e82ed Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
2018-01-23 11:42:14 -07:00
Claus 936e94789d adding to tinyMceConfig.Release.config. 2018-01-19 12:21:57 +01:00
Mads Rasmussen 9d780a2e8f fixes: U4-10837 CMS getting started tour can't create Home page 2018-01-17 15:50:01 +01:00
Shannon Deminick effa984bdc Merge pull request #2371 from umbraco/temp-U4-10707
fixes: U4-10707 Config to order tour groups
2018-01-11 22:04:24 +11:00
Mads Rasmussen ea70e18a91 set "Getting Started"-tour group to order 100 so it is possible be add groups before and after 2018-01-09 14:13:27 +01:00
Mads Rasmussen b15def99c7 format as json 2018-01-09 11:53:21 +01:00
Shannon a9713dc6fc Converts the xslt tree to a controller, ensures all config for trees is correct and transforms for upgrades applied 2018-01-05 13:44:57 +11:00
Shannon bd9adffaa5 Converts macro tree to use a proper controller so we can disable it 2018-01-03 13:33:33 +11:00
Mads Rasmussen 5d6cbee196 rename data attribute for editor container 2017-11-21 21:39:34 +01:00
Karl Tynan ce58ad91b5 Added `small` to allowed TinyMCE valid elements
We use ``small`` a lot in the RTE, and ``small`` is now considered a really useful tag in HTML5. I would like to see this in the default valid elements list for people to use out-of-the box.
2017-11-21 15:18:42 +00:00
Shannon fe2e689865 Merge branch 'dev-v7.8' of https://github.com/umbraco/Umbraco-CMS into dev-v7.8 2017-11-09 22:15:22 +11:00
Shannon ece5fecf12 fixes doc type conflict name so the tour uses "My Home Page" 2017-11-09 22:15:05 +11:00
Mads Rasmussen b21dea84d9 remove markup from tour step title 2017-11-08 15:38:15 +01:00
Shannon b9b1fc3a70 Adds a global config switch to enable/disable tours entirely 2017-11-09 00:57:05 +11:00
Shannon 1d52f59657 Puts tours on the file system and loads them from an api controller 2017-11-09 00:41:59 +11:00
Shannon 78f6b8d8bc Fixes up more the the session id validation, makes sure that the GetUserSecondsMiddleWare also validates the session since this is what keeps the user logged in if that option is being used. 2017-11-08 23:57:17 +11:00
Stephan ec6ba01cbf So long Facade 2017-10-31 12:48:24 +01:00
Sebastiaan Janssen 18e377f159 U4-10564 - Update ImageProcessor dependencies 2017-10-24 13:20:33 +02:00
Sebastiaan Janssen b70f543790 Reverts wrongly committed files 2017-10-23 14:02:00 +02:00
Stephan edfe212227 Fix login issue 2017-10-20 15:35:30 +02:00
Stephan e7a0d79ea7 Bugfix, getting things to run 2017-09-27 16:14:11 +02:00
Stephan 9a28250a8d Port 7.7 - WIP 2017-09-15 18:22:19 +02:00
Shannon f8d165599d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-14 18:10:59 +10:00
Per Ploug 87575e9067 Reverting grid config 2017-09-14 10:04:04 +02:00
Stephan 1c96df83cd Port 7.7 - WIP 2017-09-08 19:39:13 +02: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
Shannon 456b5fcee0 updates config template 2017-09-05 22:46:13 +10:00
Per Ploug babcbd2f7a Updates from dev-v7 2017-08-07 15:29:34 +02:00
Shannon d459246519 oops 2017-08-02 23:41:31 +10:00
Shannon efbfef74c2 localizes email, fixes issues with smtp and async 2017-08-02 23:39:31 +10:00
Jeavon b915f723f5 Removing Slack Health Check notification 2017-08-02 11:20:00 +01:00
Jeavon 8259024e20 Merge branch 'dev-v7.7' into temp-U4-9984
# Conflicts:
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
2017-08-02 10:48:43 +01:00
Stephan a0fe56ee7c Rename UmbracoExamine to Umbraco.Examine 2017-07-27 12:01:38 +02:00
Stephan c76403077f Normalize cr/lf/tab 2017-07-20 11:21:28 +02:00
Shannon 224d1bcf6e U4-10053 Review anywhere else in the codebase that may reference User Type
and removes all old editors, trees, etc...
2017-06-30 18:38:02 +10:00
Shannon e4edd8f692 U4-10053 Review anywhere else in the codebase that may reference User Type
This also removes some totally unused and ancient code
2017-06-30 18:14:44 +10:00
Stephan 6c710dac93 Log4Net fixing 2017-06-28 20:57:23 +02:00
Stephan 9e7b9ea5b5 From umbraco.dll to Umbraco.Web.dll 2017-06-28 12:33:45 +02:00
Jeavon 3083f185d0 Merge branch 'dev-v7.7' into temp-U4-9984 2017-06-26 18:01:57 +01: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
Jeavon ebef6b5d42 A few tweaks to the HealthChecks.Release.config to show different options 2017-06-19 10:11:57 +01:00
Jeavon ac1aa719b6 Updating HealthChecks.Release.config to new format 2017-06-19 09:18:00 +01:00
AndyButland 9f68bd4e52 Amended registration of health check scheduled notifiers (email and Slack) to use a resolver method and allow others to be added without modifying core 2017-06-18 16:41:46 +02:00
Jeavon Leopold 01a2ba8ad6 Added failureOnly setting to both email and Slack health check notifications - thanks to feedback at #cg17! 2017-06-10 09:59:37 +02:00
Jeavon Leopold f6cc06356c Adding new verbosity attribute to transform for health check config 2017-06-06 12:24:16 +02:00
AndyButland 7929b460c3 Added option for summary or detailed results in health check notifications 2017-06-06 10:32:26 +02:00
Jeavon Leopold d30b70ea12 Refactoring the HealthChecks Configuration to make it cleaner & easier to add futher notification providers 2017-06-05 11:57:03 +02:00
Shannon 121036ebb9 Merge branch 'dev-v7.7' into user-group-permissions
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Umbraco.Web.csproj
2017-06-05 10:35:23 +02:00
AndyButland 1445ff7a83 Implemented scheduled task for notification on status of health checks 2017-06-05 09:21:35 +02:00