Commit Graph

4721 Commits

Author SHA1 Message Date
Mads Rasmussen
6a4a84d8aa update files to match new tree path 2017-05-11 10:25:57 +02:00
Mads Rasmussen
4e76b61251 rename section 2017-05-11 09:53:43 +02:00
Mads Rasmussen
03cce6e8f6 move badge + add title 2017-05-11 09:53:19 +02:00
Mads Rasmussen
956250004e add go back button to edit user 2017-05-11 09:48:16 +02:00
Mads Rasmussen
536be45bbf add go back button to edit role 2017-05-11 09:47:35 +02:00
Mads Rasmussen
e5240575bd add bulk selection to user roles 2017-05-11 09:31:58 +02:00
Mads Rasmussen
1dc30214cc remove margin from umb-users 2017-05-10 15:06:06 +02:00
Mads Rasmussen
a84159a1ba setup scaffolding for edit user and user role 2017-05-10 15:05:34 +02:00
Mads Rasmussen
7bfe736e5e restructure so we can use subviews for users and user roles 2017-05-10 13:42:04 +02:00
AndyButland
3cc0df0273 Fixed media picker calculation of intersection of allowed whitelist and images list 2017-05-09 23:44:31 +02:00
AndyButland
712cd29fea Upload checks to utilise whitelist. Refactored check on white and black list to common extension method. 2017-05-09 23:29:30 +02:00
Mads Rasmussen
645e28eefe add meta data to cards + set up create user form 2017-05-09 20:52:20 +02:00
Mads Rasmussen
71fdd1df85 remove red from clear button 2017-05-09 20:49:16 +02:00
Mads Rasmussen
aa99657dea add table layout 2017-05-09 13:00:02 +02:00
Mads Rasmussen
dfd240bd25 set up user group picker 2017-05-08 15:13:28 +02:00
Mads Rasmussen
ff68f18a26 fix icon alignment in buttons 2017-05-08 14:37:50 +02:00
Mads Rasmussen
b0b0f0056e remove save function 2017-05-08 14:20:20 +02:00
Mads Rasmussen
f044c4dde1 add functionality for bulk actions 2017-05-08 14:16:02 +02:00
Mads Rasmussen
205a83dd3c add checkmark component 2017-05-08 14:13:51 +02:00
mikkelhm
745252341f Merge branch 'dev-v7' into dev-v7.6
# Conflicts:
#	src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
2017-05-08 13:58:08 +02:00
Mads Rasmussen
350bd75310 add filters, layout selector and invite/create user buttons 2017-05-08 10:56:21 +02:00
Mads Rasmussen
b92eb9dcdd make users groups an array 2017-05-08 10:53:39 +02:00
Mads Rasmussen
c0c1e2bc06 prototype user invite 2017-05-08 10:52:45 +02:00
Shannon Deminick
d012d8e8b6 Merge pull request #1925 from SaDa1337/dev-v7
fixed console error on media picker
2017-05-08 17:11:28 +10:00
Mikkel Holck Madsen
9318da2883 Merge pull request #1931 from umbraco/temp-U4-9849-2
U4-9849 Query Builder not working in template editor. Always returns …
2017-05-08 09:05:29 +02:00
James Coxhead
9ccf7bdbab Fix typo error in upgrade installer
Changed "your" to "you're"
2017-05-07 16:22:54 +01:00
Claus
8a096cd826 Merge pull request #1794 from TheBekker/fix-U4-9038
[fix-U4-9038] get and set media start node for mediaPickerOverlay in …
2017-05-05 10:51:31 +02:00
Claus
3b236ba724 Merge pull request #1794 from TheBekker/fix-U4-9038
[fix-U4-9038] get and set media start node for mediaPickerOverlay in …
2017-05-05 10:47:52 +02:00
Claus
e7eaf6959f U4-9849 Query Builder not working in template editor. Always returns Model.Content.Site().Children()
adding missing nullchecks in the endpoint action.
ensuring promise returns before setting init data - the unresolved promise was being used on the query model instead of the actual text string the promise returns - causing the endpoint to fail to bind the model.
2017-05-04 15:08:37 +02:00
Mads Rasmussen
971f92301f add pagination to users 2017-05-04 11:45:58 +02:00
Mads Rasmussen
e7137e9cce first steps on user dashboard 2017-05-04 11:34:09 +02:00
Mads Rasmussen
7001e791f7 add umb-badge component 2017-05-04 11:29:36 +02:00
Mads Rasmussen
e327a971c2 update umb-avatar component include name and colors 2017-05-04 11:25:20 +02:00
Mads Rasmussen
c8813c8584 add id to user groups data 2017-05-04 11:23:38 +02:00
Mads Rasmussen
0bbef8cf94 add temp resource for hardcoded data 2017-05-04 11:22:04 +02:00
Shannon
24e2547656 Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b
# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2017-05-04 18:29:43 +10:00
Claus
1030fd5294 U4-9704 Sorting UDI media picker items, makes it store Int's 2017-05-03 10:21:00 +02:00
Maciej Sadowski
0eafa14246 fixed console error on media picker 2017-05-02 15:36:39 +02:00
Niels Hartvig
d553eb2978 Change it back to username and then with a hint for email (for backwards compat.) 2017-04-28 13:57:29 +02:00
Niels Hartvig
d1e6c0e835 Change username to email in login dialog 2017-04-28 13:37:19 +02:00
Shannon
a6f9d14a1b Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-26 14:18:05 +10:00
Shannon
5d4a97591a Cherry picks changes for package fetching for Our to use the new endpoint and passes in the current version 2017-04-26 14:08:37 +10:00
Shannon
bfb81f6362 Allows for the umb pckage repo rest api endpoint to be configurable - for testing 2017-04-26 14:04:47 +10:00
Harvey Williams
81354cea3c U4-9806 Media Picker media hover should show full title
Added title to all media items in the media picker rather than just SVG and normal images.

Solving an issue where whole titles could not be visible if the title was too long.
2017-04-24 16:29:35 +01:00
Shannon
d295174e53 Updates JS to include the current umbraco version when requesting a package's details, updates the c# to use a new endpoint on OUR to ensure that the correct file is downloaded based on the umb version passed in. 2017-04-24 21:31:35 +10:00
Mads Rasmussen
55022e2aaf fix removeNode check to only be for the root node 2017-04-24 12:46:45 +02:00
Warren Buckley
c34a1060f7 When we create a brand new template & set a master template we were removing the entire tree for templates - this adds in a check to not do the remove of the old node if its a brand new template we are creating 2017-04-20 15:49:49 +01:00
Mads Rasmussen
20526b40bf fixes: U4-9789 Email input type is not same height as text input type 2017-04-20 12:03:29 +02:00
Shannon Deminick
992073ab4e Merge pull request #1888 from umbraco/temp-U4-9717
fixes: U4-9717 7.6 "Do something else"-button
2017-04-20 11:00:49 +10:00
Mads Rasmussen
004a3e2808 Merge pull request #1882 from umbraco/temp-U4-9769
U4-9769 - BG Color change for installer to purple hue
2017-04-19 14:42:43 +02:00