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

6022 Commits

Author SHA1 Message Date
Sebastiaan Jansssen
646abb3aea Merge branch 'dev-v7' of https://github.com/mittonp/Umbraco-CMS into mittonp-dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	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/es.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
 2018-02-01 08:57:47 +01:00
Sebastiaan Janssen
2af59471a2 Merge pull request #973 from mattbrailsford/dev-v7-insertmacrofix 
Updated insert macro dialog to prevent closing on enter key
 2018-02-01 08:28:59 +01:00
Mads Rasmussen
466e97086b remove border on sub header sections 2018-01-31 20:45:37 +01:00
Mads Rasmussen
d1fac8885c adjust size on header icons 2018-01-31 20:44:59 +01:00
Mads Rasmussen
288048175f fix tree options 2018-01-31 20:43:54 +01:00
Sebastiaan Jansssen
fc43d3cdee Merge branch 'dev-v7.8' into dev-v7.9 2018-01-31 17:03:19 +01:00
Sebastiaan Jansssen
b76b09026b Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
#	src/Umbraco.Web.UI.Client/src/controllers/search.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Models/BackOfficeTour.cs
#	src/Umbraco.Web/Models/BackOfficeTourStep.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
#	src/Umbraco.Web/TourFilterResolver.cs
#	src/Umbraco.Web/Trees/MacroTreeController.cs
#	src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
#	src/umbraco.cms/businesslogic/Packager/Installer.cs
#	src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
 2018-01-31 17:02:03 +01:00
Mads Rasmussen
162d3ce47d show variant publish state in variant dropdown 2018-01-31 15:41:39 +01:00
Mads Rasmussen
21bf5cd4ec truncate tree node names 2018-01-31 15:39:27 +01:00
Sebastiaan Janssen
090f89e5b6 Merge pull request #2223 from kgiszewski/fix/U4-6309 
U4-6309: Fix black bars that appear on a RTE image resize
 2018-01-31 10:43:29 +01:00
Shannon
a6bc94185c Ensures that a user without access to sensitive values cannot change a member type's sensitive values, this also validates on the server side 2018-01-30 19:38:42 -06:00
Warren Buckley
5f5759c8a3 Merge pull request #2422 from umbraco/temp-U4-10869 
U4-10869 Make sure the getting started tour is only shown to the right users
 2018-01-30 09:10:12 +00:00
Robert
0b90097aad "requiredSections" tour property documentation 
Added a few words about "requiredSections" tour property
 2018-01-30 10:00:54 +01:00
Shannon
a48568d1ba Fixes problem where the sensitive value placeholder was being posted back to the server for saving, instead we don't post this value at all which means it will not be overwritten when it posts back. 2018-01-29 11:38:08 -06:00
Robert
67ff827d67 Tours will only load if the current user has access to the same sections the tours has access to 2018-01-29 13:13:43 +01:00
Mads Rasmussen
59612e9539 fine tuning the variant selector 2018-01-29 11:45:51 +01:00
Sebastiaan Jansssen
3f7159797f U4-10880 Update install background 2018-01-29 09:49:16 +01:00
Shannon
f7eec8dafb Allows editing the property metadata even if the property type is locked 2018-01-26 16:24:40 -07:00
Shannon
e039265fab adds descriptions to the member type options 2018-01-26 16:11:14 -07:00
Shannon
f08192a4ab Changes copy for hidden values and makes the rendering for hidden values it's own property editor view so we can more easily update it. 2018-01-26 15:52:12 -07:00
Mads Rasmussen
23c04ad830 added animations 2018-01-26 09:42:32 +01:00
Mads Rasmussen
9064d205bf move help drawer to right side 2018-01-25 16:37:17 +01:00
Mads Rasmussen
5f069670aa overlays shouldn't cover app header 2018-01-25 15:53:00 +01:00
Mads Rasmussen
bff344dc70 small style adjustments 2018-01-25 15:45:54 +01:00
Mads Rasmussen
8368b81528 add close splitview icon 2018-01-25 15:43:30 +01:00
Mads Rasmussen
7fee6f7389 fix umb-table styling 2018-01-25 15:42:52 +01:00
Sebastiaan Jansssen
da0b1c2f23 Merge branch 'U4-10864_close_back_office_search_results' of https://github.com/redmorello/Umbraco-CMS into redmorello-U4-10864_close_back_office_search_results 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-24 17:43:19 +01:00
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