yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,484 Commits 4 Branches 7 Tags
9d3d718e165f89baf0e77e78ad425337469c9d5d
Commit Graph

6121 Commits

Author SHA1 Message Date
Sebastiaan Janssen
9d3d718e16 Merge branch 'dev-v7' into dev-v7 2018-08-26 20:33:00 +02:00
Sebastiaan Janssen
16155ea416 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-08-26 17:25:18 +02:00
Sebastiaan Janssen
342ac7b1b2 Merge branch 'U4-11166' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-11166 2018-08-26 16:52:58 +02:00
Chris Houston
56de9ff4ae Fix for issue: U4 11409 - "Create content" tour is failing when doing the tour with the starter kit installed (#2851) 2018-08-26 14:52:14 +02:00
BatJan
7d439566cd U4-11526 - Member Group Picker doesn't remove group after unselecting it during selection. (#2835) 2018-08-23 23:56:32 +02:00
Sebastiaan Janssen
3454db6ee8 No need to do an extra userService request, if the contentType is null we can't access the settings section, that's a good enough test 
Also fixed the bug where editors would see the node name instead of the content type name
 2018-08-23 23:36:50 +02:00
Sebastiaan Janssen
b67c06a85a Remove console.log that was left behind 2018-08-23 22:23:41 +02:00
Sebastiaan Janssen
44bd3dec9a Merge branch 'dev-v7' into feature/temp-U4-11577 2018-08-23 22:22:57 +02:00
Sebastiaan Janssen
1b1df84863 Populates the anchor when found 
Also fixes one of the JS files where .model was seemingly used randomly, but the view doesn't want a .model in there
 2018-08-23 21:31:31 +02:00
Sebastiaan Janssen
05fdfc6b34 Merge branch 'fix/linkpicker-url-empty' of https://github.com/rasmusjp/Umbraco-CMS into rasmusjp-fix/linkpicker-url-empty 2018-08-23 20:52:14 +02:00
Sebastiaan Janssen
d3b577fe37 Merge pull request #2867 from BatJan/features/temp-U4-11587 
U4-11587 Media link does not update when the file is swapped
 2018-08-23 20:37:45 +02:00
Sebastiaan Janssen
720409ef54 Merge pull request #2871 from leekelleher/U4-11595 
umb-node-preview directive - corrected the title of the "Edit" button
 2018-08-23 19:21:30 +02:00
Mads Rasmussen
ef6822e15b Merge pull request #2873 from kjac/media-picker-update 
Media picker: Minor style update + add help text.
 2018-08-23 09:29:05 +02:00
Jan Skovgaard
015e89b927 Make sure the "open" action is only visible when logged in as an administrator 2018-08-22 11:31:07 +02:00
Jan Skovgaard
05e48376c7 Use the node object to get the name and icon so it's also displayed for non-admin users 2018-08-22 11:30:39 +02:00
Jan Skovgaard
a2cc0ec411 Shorten comments 2018-08-22 11:30:07 +02:00
Jan Skovgaard
d4fff97814 Move the setModePublishStatus function above the scope.previewOpenUrl...not sure why but this makes the status be visible when logged in as something other than an administrator. When logged in as an admin it worked fine before. Can't quite make sense of this. But now it works. 2018-08-22 11:23:51 +02:00
Lee Kelleher
06e99c3b33 Corrected the title of the "Edit" button 
umb-node-preview directive - corrected the title of the "Edit" button
 2018-08-22 09:13:43 +01:00
Jan Skovgaard
ad3d27be76 Reference the node object instead of the documentType object, which returns null if the user is not logged in as an admin. 2018-08-22 10:00:54 +02:00
Jan Skovgaard
2e2fc6ad84 Make sure to check whether the open anchor for the template should be displayed or not 2018-08-22 09:31:44 +02:00
Jan Skovgaard
9f396e4b15 By default set the "allowOpen" to be false and only set it to true if the current user is an admin. This ensures that the "Open" anchors are never displayed for other than admin users. 2018-08-22 09:13:46 +02:00
Mads Rasmussen
f7201a70bd add colored border 2018-08-21 21:20:38 +02:00
Mads Rasmussen
ec67ab83af Merge branch 'patch-1' of git://github.com/jannikanker/Umbraco-CMS into jannikanker-patch-1 2018-08-21 21:10:01 +02:00
Rasmus John Pedersen
a725ddae5a Only remove ? or # if it's part of the url 2018-08-21 17:10:46 +02:00
Jan Skovgaard
8f2c253138 Refactort the scope.nodeUrl to be updated whenever save is hit in the existing update watcher 2018-08-21 14:52:00 +02:00
Nathan Woulfe
89f69bd2a8 U4 4732 - fix regressions in 7.12 (#2862) 2018-08-20 16:10:36 +02:00
Kenn Jacobsen
de8a24c691 Add "info" style to upload button + add help text when the dropzone is hidden. 2018-08-17 12:22:54 +02:00
Sebastiaan Janssen
f18b0aa774 U4-11579 Take startNodeId into account before picking the current node to sync to 2018-08-16 13:53:42 +02:00
Mads Rasmussen
8ce93055ef update colors to use variables and match the new color scheme 2018-08-15 13:00:40 +02:00
Mads Rasmussen
ee4b2adbd4 prefix all nested content css classes with "umb" 2018-08-15 11:59:06 +02:00
Jannik Anker
de73080e14 U4-11572 
Add border to selected icon in document type icon picker dialog
 2018-08-14 13:37:54 +02:00
Mads Rasmussen
6c0d14e0f4 add type="button" to toggle so it doesn't auto-submits a form 2018-08-14 13:14:49 +02:00
Mads Rasmussen
f35110309a fix comma-dangle error 2018-08-08 19:52:31 +02:00
Mads Rasmussen
c73860d144 start eslint from scratch so we slowly can add more rules for easier merging to v8 2018-08-08 19:52:00 +02:00
Warren
65571f4ee2 Change endpoint name to be inline with others prefixing with Post in the Controller method 2018-08-07 10:34:03 +01:00
Warren Buckley
b0756b0b0e Fix typo selectedSting to selectedString 2018-08-07 09:24:59 +01:00
Warren Buckley
b4de7fd64a Removes unused dependancies notificationService & localizationService 2018-08-07 09:23:45 +01:00
Mike
2b6c6b3022 http://issues.umbraco.org/issue/U4-10801 
Fixes label ui issue on template editor ui.

Updated notification settings ui to use angular instead of web forms.
 2018-08-06 19:52:29 +01:00
James Coxhead
9a774c8f9e Added inactive state for users who haven't logged in 2018-08-02 22:01:45 +01:00
Sebastiaan Janssen
89bdbf500e Revert "Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828)" 
Revert "We need to create the template from it's alias, which is the safeAlias, which is the correct filename"
This reverts commit 9663cfde82 and commit 11aea0f515
 2018-08-02 11:48:12 +02:00
Sebastiaan Janssen
f849ca38fc Merge pull request #2829 from readingdancer/U4-11551 
Fixing various broken links in the source code
 2018-08-01 08:04:20 +02:00
Chris Houston
9663cfde82 Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828) 2018-08-01 07:16:38 +02:00
Sebastiaan Janssen
1d5a807e0d Merge pull request #2826 from bjarnef/dev-v7-U4-9025-3 
U4-9025 - Fix styling of prevalues
 2018-08-01 06:43:29 +02:00
Chris Houston
bb59c4708d Just triggering AppVeyor :) 
As per my other pull request, pretty sure the one unit test failed due to it running close to midnight on the last day of the month.
 2018-08-01 00:30:44 -04:00
Chris Houston
23fda3a0ed Fixing various broken links in the source code, some are just in comments and others are actually used within Umbraco, also added HTTPS where possible. 2018-07-31 23:00:46 -04:00
Bjarne Fyrstenborg
a6d9b4b260 Add text-overflow for long labels 2018-07-31 23:25:56 +02:00
Bjarne Fyrstenborg
c4fc5a04f9 Adjust color picker prevalues to fit within overlay 2018-07-31 22:16:33 +02:00
Bjarne Fyrstenborg
63bbbbab31 Adjust multivalues styles 2018-07-31 22:15:30 +02:00
Sebastiaan Janssen
fe914dc339 Also make sure the alias gets generated from the full name and not just the part before the & 2018-07-31 22:01:35 +02:00
Chris Houston
a2cb5fac98 Fixes issue #U4-11472 
Document type, Media Type & Data Type folders did not support Ampersands in their names, now they do.
 2018-07-31 11:06:06 -04:00