yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,864 Commits 4 Branches 7 Tags
41460d55007d831a7935f47dc96b6fe00a94bc98
Commit Graph

16003 Commits

Author SHA1 Message Date
Claus
d146df43e6 Merge pull request #1903 from HarveyWilliams/dev-v7 
U4-9806 Media Picker media hover should show full title
 2017-05-15 10:19:04 +02:00
Mads Rasmussen
0e8b8e3aef set up some simple filtering of actions based on selection 2017-05-11 13:45:18 +02:00
Mads Rasmussen
7cf3f10afb missed two paths 2017-05-11 13:44:35 +02:00
Shannon
9b50d6d251 Gets a few tests fixed 2017-05-11 20:51:31 +10:00
Mads Rasmussen
6a4a84d8aa update files to match new tree path 2017-05-11 10:25:57 +02:00
Mads Rasmussen
89c4f7dffd Merge branch 'temp-U4-9776' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9776 2017-05-11 09:54:34 +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
Shannon
84c7f5046e Fixes the user group queries to be sorted since the relator requires this 2017-05-11 15:15:46 +10:00
Shannon
d2d6b6654a Adds models and methods for the UserController 2017-05-11 13:11:41 +10:00
wanddy
c6bc5ae6aa Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-05-10 22:37:47 +08: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
Shannon
1ea06930f4 fixes some tests 2017-05-10 21:34:35 +10:00
Shannon
512f3237f0 larger refactor so we don't need to worry about 'loading' a users groups, it will all just be done, updated queries to fetch a user, it's groups and it's sections all at once, it might be a little heavy but we'll see. Adds/removes a few other methods that didn't seem right and uses group aliases for most things, adds Datbase unique indexes for group aliases and names (need to fix tests though) 2017-05-10 21:00:30 +10:00
Shannon
f594006b95 fixes db table order 2017-05-10 18:07:39 +10:00
Shannon
fc58c4f546 bumps version updates a few methods 2017-05-10 18:06:46 +10:00
Shannon Deminick
f84d3b435b Merge pull request #1898 from DaveLong/U4-9799 
Fixed Serialization issue in ValidatePasswordResetCodeModel
 2017-05-10 14:59:04 +10:00
Shannon
d0b2f10a8c U4-9836 CreatorId on a media is overwritten on save 2017-05-10 14:32:09 +10: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
suedeapple
7b4912b1e7 automaticly - > automatically 2017-05-09 16:47:36 +01:00
suedeapple
8c6362d947 automaticly - > automatically 2017-05-09 16:40:59 +01:00
AndyButland
01dd28fc61 Retains original media creator when media is updated 2017-05-09 16:01:06 +02:00
Mads Rasmussen
aa99657dea add table layout 2017-05-09 13:00:02 +02:00
mikkelhm
67e2c911f7 Re adds the umbraco.presentation.targets for Umbraco.Web.UI as it handles default transormations for confg files 2017-05-09 00:26:40 +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
36e60c774f Bump version to 7.6.1 2017-05-08 14:06:03 +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
Mikkel Holck Madsen
a2df4c5232 Merge pull request #1933 from umbraco/temp-U4-9864 
U4-9864 Missing import and xss check in other PermissionEditor.aspx
 2017-05-08 10:29:03 +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
Shannon Deminick
a08849f60a Merge pull request #1935 from jamescoxhead/U4-9869 
Fix typo error in upgrade installer
 2017-05-08 13:40:36 +10:00
Shannon Deminick
9792d8df25 Merge pull request #1930 from TomSteer/U4-9852 
Change Context to be public on MigrationBase
 2017-05-08 13:39:06 +10:00
Shannon Deminick
635cfe6b20 Merge pull request #1932 from dawoe/patch-1 
Return empty string when e-mail is not filled
 2017-05-08 13:37:48 +10:00
James Coxhead
9ccf7bdbab Fix typo error in upgrade installer 
Changed "your" to "you're"
 2017-05-07 16:22:54 +01:00
Claus
3c4b3f44c7 U4-9864 Missing import and xss check in other PermissionEditor.aspx 2017-05-05 14:52:01 +02:00
Sebastiaan Janssen
c6956b5e98 Merge branch 'dev-v7' into dev-v7.6 
# Conflicts:
#	.gitignore
#	build/Build.bat
 2017-05-05 14:30:08 +02:00
Sebastiaan Janssen
fcf5ecc166 Uses vswhere to figure out where VS17 is installed (if needed) 
Removes targets file that was almost unused, moved the relevant bits to the main csproj
Updates BuildBelle.bat to be completely independent of installed version of node & npm on the machine
 2017-05-05 14:14:37 +02:00