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

21408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
14b58386e5 fix tour backdropOpacity 2018-01-11 14:14:03 +01:00
Robert
e26cbccfe0 Reverted DisposableObject.cs to its original state 2018-01-11 13:22:23 +01:00
Shannon
7dc06c1bea bumps version 2018-01-11 22:29:25 +11:00
Shannon Deminick
effa984bdc Merge pull request #2371 from umbraco/temp-U4-10707 
fixes: U4-10707 Config to order tour groups
 2018-01-11 22:04:24 +11:00
Robert
fa058f348d Forgot to removed TODO 2018-01-11 11:02:05 +01:00
Mads Rasmussen
62d9a1a132 Merge pull request #2379 from umbraco/mzajkowski-U4-4902 
U4-4902 Enable 'discard changes' alert throughout the UI
 2018-01-11 10:59:22 +01:00
Robert
9284269428 TODO's for DisposableObject and DisposableObjectSlim done 2018-01-11 10:53:45 +01:00
Mads Rasmussen
f8c4481eb1 Merge branch 'dev-v7' into mzajkowski-U4-4902 2018-01-11 10:28:28 +01:00
Shannon
d7f2041ee9 Makes the TourFilterResolver a real resolver 2018-01-11 18:00:42 +11:00
Mike
9f6e6e4701 Add tests to SimilarNodeNameTests to check for null and "" values. 2018-01-10 20:58:10 +00:00
Mike
34ba3f3351 Merge remote-tracking branch 'upstream/dev-v7' into U4-10727 2018-01-10 20:48:28 +00:00
Mike
dcfb8b94d8 Refactor SimilarNodeName to account for null nodeName values. 2018-01-10 20:44:30 +00:00
Mads Rasmussen
0876004d9a U4-10803: remove dependency on angular-moment 2018-01-10 16:00:32 +01:00
Stephan
d3ad61835a Merge branch 'temp-U4-10789' into dev-v7.8 2018-01-10 15:59:07 +01:00
Stephan
ad882ab5be Merge remote-tracking branch 'origin/dev-v7.8' into temp-U4-10789 2018-01-10 15:58:18 +01:00
Stephan
774f333c70 U4-10789 - cleanup + beta003 2018-01-10 15:24:58 +01:00
Ilham Boulghallat
700b71f9fb Merge pull request #2377 from abjerner/patch-32 
A few fixes for the Danish translation
 2018-01-10 15:14:27 +01:00
Robert
bba58ea0c0 Replaced all usages of DisposableObject with DisposableObjectSlim 2018-01-10 13:48:55 +01:00
Robert
d0d4885812 Created slim version of DisposableObject and fixed some code indentation 
DisposableObjectSlim has no finalizer
 2018-01-10 13:36:53 +01:00
Claus
ce11a377e6 refactor 2018-01-10 11:37:37 +01:00
Claus
c6443c477f no need to log when throwing - that gets logged. 2018-01-10 11:13:28 +01:00
Claus
eb94572361 updating pr to fit with base. 2018-01-10 10:55:46 +01:00
Claus
fd8317493e Merge branch 'dev-v7.8' into temp-U4-10707 
# Conflicts:
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2018-01-10 10:10:19 +01:00
Robert
3642ff72a4 Removed console.log 2018-01-10 10:03:26 +01:00
Robert
6e830c1171 Wrapping the watch in the elm.focus 
Seems to bring the watch calls way down.
 2018-01-10 10:03:02 +01:00
Claus
22ff1bcaa0 Merge pull request #2378 from umbraco/temp-U4-10811 
U4-10811 Store custom tours as json and load from App_Plugins/{MyPlug…
 2018-01-10 09:46:47 +01:00
Robert
ab523baf4f Changed no-dirty-check directive to use scope.$watch to change $pristine to false 2018-01-10 09:24:42 +01:00
Claus
2dec03f441 Merge pull request #2374 from umbraco/temp-U4-10810 
U4-10810 Update CDF to support storing TEMP files in environment %tem…
 2018-01-10 09:04:58 +01:00
Claus
9ada0d9c97 reverting committed iis settings. 2018-01-10 09:03:35 +01:00
Shannon
c3be9004f6 U4-10811 Store custom tours as json and load from App_Plugins/{MyPlugin}/backoffice/tours 2018-01-10 16:01:46 +11:00
Shannon
11fa015b64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2018-01-10 15:08:10 +11:00
Shannon
df553140e8 Updates to latest 1.9.4 of CDF and updates Nuspec 2018-01-10 12:25:24 +11:00
Anders Bjerner
0b898f2e32 A few fixes for the Danish translation 2018-01-09 22:54:48 +01:00
Mads Rasmussen
4c9be2cc49 Merge pull request #2376 from abjerner/patch-31 
Start node -> Startnode
 2018-01-09 21:32:53 +01:00
Anders Bjerner
1aad4e50d5 Start node -> Startnode 2018-01-09 21:25:36 +01:00
Ian Houghton
f5f3676a56 U4-10762 Fix issue with empty name when registering new members from snippet 2018-01-09 15:51:32 +00:00
Mads Rasmussen
f69f68e2b5 Merge branch 'temp-U4-10707' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10707 2018-01-09 16:17:07 +01:00
Mads Rasmussen
3858656015 clear tours before registering new tours 2018-01-09 16:15:38 +01:00
Claus
a5ec5f46ac filtering out tours. 2018-01-09 15:49:19 +01:00
Mads Rasmussen
ea70e18a91 set "Getting Started"-tour group to order 100 so it is possible be add groups before and after 2018-01-09 14:13:27 +01:00
Mads Rasmussen
0cfd5773c3 set groupOrder on group so we don't order the tours in each group 2018-01-09 14:12:33 +01:00
Mads Rasmussen
b15def99c7 format as json 2018-01-09 11:53:21 +01:00
Stephan
8c8b6984c2 Merge branch origin/dev-v7.8 into temp-U4-10789 2018-01-09 09:06:01 +01:00
Shannon
bc828fc6f3 U4-10810 Update CDF to support storing TEMP files in environment %temp% location 2018-01-09 13:52:52 +11:00
Mike
dc7b83ca6c Add initial test fix for SimilarNodeName when a node has no name. 2018-01-08 17:30:11 +00:00
Robert
8188e4ff55 Merge branch 'U4-4902' of git://github.com/mzajkowski/Umbraco-CMS into mzajkowski-U4-4902 2018-01-08 15:39:29 +01:00
Bjarne Fyrstenborg
fcf9dcd803 Fix checkmark tree icon, when custom font icon is used for tree icon, e.g. in UCommerce 2018-01-08 14:40:31 +01:00
Mads Rasmussen
070fa11f8c fixes: U4-10707 Config to order tour groups 2018-01-08 14:11:53 +01:00
Claus
f52a84937b Merge pull request #2332 from ruant/U4-10596 
fix: add CultureInfo.InvariantCulture to int.Parse
 2018-01-08 14:07:10 +01:00
Robert
7e9f55f517 Merge pull request #1760 from abjerner/patch-15 
LinkPicker overlay: Added property for hiding the target option
 2018-01-08 13:11:01 +01:00