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

18816 Commits

Author SHA1 Message Date
Sebastiaan Janssen
054a8b48fa Revert PR #2507 - needs to go in 7.10 2018-03-15 09:59:04 +01:00
Stephan
af0a03a3e0 U4-10756 - cleanup 2018-03-15 09:51:12 +01:00
Stephan
fb5e6c22ce Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10756 2018-03-15 09:46:52 +01:00
Stephan
6bc68005f4 U4-10756 - id/guid cache, new version 2018-03-15 09:46:39 +01:00
Sebastiaan Janssen
dfbc3c477a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into pr/2507 2018-03-15 09:38:44 +01:00
Niels Hartvig
57426ae895 Feedback from review. Makes the moment service more generic and changes promises chaining 2018-03-14 11:10:01 +01:00
Shannon
05c38db54c updates naming of the extending preview property and fixes the angular rendering on ng-init 2018-03-14 15:24:30 +11:00
Shannon
00fdace570 fixes preview view web.config and makes sure we pass the preview model to the view 2018-03-14 14:38:21 +11:00
Shannon
4e531976e9 missing file 2018-03-14 14:24:11 +11:00
Shannon
830f460b7e bumps version 2018-03-14 13:58:48 +11:00
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
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
b4aad19573 Revert "Merge pull request #2508 from umbraco/temp-U4-11076" 
This reverts commit 4161d244c1, reversing
changes made to eea87e411f.
 2018-03-14 13:23:33 +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
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
Niels Hartvig
6bafd3a254 Removes ugly non-existing comment :) 2018-03-13 16:39:01 +01:00
Niels Hartvig
564074a2bd Adds check for existing moment locales before attempting to download them 2018-03-13 16:19:51 +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
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
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
Kyle Weems
617bdb2bd1 Merge branch 'dev-v7' of git://github.com/umbraco/Umbraco-CMS into dev-v7 2018-03-07 10:21:11 -08:00
Kyle Weems
2c91f9bf14 Reduce the first load impact of Moment by moving from using moment-with-locales.js to moment.min.js and loading in the specific locale files when the app authorizes. http://issues.umbraco.org/issue/U4-11044 2018-03-07 10:19:11 -08: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
Niels Hartvig
ca74100e12 TLC for multiple pre values editor 2018-03-06 16:11:44 +01:00
Stephan
cd63806895 U4-10756 - id/guid cache 2018-03-06 16:11:27 +01:00
Niels Hartvig
3061dc4e6f Adds support for *not* closing an overlay on enter 2018-03-06 15:37:52 +01:00
Niels Hartvig
5166dc08d6 Missing null check 2018-03-06 12:44:39 +01:00
Niels Hartvig
05a9c44e9e Needs to check if single value is an array and then pick first value 2018-03-06 11:51:32 +01:00