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

21263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
80ceba36dc Merge branch 'dev-v7.8' of https://github.com/umbraco/Umbraco-CMS into dev-v7.8 2018-01-15 20:41:47 +11:00
Shannon
d33b617851 bumps version, checks for feature resolver 2018-01-15 20:40:40 +11:00
Warren Buckley
2b5f370c92 Merge pull request #2351 from umbraco/temp-U4-9291 
U4-9291 TypedSearch should have an overload specifying pager values, …
 2018-01-15 09:38:51 +00:00
Shannon
4a0cf81d7d fixes test 2018-01-15 18:19:23 +11:00
Shannon
fef743517f Allows for passing in an Unknown object type to the IEntityService.GetIdForKey and GetKeyForId methods 2018-01-15 18:05:52 +11:00
Shannon
b3cbcebf5b Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-15 16:27:29 +11:00
Shannon
3d90c2b83f oops, fixed returned type not picked up by compiler due to dynamics 2018-01-15 16:11:56 +11:00
Shannon
3b8b5b6dfa Merge branch 'dev-v7.8' into temp-U4-9291 2018-01-15 15:51:40 +11:00
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
Sebastiaan Janssen
23be0134e7 Merge pull request #1605 from jobf/dev-v7 
fix U4-8792 override overflow
 2018-01-13 17:57:49 +01:00
Sebastiaan Janssen
355fb64d8b Merge pull request #1573 from drbldgtl/dev-v7-U4-6415 
Renamed SerializeToCropDataSet to DeserializeToCropDataSet
 2018-01-13 17:33:44 +01: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 Deminick
b0b874212e Merge pull request #2381 from umbraco/temp-U4-10803 
U4-10803: remove dependency on angular-moment
 2018-01-12 14:43:06 +11: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
Stephan
7f12cff3bd Minor build cleanup 2018-01-11 16:25:18 +01: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
Shannon
e0c89eb1ea Merge branch 'dev-v7.8' of https://github.com/umbraco/Umbraco-CMS into dev-v7.8 2018-01-12 00:20:21 +11:00
Shannon
9ad8e6a876 fixes nuspec for tour files 2018-01-12 00:20:06 +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
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
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