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

18568 Commits

Author SHA1 Message Date
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
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
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
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
Rune Hem Strand
45fd54d046 Fixed open doc type button 2018-03-01 18:06:46 +01:00
Sebastiaan Jansssen
4f062306a6 U4-10891 Color Picker Cannot read property 'hasOwnProperty' of null 
(cherry picked from commit 4a8730b925)
 2018-03-01 16:47:28 +01:00
Sebastiaan Jansssen
213ea6470f Bump version to 7.9.2 2018-03-01 15:09:04 +01:00
Sebastiaan Janssen
e783308cf0 Merge pull request #2487 from umbraco/temp-hartvig-ocd 
Aligns installer/login background photo
 2018-03-01 14:54:56 +01:00
Sebastiaan Jansssen
01f49bb07e Revert "Merge pull request #2426 from JeffreyPerplex/U4-9991-KeyboardShortcuts" 
This reverts commit 325cefa349, reversing
changes made to d4cf4cd700.
 2018-03-01 14:52:17 +01:00
Niels Hartvig
a3d08c19c5 Aligns photo 2018-03-01 14:05:34 +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
78489237d9 U4-11019- default isApproved to true 2018-03-01 18:21:14 +11: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
Sebastiaan Jansssen
86bc50c61d Bump version to 7.9.1 2018-02-28 13:27:53 +01:00
Sebastiaan Janssen
924eab29af Merge pull request #2484 from umbraco/temp-U4-11021 
U4-11021 No login form when trying to authorise 7.9 upgrade
 2018-02-28 11:52:28 +01:00
Matt Wanchap
da0a1c808a Added fallback to caption if no altText, as suggested 2018-02-28 11:06:59 +10:00
Shannon
9504eddf7e Adds unit test to test mapping to a ContentItemDisplay when there are no property groups 2018-02-28 11:28:51 +11:00
Shannon
e502db5f6f U4-11021 No login form when trying to authorise 7.9 upgrade 2018-02-28 09:33:47 +11:00
Stephan
cec71f5651 Fix tabs issue 2018-02-27 14:52:12 +01:00
Sebastiaan Jansssen
7ee510ed38 Fix formatting 2018-02-26 16:28: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