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

21902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Claus
81c5c66e15 adding readonly. 2018-04-12 14:41:55 +02:00
Sebastiaan Janssen
79515cdae7 Merge branch 'martin-blackwell-U4-8927' into dev-v7 2018-04-12 14:36:21 +02:00
Sebastiaan Janssen
99ce7c0736 Throw error when "downgrading" to a higher version, make sure to give the results back in the correct order (newest version first, oldest last). 2018-04-12 14:35:34 +02:00
Claus
d9b1598fa2 use scope when writing instructions. 2018-04-12 14:26:47 +02:00
Claus
c630e5ef8e only warn if there's actually anything to warn about 2018-04-12 14:26:14 +02:00
Sebastiaan Janssen
fe5896c85f Merge branch 'U4-8927' of https://github.com/martin-blackwell/Umbraco-CMS into martin-blackwell-U4-8927 2018-04-12 13:44:38 +02:00
Sebastiaan Janssen
28cbb0a517 Bumps version to 7.11.0 2018-04-12 13:41:56 +02:00
Sebastiaan Janssen
0597b43014 Merge branch 'patch-v7' into dev-v7 2018-04-12 13:39:09 +02:00
Sebastiaan Janssen
a124d77670 Merge remote-tracking branch 'origin/patch-7.9.4' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-04-12 13:38:53 +02:00
Stephan
1076b882fb U4-11207 - collect rogue/leaked NoScope instances 2018-04-12 11:56:56 +02:00
Stephan
4a47c5e129 U4-11207 - fix scope leaks caused by database messenger 2018-04-12 11:13:00 +02:00
mikkelhm
6d052aeeac Bump version to 7.9.4 2018-04-10 08:56:50 +02:00