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

15891 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
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
d2d6b6654a Adds models and methods for the UserController 2017-05-11 13:11:41 +10: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
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
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
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
Mads Rasmussen
53ef2e356a add new temp users tree 2017-05-03 09:30:29 +02:00
Shannon
c1853e8c51 bumps version to 7.6.0 rtm 2017-05-02 13:42:20 +10:00
Shannon
31c965ae42 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-05-02 13:41:03 +10:00
Shannon Deminick
d91fc6ce60 Merge pull request #1887 from umbraco/temp-U4-9775 
U4-9775 AlreadyClosedException is thrown when retrieving media if the…
 2017-05-02 13:40:28 +10:00
Shannon
d5124e9739 Ensures that an UmbracoContext exist before emitting the cache handler events 2017-05-01 21:10:22 +10:00
Shannon
d9b507c947 bumps version to RC4 so we can build new dependencies against forms/deploy 2017-04-30 23:26:04 +10:00
Shannon
2479c5a272 updates other nuget refs that shouldnt be there 2017-04-30 23:21:19 +10:00
Shannon
fee071db22 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-04-30 23:20:16 +10:00
Shannon
004e00599d Fixing nuget package issues , semver 2 is only for 452+ which we dont have, we shouldnt be using it and it adds more dependencies that we don't need right now 2017-04-30 23:19:45 +10:00
Morten Christensen
2e2e8b43b0 Merge pull request #1917 from Frozire/patch-1 
Edit DA with minor spelling and compound word changes
 2017-04-30 14:05:14 +02:00
Morten Christensen
e77c5f8667 Keep the Concierge Product name 2017-04-30 14:04:00 +02:00
Shannon Deminick
3509a2c40f Merge pull request #1908 from umbraco/temp-scope-events-stale-entities 
POC to normalize all event entities when we track events so that all …
 2017-04-30 19:28:19 +10:00
Shannon
378d0f7939 chagnes test params to be slightly less hacky 2017-04-30 19:21:13 +10:00
Shannon
d64fa7f92d Fixes tests, ensures we null check when generating hashes for items in a collection 2017-04-30 19:14:36 +10:00
Stephan
ea14170272 minor cleanup 2017-04-30 10:14:48 +02:00
Shannon
73209d7e2c Merge branch 'dev-v7' into dev-v7.6 2017-04-30 17:13:14 +10:00
Shannon Deminick
cf8ead62ac Merge pull request #1904 from jwoods1/patch-2 
Fixed issue on line 216
 2017-04-30 17:11:44 +10:00
Shannon Deminick
8461aea7d8 Merge pull request #1907 from wanddy/dev-v7 
Improve Chinese translation.
 2017-04-30 17:10:58 +10:00
Shannon Deminick
034de1651b Merge pull request #1910 from abryukhov/patch-9 
ru.xml - Missing newest area & key from en.xml
 2017-04-30 17:09:30 +10:00
Shannon Deminick
dcb8aa7e56 Merge pull request #1909 from abryukhov/patch-8 
en_us.xml - Missing newest area & key from en.xml
 2017-04-30 17:09:15 +10:00
Shannon Deminick
e8a52a95da Merge pull request #1914 from dawoe/patch-1 
Added dutch translation for usernameHint
 2017-04-30 17:08:42 +10:00
Shannon Deminick
42c99e0f07 Merge pull request #1916 from stelim/patch-1 
Adding login hint to German language file
 2017-04-30 17:08:29 +10:00