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

5333 Commits

Author SHA1 Message Date
Zsolt
bf2fdc409b created umb-box components and changed all html tags for it in the users section 2017-08-15 16:32:30 +02:00
Zsolt
bd0cceb517 Clean-up with Mads 2017-08-15 14:41:04 +02:00
Shannon Deminick
b02b130793 Merge pull request #2125 from umbraco/temp-U4-10280 
U4-10280 Add markers to required fields in user section
 2017-08-15 12:36:07 +10:00
Shannon Deminick
d3e73e9e30 Merge pull request #2122 from umbraco/temp-U4-10243 
U4-10243 Umbraco 7.7.  Difference between "Enable/Disable" and "LockedOut"
 2017-08-15 12:31:50 +10:00
Shannon
42d65a36bc Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-08-15 11:55:17 +10:00
Bjarne Fyrstenborg
c68d7a33ca Fix maxchars javascript errors on macro parameter editors 2017-08-14 19:57:28 +02:00
Claus
ef0d6eff2c Merge pull request #2124 from umbraco/mikecp-U4-8967 
U4-8967 Linkpicker localization issue
 2017-08-14 14:58:31 +02:00
Zsolt
69c242074a In cms I changed the media picker to the new layout + deleting previously commented code 2017-08-14 13:08:01 +02:00
Mads Rasmussen
f426e3c500 U4-10280 Add markers to required fields in user section 2017-08-11 12:14:10 +02:00
Claus
028576d93c Merge pull request #2120 from umbraco/temp-U4-10227 
U4-10227 Users section should start in the user tree
 2017-08-11 10:31:20 +02:00
Robert
c1c2339827 U4-8967 Linkpicker localization issue 
Did a few modifications to the PR - reverted back the default translations for "content_nodeName" and "content_urls" as they are being used in other places.
To fix this, I have created two new keys that are used only in the linkpicker :)
 2017-08-11 10:31:04 +02:00
Mads Rasmussen
b607c9cd87 add documentation to users.resource 2017-08-10 16:14:11 +02:00
Claus
5cb766d387 Merge pull request #2115 from umbraco/temp-U4-10220 
fixes: U4-10220 Missing the ability to create Content Templates (blue…
 2017-08-10 15:57:46 +02:00
Claus
076ee7e3d8 Merge pull request #2110 from umbraco/temp-U4-10233 
fixes: U4-10233 Umbraco 7.7 beta - format user last login date
 2017-08-10 15:49:02 +02:00
Mads Rasmussen
125c378274 fixes: U4-4848 If "Save and Publish" is clicked before page finishes loading, data is lost from MNTP 2017-08-10 14:11:48 +02:00
Mads Rasmussen
979a0c9e25 remove capitalise from badges 2017-08-10 13:40:56 +02:00
Mads Rasmussen
3104e6d11c fixes: U4-10243 Umbraco 7.7. Difference between "Enable/Disable" and "LockedOut" 2017-08-10 13:39:33 +02:00
Shannon
9be275cf40 Updates the routes to also redirect if there isn't any dashboard to view for the user 2017-08-10 17:49:21 +10:00
Shannon
72495b3eaf U4-10227 Users section should start in the user tree 2017-08-10 17:25:16 +10:00
Shannon
98a545bdc6 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-08-09 23:18:51 +10:00
Mads Rasmussen
08150c05e9 Merge pull request #1971 from Bitmapped/U4-9977 
Fix U4-9977
 2017-08-09 13:28:04 +02:00
Mads Rasmussen
60ffd20e20 Merge branch 'dev-v7.7' into temp-U4-10059 2017-08-09 11:01:05 +02:00
Mads Rasmussen
2c2a9cc916 fixes: U4-10220 Missing the ability to create Content Templates (blueprints) from the blueprints tree directly when none exist 2017-08-09 10:47:41 +02:00
Bitmapped
7db1055a0d Remove JSON files, which appear to be unnecessary. 2017-08-08 13:54:36 -04:00
Mads Rasmussen
55a4214a5c fixes: U4-10233 Umbraco 7.7 beta - format user last login date 2017-08-08 13:05:46 +02:00
Mads Rasmussen
fc8c750fb0 fixes permissions click area - only show pointer cursor where you can click 2017-08-08 10:22:44 +02:00
Shannon
bbe8271c35 Fixes invite user and setting the model correctly. Fixes server side validation to ensure any created user MUST have a group assigned. 2017-08-08 13:20:21 +10:00
Shannon
2d42a6ca16 Merge branch 'dev-v7.7' into temp-U4-10257 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
 2017-08-08 13:02:57 +10:00
Shannon Deminick
4879215146 Merge pull request #2104 from umbraco/temp-U4-10236 
fixes: U4-10236 Umbraco.7.7 beta - add larger click area of permissio…
 2017-08-08 12:57:13 +10:00
Shannon Deminick
48a6929077 Merge pull request #2106 from umbraco/temp-U4-10235 
fixes: U4-10235 Umbraco 7.7 beta - misleading placeholder text in pro…
 2017-08-08 12:52:12 +10:00
Shannon Deminick
efc52e26e5 Merge pull request #2105 from umbraco/temp-U4-10230 
fixes: U4-10230 Umbraco 7.7 beta - hover on table row affect datepicker
 2017-08-08 12:49:35 +10:00
Mads Rasmussen
405d8e8253 fix line indention 2017-08-07 21:32:19 +02:00
Mads Rasmussen
b335ca0a10 change input type to email 2017-08-07 21:19:30 +02:00
Per Ploug
babcbd2f7a Updates from dev-v7 2017-08-07 15:29:34 +02:00
Mads Rasmussen
6658ecf6e3 add success state for "invite user" 2017-08-07 15:24:19 +02:00
Mads Rasmussen
cfee55d0db fix line indention 2017-08-07 14:35:54 +02:00
Mads Rasmussen
80d49f9bc8 fix line indention 2017-08-07 14:33:55 +02:00
Per Ploug
ba82885b6d Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-gulp-spike 
# Conflicts:
#	build/BuildBelle.bat
 2017-08-07 14:05:53 +02:00
Mads Rasmussen
6efc6dfe6a fixes: U4-10235 Umbraco 7.7 beta - misleading placeholder text in profile email 2017-08-07 13:45:42 +02:00
Mads Rasmussen
51624cee57 Merge pull request #2096 from skttl/patch-8 
U4-10231 Avatar is slightly off center
 2017-08-07 13:38:02 +02:00
Mads Rasmussen
701082a909 fixes: U4-10230 Umbraco 7.7 beta - hover on table row affect datepicker 2017-08-07 13:20:01 +02:00
Mads Rasmussen
81b2e4e050 fixes: U4-10236 Umbraco.7.7 beta - add larger click area of permission items 2017-08-07 12:27:21 +02:00
Mads Rasmussen
be9fbf14f1 Merge pull request #2095 from skttl/patch-7 
U4-10228: Overflowing text in group dropdown in permissions menu
 2017-08-07 12:08:58 +02:00
Shannon
e31ec37c9e Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-07 17:17:38 +10:00
Ronald Barendse
00e0f83c8e Fixed U4-10252 
Umbraco.Slider property editor did not use the correct initial values
when range was enabled and both values were equal.
 2017-08-06 22:41:20 +02:00
Zsolt
5b00265394 Change content start node picker 2017-08-04 14:38:37 +02:00
Mads Rasmussen
3ba3d8977f don't show start node data in the content permission dialog 2017-08-04 11:23:36 +02:00
Mads Rasmussen
19af28dd93 localize content permissions dialog 2017-08-04 11:21:43 +02:00
Bjarne Fyrstenborg
68ba0ca1e2 Fix typo in localization of placeholder text 2017-08-03 21:45:01 +02:00
Bjarne Fyrstenborg
b22e9d0911 Remove bottom margin of subtitle paragraph 2017-08-03 21:35:03 +02:00