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

5274 Commits

Author SHA1 Message Date
Shannon
c39e1175fd Fixes up some more password changing quirks 2017-09-08 13:43:38 +10:00
Shannon
1d5348763d Fixes up invite message, fixes reset password quirk, ensures password values are cleared after changing password, ensures that the confirm password value is not posted to the server 2017-09-08 13:15:03 +10:00
Shannon
ab3407a1aa Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-09-08 11:31:04 +10:00
Mads Rasmussen
96c9ecbdd7 fix calc functions 2017-09-07 21:39:41 +02:00
Mads Rasmussen
a5c78f6325 fix bower.json after merge - copy correct clipboard.js file 2017-09-07 20:27:52 +02:00
Shannon
65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2017-09-07 22:43:03 +10:00
Sebastiaan Janssen
56dc10a4f7 Merge pull request #2158 from umbraco/temp-gulp-spike 
U4-10261 Change frontend build setup from grunt to gulp
 2017-09-06 23:52:48 +02:00
Mads Rasmussen
12b4587828 null check for change password 2017-09-06 14:33:01 +02:00
Warren Buckley
df8c75438a Merge pull request #2168 from ronaldbarendse/U4-9374 
U4-9374 Navigation panel header and editor panel header don't line up properly in Firefox
 2017-09-06 12:37:45 +01:00
Mads Rasmussen
77d240c69a don't show disallow cursor on the more button on a tree item (the three dots) 2017-09-06 13:31:13 +02:00
Mads Rasmussen
119dd5af29 auto expand tree to nodes with access 2017-09-06 13:11:58 +02:00
Claus
25cb76e842 Merge remote-tracking branch 'origin/dev-v7.7' into temp-U4-10333 
# Conflicts:
#	src/Umbraco.Web/Editors/UsersController.cs
 2017-09-06 11:25:11 +02:00
Mikkel Holck Madsen
b9baeea1a1 Merge pull request #2171 from umbraco/temp-U4-10368 
U4-10368 Need option to set username different than e-mail for AD compatibility
 2017-09-06 10:59:23 +02:00
Mikkel Holck Madsen
dfa1a098c8 Merge pull request #2172 from umbraco/temp-U4-10214 
U4-10214 Disable ability to delete admin group
 2017-09-06 09:39:25 +02:00
mikkelhm
3b741d3075 Disallow selection of the admin group, as it should never be allowed 2017-09-06 09:37:35 +02:00
Shannon
616b9b0e92 U4-10325 Media insert in grid should use UDIs 2017-09-06 14:50:44 +10:00
Shannon
2efe2cc88a Ensures that a user that has multiple start nodes cannot select the root start node in the tree dialogs 2017-09-06 12:54:32 +10:00
Shannon
6cc4ab9348 Ensure the user can still refresh nodes they don't have access to when viewing 'site'/branch nodes with multiple start nodes 2017-09-06 10:45:38 +10:00
Tom Fulton
1578bc8cc7 U4-8886 - TinyMCE - highlight media picker toolbar icon when image selected 2017-09-05 13:20:18 -04:00
Shannon
186fd1166a Merge branch 'dev-v7.7' into temp-U4-10275 2017-09-05 23:48:11 +10:00
Shannon
d32093136f U4-10214 Disable ability to delete admin group 2017-09-05 23:41:58 +10:00
Shannon
f3f31f2569 Gets invite and create user working with new setting and allowing specifying a separate username. 2017-09-05 23:31:26 +10:00
Shannon
456b5fcee0 updates config template 2017-09-05 22:46:13 +10:00
Shannon
0dee1f0fac U4-10368 Need option to set username different than e-mail for AD compatibility 2017-09-05 22:35:40 +10:00
Shannon
4b7bd6482e Creates new EmailSender which should take the place throughout the codebase for sending emails in the Core. Have replaced most places where SMTP is used directly (but not the notifications part since that is more complicated right now). Added the internal event and special usage so we can raise an event to send an email if smtp is not configured. 2017-09-05 18:52:03 +10:00
Sebastiaan Janssen
a9cda9d651 Merge branch 'dev-v7' into temp-gulp-spike 2017-09-04 21:37:49 +02:00
Sebastiaan Janssen
e511554a42 Adds less as a dependency so that the build can complete 2017-09-04 20:10:19 +02:00
Shannon
7926a0c676 Simplifies the change password logic with the back office so an admin user can easily change another user's password if they have access to the users section. Updates the controllers to populate the modelstate correctly, changes name of HasAppAccess to HasSectionAccess. Ensure we don't have duplicate ysod dialogs when there is an error. 2017-09-04 22:03:03 +10:00
Shannon
a0306f9d55 Fixes ability to reset your own password in the user section 2017-09-04 20:15:46 +10:00
Ronald Barendse
207d6b53b5 Fixed .umb-panel-header-content-wrapper height 
The .umb-panel-header-content-wrapper was 1 pixel higher than the parent .umb-panel-header, now both heights are 99px.
 2017-09-04 11:22:56 +02:00
Shannon
1cec38c679 Gets site nodes showing for users with multiple root nodes and updates UI to support showing them what they have and don't have access to, also updates the content/media tree controllers performance for when looking up entities and if the user has access to the path. 2017-09-01 00:32:01 +10:00
Robert
742c3236c7 Merge branch 'U4-7580-rename-containers' of git://github.com/lars-erik/Umbraco-CMS into lars-erik-U4-7580-rename-containers 2017-08-30 15:13:19 +02:00
Mads Rasmussen
ede6664e7f allow admins to edit all groups 2017-08-30 13:27:52 +02:00
Shannon Deminick
e34e536dad Merge pull request #2156 from umbraco/temp-U4-10326 
Creating a new content node using Content Templates (Blueprints) always places node at root.
 2017-08-30 11:35:47 +10:00
Shannon
209273ba64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/init.js
#	src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
 2017-08-30 11:08:36 +10:00
Shannon Deminick
88f332f5c7 Merge pull request #2157 from umbraco/temp-U4-10367 
U4-10367 417 missing token error due to cookie being overwritten
 2017-08-30 10:54:29 +10:00
Mads Rasmussen
06a87bc341 update readme 2017-08-29 14:56:17 +02:00
Mads Rasmussen
b10e646ade remove grunt file 2017-08-29 14:53:44 +02:00
Mads Rasmussen
110a3b2a12 add small interval to file watcher to keep windows calm 2017-08-29 14:35:54 +02:00
Mads Rasmussen
1bda9f32c1 only copy minified version of font-awesome 2017-08-29 14:27:43 +02:00
Mads Rasmussen
ce8390768e Source maps gets cached really hard in the browser so I will remove them for now until we find a solution to clear them 2017-08-29 14:17:41 +02:00
Mads Rasmussen
ed850629da Merge branch 'dev-v7' into temp-gulp-spike 2017-08-29 11:47:17 +02:00
Mads Rasmussen
1307cb1173 add themes for tinymce - they are needed for loading it 2017-08-29 11:39:16 +02:00
Sebastiaan Janssen
a1b9842215 Merge pull request #2131 from bjarnef/dev-v7-U4-10281 
U4-10281 - Fix maxchars javascript errors on macro parameter editors
 2017-08-29 11:23:16 +02:00
Sebastiaan Janssen
d300bf8d6d U4-10367 417 missing token error due to cookie being overwritten 
Changes the cookie and header names to be Umbraco specific
 2017-08-29 11:17:52 +02:00
Mads Rasmussen
70231fcee2 fix codemirror folder structure 2017-08-29 10:26:11 +02:00
Robert
67489d496a Creating a node using Blueprints now places the node under the parrent that was created 2017-08-29 09:30:22 +02:00
Shannon
6995c184e3 Updates user editor, non-admins can see all user groups but cannot edit them, they can save user that contain groups that they don't have access to if they were already there but cannot add new ones they dont' have access to 2017-08-29 01:00:08 +10:00
Mads Rasmussen
aa5d7fc9fc only use source maps when developing 2017-08-28 15:42:31 +02:00
Mads Rasmussen
5cbe2b6ce0 Add tasks for karma testing 2017-08-28 14:41:54 +02:00