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

5399 Commits

Author SHA1 Message Date
Mads Rasmussen
7bdf76ffa7 Merge pull request #2098 from bjarnef/dev-v7-U4-10242 
U4-10242 - Remove bottom margin of subtitle paragraph
 2017-08-18 14:21:08 +02:00
Mads Rasmussen
5ef46ad8df Merge pull request #2048 from umbraco/temp-U4-7497 
Pressing Enter/Backspace in repeatable text strings now adds/removes text boxes
 2017-08-18 11:34:52 +02:00
Mads Rasmussen
168dc0e5da small UX refinements 2017-08-18 11:24:51 +02:00
Zsolt
04d73eedfe documentation for umbUserGoupPreview directive 2017-08-18 10:56:38 +02:00
Shannon
c5338da37d If the user does not have Update permissions, then the preview functionality cannot call save! 2017-08-18 16:45:23 +10:00
Shannon
e4296f6ea4 U4-10265 7.7 Beta - Tree keeps refreshing + saving fails 2017-08-18 16:30:33 +10:00
Shannon
1fc49ccf59 Merge remote-tracking branch 'origin/temp-U4-10299' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeParams.cs
 2017-08-18 14:11:41 +10:00
Robert
5e6b5a5cc1 Added a check so it's not possibile to delete the texboxes that are set as minimum 2017-08-17 12:09:20 +02:00
Robert
7213e3a6a0 Adding and removing text boxes should work properly now 
Thanks Mads :)
 2017-08-17 12:06:32 +02:00
Claus
f2ff1636ff ensuring query string is cleaned when switching sections with no custom routePath. 2017-08-17 11:23:08 +02:00
Mads Rasmussen
217ca62ea0 Merge pull request #2099 from bjarnef/dev-v7-U4-10152 
U4-10152 - Fix typo in localization of placeholder text
 2017-08-17 11:09:40 +02:00
Mads Rasmussen
d216d5755c Merge pull request #2094 from skttl/patch-6 
U4-10225: Notification banner floats above context menu
 2017-08-17 10:55:37 +02:00
Mads Rasmussen
f925309e1f Merge branch 'dev-v7.7' into temp-U4-10256 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
 2017-08-17 09:07:29 +02:00
Mads Rasmussen
87f4cd24a0 fix link 2017-08-16 21:40:35 +02:00
Mads Rasmussen
b151c39c3b Merge pull request #2097 from skttl/patch-9 
U4-10232 Unsaved changes alert overlaps borders
 2017-08-16 16:15:49 +02:00
Zsolt
9e0d0de846 created documentation for the newly added directives + testing 2017-08-16 15:45:57 +02:00
Mads Rasmussen
b5acd53889 Add a bit of text formatting to the content templates intro text + describe how to add content templates from the settings section 2017-08-16 13:59:35 +02:00
Claus
3885454b26 updating name of usersResource for v. 7.7 2017-08-16 13:42:19 +02:00
Mads Rasmussen
fec85491b6 Merge pull request #2129 from umbraco/temp-U4-10248 
U4-10248 Change content and media start node pickers to use new picker layout
 2017-08-16 09:27:20 +02:00
Mads Rasmussen
26e590a260 don't wait for node path to return before we show the picked node in the UI 2017-08-16 09:25:22 +02:00
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