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

5846 Commits

Author SHA1 Message Date
Sebastiaan Jansssen
15b0dc9f29 Merge branch 'dev-v7.8' of https://github.com/kristoffer-tvera/Umbraco-CMS into kristoffer-tvera-dev-v7.8 2018-01-24 16:12:06 +01:00
Mads Rasmussen
78398fb8bb start on split view prototype 2018-01-24 14:46:53 +01:00
Warren Buckley
10db9363f4 Merge pull request #2411 from umbraco/temp-U4-10757 
Can navigate trough global search results
 2018-01-24 09:35:07 +00:00
Anders Bjerner
ee75158dd0 Nested Content should use the new turquoise/purple colors as the rest of the backoffice 2018-01-23 21:55:15 +01:00
Shannon
b49db0e941 Initial commit for member type sensitive data, this adds the db and model requirements and updates the normal property editor for a member type which saves the isSensitive data to the db. 2018-01-23 13:01:31 -07:00
Shannon
e25f6e82ed Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
 2018-01-23 11:42:14 -07:00
Robert
e808360653 Can navigate trough global search results 2018-01-23 10:46:02 +01:00
Ian Houghton
60ce36a7f2 U4-10864 add button when search returns no results, to clear the search 2018-01-22 22:03:35 +00:00
Anders Bjerner
72e2cacc87 Removed unnecessary   2018-01-22 18:16:42 +01:00
Mads Rasmussen
abbcf0e26b Merge pull request #2358 from abjerner/patch-28 
Triggers the save button to momentarily show an error icon
 2018-01-22 14:55:10 +01:00
Mads Rasmussen
b745948dc6 Merge pull request #2361 from bjarnef/dev-v7-U4-10791 
U4-10791 - Fix collapsed columns listview settings
 2018-01-22 13:48:58 +01:00
Warren Buckley
f61437cc7c Fixes U4-10843 and allows user detail page to upload a new avatar 2018-01-22 12:09:28 +00:00
Warren Buckley
f3541908c7 Update Users tree context menu to include two new items that navigate directly to an Angular Location/Path which loads the Invite or Create User views as needed 2018-01-19 14:07:23 +00:00
Sebastiaan Janssen
cbb6b9bca0 Merge pull request #2310 from matthew-darby/U4-10495 
U4-10495 - Install and customize buttons disabled
 2018-01-18 18:38:37 +01:00
Sebastiaan Janssen
9ea5855073 Merge pull request #2360 from janvanhelvoort/U4-10785 
U4-10785 - Filtering of Grid Editors
 2018-01-18 18:20:11 +01:00
Sebastiaan Janssen
4a37433042 Merge pull request #2372 from bjarnef/dev-v7-U4-10809 
Fix checkmark tree icon, when custom font icon is used for tree icon
 2018-01-18 18:00:53 +01:00
Mads Rasmussen
71eb22d0e8 Merge branch 'dev-v7.8' of https://github.com/umbraco/Umbraco-CMS into dev-v7.8 2018-01-17 15:51:25 +01:00
Mads Rasmussen
9d780a2e8f fixes: U4-10837 CMS getting started tour can't create Home page 2018-01-17 15:50:01 +01:00
Mads Rasmussen
c7e80fc532 remove all client side code related to registering tours in the service. It should be done through .json files. 2018-01-16 13:40:57 +01:00
Mads Rasmussen
b47d691841 add documentation to the tour component 2018-01-16 13:31:13 +01: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
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
Kristoffer Tverå
a1cd22208b Extra check before assigning value to currentColor 
In version 7.7.7 with the latest version of LeBlender (1.0.9.2), colorpickers will throw a javascript error in console. Applying this small check will resolve that issue.
ref: https://our.umbraco.org/forum/contributing-to-umbraco-cms/88890-color-picker-cannot-read-property-hasownproperty-of-null
 2018-01-12 10:45:59 +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
Robert
56adab43d6 Removed unused tour code from tour.service.js 2018-01-11 15:03:55 +01: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
Mads Rasmussen
80c2cbdfe5 add umb-box to users 2018-01-10 22:23:54 +01:00
Mads Rasmussen
e58b759d10 move user group back button to header 2018-01-10 22:11:35 +01:00
Mads Rasmussen
d04d37ec90 move user back button to header 2018-01-10 22:09:43 +01:00
Mads Rasmussen
b6528c533c add box to create/invite user 2018-01-10 22:06:10 +01:00
Mads Rasmussen
b56e4e8b40 add umb-box to user sidebar 2018-01-10 20:37:00 +01:00
Mads Rasmussen
3b9d56f557 Merge branch 'dev-v7.8' into temp-v8-UI 2018-01-10 20:08:50 +01: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
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
Robert
ab523baf4f Changed no-dirty-check directive to use scope.$watch to change $pristine to false 2018-01-10 09:24:42 +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
Mads Rasmussen
3858656015 clear tours before registering new tours 2018-01-09 16:15:38 +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
Stephan
8c8b6984c2 Merge branch origin/dev-v7.8 into temp-U4-10789 2018-01-09 09:06:01 +01: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
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
Mads Rasmussen
2fea966a49 decrease space between sidebar and main content on info tab 2018-01-05 20:41:08 +01:00
Mads Rasmussen
f1f4d64e85 update data type editor to use umb-box directive 2018-01-05 20:40:29 +01:00