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

23105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert
aebfc33037 Class renamed in .less file to bring back UI validation for content name 2018-04-13 14:51:02 +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
Stephan
ed3e693308 Umbraco.Compat7.die.die.die 2018-04-13 11:03:35 +02:00
Warren Buckley
1c70c34d57 Merge pull request #2581 from umbraco/temp-U4-11209 
fixes: U4-11209 Update layout for developer dashboards to fit new styles
 2018-04-13 09:28:13 +02:00
Stephan
ca00cde043 VSO build wip 2018-04-12 22:58:46 +02:00
Sebastiaan Janssen
29d9dcffb8 Manually applying PR: Three new healthchecks #1522 2018-04-12 18:38:00 +02:00
Mads Rasmussen
bf78bb16dd fixes: U4-11209 Update layout for developer dashboards to fit new styles 2018-04-12 18:37:37 +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
Shannon
b53400ceca Fixes up promise chains for the tree, adds logic to the tree picker to track the deepest paths expanded and then when a language is changed, we reload the tree with the new language and also sync all paths so the user can continue where they left off but with the new language nodes. 2018-04-13 00:09:28 +10: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
Shannon Deminick
e9c8df55ec Merge pull request #2579 from umbraco/temp-U4-11179 
Fixes - U4-11179 Support selecting variants in content pickers
 2018-04-12 21:59:38 +10:00
Shannon
f903c42d1b Gets the tree reloading when the customtreeparams change too so now the language selection will auto trigger the tree to reload ... next task we'll make it re-sycn and work. 2018-04-12 21:56:49 +10: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
Shannon
fddea8c815 Fixes data type pre-value issues with MNTP, removes unecessary contentpicker.html and memberpicker.html overlays since treepicker.html is all that should be used, cleans up the treepicker one to be more inline with our current angular standards. Removes uneeded event handling from treepicker 2018-04-12 21:29:36 +10: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
Shannon
80d682c22a Merge branch 'dev-v8' into temp-U4-11179 2018-04-12 14:30:50 +10:00
Warren
d8459bf4b4 Changes to build script & references etc with Stephan 2018-04-11 18:06:33 +02:00
Warren Buckley
fd75a59e13 Merge pull request #2575 from umbraco/temp-U4-11174 
U4-11174 - Wire up new publish dialog when editing content/variants
 2018-04-11 16:39:48 +02:00
Robert
01332db0a6 "split not a function" error fix 2018-04-11 15:44:43 +02:00
Robert
905a7d4a16 Added language drop-down in the content picker dialog window 2018-04-11 13:26:03 +02:00
Robert
f9dcfbbf95 Merge pull request #2577 from umbraco/temp-U4-11176 
fixes: U4-11176 Language Selector for the main content tree
 2018-04-11 09:35:30 +02:00
Shannon
a334a9999d Merge and simplify the variants selector to use routing logic now that we have routing built in for languages, now the pending changes alert is just using the default route change 2018-04-11 09:21:12 +10:00
Shannon
5eec80b8ae fixes trashing/trashed event dispatching 2018-04-11 09:05:02 +10:00
Warren Buckley
7d947afdf0 Merge pull request #2576 from umbraco/temp-U4-11178 
Fixes - U4-11178 Browse to content node as a different variant/language
 2018-04-10 16:42:25 +02:00
Mads Rasmussen
cc2a90a697 set max-height on language dropdown 2018-04-10 15:36:26 +02:00
Mads Rasmussen
d9e433b3ea emit and listen for events when languages are created/deleted 2018-04-10 15:36:06 +02:00