yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,049 Commits 4 Branches 7 Tags
40f94d23d4e0c28fa114b0cd3950b1198b80cb5e
Commit Graph

7409 Commits

Author SHA1 Message Date
Shannon
69f7623fb7 Doh! we had test code checked in .. oops! 2018-03-16 14:40:26 +11:00
Shannon
82820284f3 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10 
# Conflicts:
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Features/EnabledFeatures.cs
 2018-03-16 14:30:55 +11:00
Sebastiaan Janssen
5161fd0cef Remove trailing space from filename and clean up code a little 2018-03-15 10:07:04 +01:00
Sebastiaan Janssen
eac9785c45 Apply PR #2507 2018-03-15 10:02:20 +01:00
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
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
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
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
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
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
557fc1bcdd Removed hardcoded value for disabletemplate 2018-03-07 21:43:19 +01: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
dfb0efbc98 Removed option to assign templates from the info tab 2018-03-07 14:43:30 +01:00
Robert
728bf8b52d Adding disableFeatures server variable and new DisableTemplate property in DisabledFeatures.cs 2018-03-07 14:03:35 +01:00
Stephan
3637e1e5af Cleanup 2018-03-07 10:26:02 +01:00
Stephan
2a3f284554 Cleanup 2018-03-06 17:24:28 +01:00
Stephan
cd63806895 U4-10756 - id/guid cache 2018-03-06 16:11:27 +01:00
Niels Hartvig
5166dc08d6 Missing null check 2018-03-06 12:44:39 +01:00
Niels Hartvig
8e0565e030 Fixes spacing in description :) 2018-03-06 11:16:51 +01:00
Niels Hartvig
ceb3ae361a Adds flexible dropdown editor to replace the four current ones 2018-03-06 11:07:08 +01:00
Niels Hartvig
4cee7b831a Merge branch 'dev-v7' into temp-U4-11032 2018-03-06 10:08:04 +01:00
Stephan
0277ddc584 DataType troubleshooting 2018-03-05 14:59:23 +01:00
Stephan
030c97ef26 Super user is not a Zero 2018-03-02 16:00:15 +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
Niels Hartvig
976e1e8a35 Mark existing dropdown property editors as obsolete 2018-03-01 14:25:07 +01:00
Mads Rasmussen
761804baf8 Merge pull request #2486 from umbraco/temp-U4-10876 
Fixes "Content Picker 2 can search outside of it's selected start node"
 2018-03-01 10:46:50 +01:00
Shannon
8768947519 U4-11019 Member 'Locked out' marked as sensitive throws an error - fixes special values 2018-03-01 18:05:44 +11:00
Shannon
ccfb643055 U4-11019 Member 'Locked out' marked as sensitive throws an error 2018-03-01 17:15:47 +11:00
Robert
88e6e44f4e Fixes Content Picker 2 can search outside of it's selected start node 2018-02-28 15:54:13 +01:00
Claus
52684b6189 allowing to extend html used in preview view. 2018-02-28 13:41:49 +01:00
Claus
13c675d718 updating route to use the old url. 
removing leftover index.html.
adding migration for renaming preview folder on disk.
 2018-02-28 12:04:39 +01:00
Claus
0ee3ebd180 adding the preview controller to project. 
removing old static html files from src (they're now cshtml files in Views).
copy task should not copy static canvasdesigner files anymore.
 2018-02-28 08:58:16 +01:00
Shannon
e502db5f6f U4-11021 No login form when trying to authorise 7.9 upgrade 2018-02-28 09:33:47 +11:00
Stephan
a39511bf55 Troubleshooting 2018-02-27 16:13:23 +01:00
Claus
9c8c9d8a39 UAASSCRUM-1405 Clean up preview for Headless 2018-02-27 15:47:47 +01:00
Stephan
cec71f5651 Fix tabs issue 2018-02-27 14:52:12 +01:00
Sebastiaan Jansssen
136e9e66d2 Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9 2018-02-26 16:26:54 +01:00