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

21714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
3e2fa64820 Changes the Preview Index.cshtml to use a real model instead of viewdata, adds the correct razor web.config for these preview views, changes the enabled feature to be able to inject a razor view instead of strings 2018-03-14 13:56:49 +11:00
Shannon Deminick
7db4f841e3 Merge pull request #2485 from umbraco/temp-UAASSCRUM-1405 
UAASSCRUM-1405 Clean up preview for Headless
 2018-03-14 13:39:28 +11:00
Shannon
509d27f93b Merge branch 'dev-v7.10' into temp-UAASSCRUM-1405 
# Conflicts:
#	src/Umbraco.Web/Features/EnabledFeatures.cs
 2018-03-14 13:38:25 +11:00
Shannon
f42b122e73 adding missing files 2018-03-14 13:35:51 +11:00
Shannon
1b6c070752 Merge remote-tracking branch 'origin/dev-v7' into temp-UAASSCRUM-1405 2018-03-14 12:56:07 +11:00
Shannon
bedce100d2 Fixes merge and the preview views path 2018-03-14 12:55:34 +11:00
Shannon
0e08a56ada Merge branch 'dev-v7' into temp-UAASSCRUM-1405 
# Conflicts:
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Features/EnabledFeatures.cs
 2018-03-14 12:25:37 +11:00
Sebastiaan Janssen
03012cf54d Merge pull request #1435 from neilgaietto/U4-8822 
U4-8822- Fixes Unpublish error with empty RTE
 2018-03-14 00:10:49 +01:00
Sebastiaan Janssen
7ff339e18a Merge pull request #1306 from shiroganee/Fix-8533 
removes a overflow: hidden which decrease update-tree-layer performance
 2018-03-13 23:34:59 +01:00
Sebastiaan Janssen
0048b9c4c8 Merge pull request #2516 from bjarnef/dev-v7-U4-11093 
U4-11093 - Update Danish translations
 2018-03-13 23:03:48 +01:00
Bjarne Fyrstenborg
47f5e6bf17 Remove duplicate key in user area 2018-03-13 22:23:38 +01:00
Bjarne Fyrstenborg
a8908c90bc Add better translations to Danish 2018-03-13 22:21:44 +01:00
Sebastiaan Janssen
9e5e8b539a Merge branch 'bjarnef-dev-v7-U4-6616' into dev-v7 2018-03-13 22:19:15 +01:00
Sebastiaan Janssen
45d292e196 Merge branch 'dev-v7-U4-6616' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6616 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/variables.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
 2018-03-13 22:18:28 +01:00
Shannon Deminick
4161d244c1 Merge pull request #2508 from umbraco/temp-U4-11076 
Fix - U4-11076 Remove all references to templates from the backoffice
 2018-03-12 20:32:29 -07:00
Shannon
171e0d87db Updates some of the variable names, removes the EnabledFeatures since we don't really need that 2018-03-13 14:31:30 +11:00
Shannon Deminick
eea87e411f Merge pull request #2514 from umbraco/temp-U4-11065 
Fix - U4-11065 Sensitive data is shown in listviews
 2018-03-12 17:25:49 -07:00
Shannon
89edfe5782 refactors a bit - merges the 2 new resolvers into one and renames with code comments. Updates the ContentPropertyBasic to include a new IsSensitive property for mapping, updates the UI to check for this, updats the mapping to map with UmbracoContext, 2018-03-13 11:23:44 +11:00
Shannon Deminick
cbd5071eed Merge pull request #2510 from umbraco/temp-UAASSCRUM-1441 
fixes UAASSCRUM-1441: fix token identity breaking RestAPI and others
 2018-03-12 06:27:50 -07:00
Robert
3dbc2944aa Translations 2018-03-12 12:06:57 +01:00
Robert
709dab6afd Hooked sensitive data checks on member list view 2018-03-12 12:06:23 +01:00
Robert
8749b030cf Added custom resolver to deal with sensitive values on member list view, some cleanup 2018-03-12 12:04:54 +01:00
Sebastiaan Janssen
62fd15d54b Update CONTRIBUTING.md 2018-03-10 12:24:13 +01:00
Sebastiaan Janssen
66e71db85c Update CONTRIBUTING.md 2018-03-10 12:20:56 +01:00
Sebastiaan Janssen
469527da0a Update CONTRIBUTING.md 2018-03-10 12:20:24 +01:00
Robert
304e574bbc Merge pull request #2509 from umbraco/temp-U4-11058 
fixes: U4-11058 Add guidance to the multinode treepicker UI for min. …
 2018-03-08 14:01:14 +01:00
Robert
723644ace5 Merge pull request #2475 from barryokane/U4-7484-markdown 
(uDuf) Prevent "unsaved" warning when no changes on MarkDown Editor
 2018-03-08 13:23:46 +01:00
Stephan
2b936a6d31 UAASSCRUM-1441 - fix token identity 2018-03-08 13:18:53 +01:00
Sebastiaan Jansssen
3121635e07 Clarify upgrade readme 2018-03-08 13:15:04 +01:00
Mads Rasmussen
f2a3a269ba fixes: U4-11058 Add guidance to the multinode treepicker UI for min. and max. allowed items 2018-03-08 11:22:31 +01:00
Robert
557fc1bcdd Removed hardcoded value for disabletemplate 2018-03-07 21:43:19 +01:00
Robert
1a5fe63638 Switching to ng-if to hide the template dropdown in the info tab 2018-03-07 14:51:24 +01:00
Robert
dfb0efbc98 Removed option to assign templates from the info tab 2018-03-07 14:43:30 +01:00
Robert
d399ad6e51 Removed option to assign templates from the document type 2018-03-07 14:13:53 +01:00
Robert
eb06e62937 Removing the option to create document type with a template 2018-03-07 14:10:25 +01:00
Robert
728bf8b52d Adding disableFeatures server variable and new DisableTemplate property in DisabledFeatures.cs 2018-03-07 14:03:35 +01:00
Robert
f146262031 Merge pull request #2476 from barryokane/U4-9996 
(uDuf) Prevent unsaved dialogue appearing when no changes made on FileUpload
 2018-03-06 09:17:17 +01:00
Robert
ddae0d01e3 Merge pull request #2460 from mwanchap/U4-10821 
Fix for U4-10821, render alt text attribute from grid image editor (uduf hackathon)
 2018-03-05 14:35:23 +01:00
Robert
b9ee85dabc String ->string 2018-03-05 14:34:36 +01:00
Sebastiaan Janssen
29fa6061a9 Merge pull request #2496 from soreng/temp-U4-9992 
U4-9992: Added nuget config to restore command
 2018-03-02 11:56:39 +01:00
Søren Gregersen
8ee61312b6 Added nuget config to restore command 2018-03-02 11:47:57 +01:00
Sebastiaan Janssen
cfd4b8c7bf Merge pull request #2495 from soreng/temp-U4-9992 
U4-9992: Added usage of nuget config in environment setup
 2018-03-02 11:45:42 +01:00
Sebastiaan Janssen
7ce3b6046c Merge pull request #2494 from Mivaweb/patch-1 
Update NL.xml rectify and permissionDenied
 2018-03-02 11:43:20 +01:00
Søren Gregersen
43d98c9682 Added usage of nuget config in environment setup 2018-03-02 11:42:41 +01:00
Michaël Vanbrabandt
62e4825a5e Update NL.xml rectify and permissionDenied 2018-03-02 10:47:15 +01:00
Sebastiaan Janssen
81d35c6079 Merge pull request #2491 from mortenbock/temp-U4-5614 
U4-5614 - Handle invalid urls in extension check
 2018-03-01 20:49:09 +01:00
Morten Bock
7e15077f96 Handle invalid urls in extension check 2018-03-01 20:18:18 +01:00
Sebastiaan Janssen
6543e3c058 Merge pull request #2489 from mortenbock/temp-U4-288 
U4-288 - Allow relative urls in sheduled tasks
 2018-03-01 19:47:31 +01:00
Morten Bock
7c73c379cf Use the UmbracoApplicationUrl as the base for sheduled task urls, in case they are relative. 2018-03-01 19:11:37 +01:00
Sebastiaan Janssen
4bc9d96bce Merge pull request #2488 from hemraker/temp-U4-10993 
Fixed open doc type button
 2018-03-01 18:09:48 +01:00