Commit Graph

18161 Commits

Author SHA1 Message Date
Shannon Deminick
85f95cf067 Merge pull request #2386 from umbraco/temp-U4-10824
U4-10824 Helper methods for adding filters to tours
2018-01-15 14:30:48 +11:00
Mads Rasmussen
5b754b3958 adding missing fieds to tour step model 2018-01-12 13:33:46 +01:00
Claus
cba31986fe adding dynamic customProperties field to steps. 2018-01-12 11:46:13 +01:00
Claus
07b0267668 Merge pull request #2385 from umbraco/temp-U4-10804
Removed unused tour code from tour.service.js
2018-01-12 10:54:27 +01:00
Claus
a83291cc6e tabs-spaces and stuff. 2018-01-12 10:54:10 +01:00
Claus
59d75277c2 fixing up helpers to match exact strings as this is what people will be using. If they need more advanced regex matches they should register by a regex instead. 2018-01-12 09:52:52 +01:00
Claus
69e193e887 U4-10824 Helper methods for adding filters to tours 2018-01-12 09:23:40 +01:00
Mads Rasmussen
c3116d5df7 remove moment resolution for bower.json 2018-01-12 08:52:13 +01:00
Shannon
19086ab3a1 Merge remote-tracking branch 'origin/dev-v7.8' into temp-U4-10803
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
2018-01-12 14:32:54 +11:00
Shannon Deminick
069594c3ac Merge pull request #2380 from umbraco/U4-10815
U4-10815 Make DisposableObjectSlim
2018-01-12 12:43:47 +11:00
Robert
56adab43d6 Removed unused tour code from tour.service.js 2018-01-11 15:03:55 +01:00
Shannon
83294b6594 bump version 2018-01-12 00:32:00 +11:00
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
Robert
9284269428 TODO's for DisposableObject and DisposableObjectSlim done 2018-01-11 10:53:45 +01:00
Shannon
d7f2041ee9 Makes the TourFilterResolver a real resolver 2018-01-11 18:00:42 +11:00
Mads Rasmussen
0876004d9a U4-10803: remove dependency on angular-moment 2018-01-10 16:00:32 +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
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
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
Anders Bjerner
1aad4e50d5 Start node -> Startnode 2018-01-09 21:25:36 +01: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
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
Sebastiaan Jansssen
3e8fb11abd Update to latest modelsbuilder 2018-01-08 08:39:01 +01:00
Shannon
5181988a41 forgot to set the flag 2018-01-08 18:10:27 +11:00
Shannon
5169310258 Makes sure we check for index locking on both a normal boot with empty indexes and a cold boot when that is being forced 2018-01-08 17:57:15 +11:00
Anders Bjerner
55e97dad74 Fixed the xmldoc for UserService.Delete 2018-01-06 20:24:02 +01:00
Shannon
8c70578764 fix tests 2018-01-05 16:22:40 +11:00
Shannon
5cb2dd0036 Makes the features internal 2018-01-05 15:19:16 +11:00
Shannon
a9713dc6fc Converts the xslt tree to a controller, ensures all config for trees is correct and transforms for upgrades applied 2018-01-05 13:44:57 +11:00
Shannon
b32e7d4ccc running the build changed the bower.json file, i wonder if this will 'fix' vsts? 2018-01-05 10:45:06 +11:00
Shannon
8d4958e395 Changes the user controller saving extensions operation to use events instead 2018-01-05 10:22:46 +11:00