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

21915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
6c8e39876f These changes shouldn't have been checked in 2018-04-19 19:36:32 +02:00
Sebastiaan Janssen
bfca8c555e Removes Package repository config setting and related unnecessary code 2018-04-19 19:12:42 +02:00
Robert
9384cd0f27 Merge pull request #2574 from umbraco/temp-U4-11195 
fixes U4-11195 Mapping complex properties slow down some queries
 2018-04-19 12:22:12 +02:00
Robert
0262b4aa76 Changed ContentPropertyDto modifier back to override which rendered content with tags unable to be saved 2018-04-19 12:10:39 +02:00
Sebastiaan Janssen
96761efe4d Merge branch 'patch-v7' into dev-v7 2018-04-19 09:55:16 +02:00
Shannon
75fb070825 U4-11246 When user belongs to groups and none of them have browse access and one or more have a custom start node applied a YSOD occurs 2018-04-19 16:20:18 +10:00
Shannon Deminick
8a0f32e980 Merge pull request #2595 from umbraco/temp-U4-11208 
U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method
 2018-04-19 15:27:00 +10:00
Sebastiaan Janssen
f5163ed0c2 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-04-18 16:05:43 +02:00
Sebastiaan Janssen
694f3d71e2 Merge branch 'patch-v7' into dev-v7 2018-04-18 16:05:15 +02:00
Robert
15eb40aedb Removed code that populates content tree with duplicate start nodes. 2018-04-18 16:01:01 +02:00
Sebastiaan Janssen
49251271e9 Merge pull request #2591 from umbraco/temp-U4-10995 
Removed code that populates content tree with duplicate start nodes.
 2018-04-18 15:59:45 +02:00
Sebastiaan Janssen
cc3e75dc63 U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method 2018-04-18 15:14:16 +02:00
Sebastiaan Janssen
eeaf17c857 Weird revert of a PR that was merged in before 
(cherry picked from commit 94ed741dd5)
 2018-04-18 12:18:44 +02:00
Dave Woestenborghs
21a8395142 U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) 
U4-11216 set min and max number when used as parameter editor

(cherry picked from commit f25233ac2b)
 2018-04-18 10:22:09 +02:00
Dave Woestenborghs
f25233ac2b U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) 
U4-11216 set min and max number when used as parameter editor
 2018-04-18 10:21:12 +02:00
Sebastiaan Janssen
61cd59b237 Merge branch 'patch-v7' into dev-v7 2018-04-17 15:47:41 +02:00
Sebastiaan Janssen
7d171b1e95 Bumps version to 7.10.4 2018-04-17 15:46:39 +02:00
Sebastiaan Janssen
d63061fade Merge pull request #2564 from leekelleher/U4-11184 
U4-11184 - Nested Content PropertyValueEditor - return converted value, not update reference value
 2018-04-17 15:33:14 +02:00
Sebastiaan Janssen
362261e879 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-04-17 15:16:46 +02:00
Sebastiaan Janssen
af8c00d075 Merge remote-tracking branch 'origin/patch-7.10.3' into dev-v7 2018-04-17 15:16:21 +02:00
Sebastiaan Janssen
68b440e494 Merge remote-tracking branch 'origin/patch-7.9.5' into dev-v7 2018-04-17 15:15:44 +02:00
Sebastiaan Janssen
0c328ef30e Merge remote-tracking branch 'origin/patch-7.8.2' into dev-v7 2018-04-17 15:15:06 +02:00
Robert
ef47e85741 Removed code that populates content tree with duplicate start nodes. 2018-04-17 15:07:59 +02:00
Claus
0c191a3ef7 updating to use includeProperties, fixing modifier keywords for methods, and passing includeProperties from list views. 2018-04-17 08:36:36 +02:00
Shannon Deminick
9ac96f24aa Merge pull request #2587 from dawoe/temp-U4-11150 
U4-11150 added culture property of tour to the docs
 2018-04-16 16:48:25 +10:00
Dave Woestenborghs
eca5b6e4e6 U4-11150 added culture property of tour to the docs 2018-04-16 08:35:05 +02:00
Sebastiaan Janssen
2dd7c5210f Merge pull request #2523 from tomfulton/u4-11133 
U4-11133 - Fix access check for Unpublish button
 2018-04-15 22:48:16 +02:00
Sebastiaan Janssen
3a854688e0 Merge branch 'dawoe-temp-U4-11150' into dev-v7 2018-04-15 22:38:22 +02:00
Sebastiaan Janssen
1594adf3ed Makes code a bit more readable and uses ToList instead of ToArray 2018-04-15 22:38:09 +02:00
Sebastiaan Janssen
23fcb38d69 Merge branch 'temp-U4-11150' of https://github.com/dawoe/Umbraco-CMS into dawoe-temp-U4-11150 2018-04-15 22:15:36 +02:00
Sebastiaan Janssen
7571949ad0 Merge pull request #2586 from bjarnef/dev-v7-U4-11215 
U4-11215 - Fix icons in member create dialog
 2018-04-15 22:11:24 +02:00
Bjarne Fyrstenborg
d45c3520d4 Format document in media create dialog 2018-04-15 21:42:35 +02:00
Bjarne Fyrstenborg
b7c04575fa Document media type resource save as in member type resource 2018-04-15 21:42:04 +02:00
Bjarne Fyrstenborg
588f5a3789 Fix some wrong descriptions 2018-04-15 21:41:23 +02:00
Bjarne Fyrstenborg
b535a45898 Respect icon set on member type - by default the icon is "icon-user" 2018-04-15 21:39:46 +02:00
Sebastiaan Janssen
1b56c55300 Merge pull request #2522 from tomfulton/u4-7757-client2 
U4-7757 - Show notifications when Unpublishing event is canceled
 2018-04-13 11:53:51 +02:00
Sebastiaan Janssen
29d9dcffb8 Manually applying PR: Three new healthchecks #1522 2018-04-12 18:38:00 +02:00
Sebastiaan Janssen
b0f0a7afc4 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-04-12 18:01:43 +02:00
Sebastiaan Janssen
30f8885aa9 Merge branch 'u4-9983' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9983 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
#	src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
 2018-04-12 17:59:11 +02:00
Sebastiaan Janssen
94ed741dd5 Weird revert of a PR that was merged in before 2018-04-12 17:50:44 +02:00
Sebastiaan Janssen
b6d5ac6a01 Update CONTRIBUTING.md 2018-04-12 17:20:12 +02:00
Sebastiaan Janssen
4664266b8d Bumps version to 7.10.3 2018-04-12 16:40:10 +02:00
Sebastiaan Janssen
c61fd65463 Bumps version to 7.9.5 2018-04-12 16:38:22 +02:00
Sebastiaan Janssen
1e2598a3a3 Bumps version to 7.8.2 2018-04-12 16:36:41 +02:00
Sebastiaan Janssen
5003a55aca Cherry picked - Fix scope leaks caused by database messenger [U4-11207] #2580 2018-04-12 16:32:34 +02:00
Sebastiaan Janssen
b5415844b8 Cherry picked - Fix scope leaks caused by database messenger [U4-11207] #2580 2018-04-12 16:30:55 +02:00
Sebastiaan Janssen
19241995e8 Cherry picked - Fix scope leaks caused by database messenger [U4-11207] #2580 2018-04-12 16:23:33 +02:00
Bjarne Fyrstenborg
828dbaedfb Indicate that a row is clickable and highlight with background color. (#1473) 2018-04-12 15:37:01 +02:00
Sebastiaan Janssen
52701f0056 Fix unit tests that were trying to "downgrade" from version 1 to version 2 2018-04-12 15:30:25 +02:00
Claus
c802171f38 Merge pull request #2580 from umbraco/temp-u4-11207 
Fix scope leaks caused by database messenger [U4-11207]
 2018-04-12 14:43:03 +02:00