Commit Graph

4450 Commits

Author SHA1 Message Date
Shannon
9a57f463ce Updates LocalLinks to be UDI, this will support both INT and UDI as LocalLink but when a new LocalLink is picked, it will use the UDI so eventually the INT will be gone 2017-03-14 15:31:30 +11:00
Shannon
2dd31f0f05 reverts the change for the showing an error if the node doesn't exist - it was for a start node (i.e. based on a user), not for an existing picked node 2017-03-13 16:00:56 +11:00
Shannon
d42d96e166 Fixes issue with new picker logic when a picked node no longer exist, this would result in a 404 error which would actually show the red error and the dialog would die, instead we handle the error and initialize the tree when were ready 2017-03-13 15:04:35 +11:00
Shannon
df04100ff6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
#	src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
2017-03-10 10:40:28 +01:00
hartvig
c1b3f1977d Merge pull request #1768 from danieland/dev-v7
U4-9571: Legacy icons look weird
2017-03-07 18:58:13 +01:00
Claus
1101fc199f Merge pull request #1585 from umbraco/temp-U4-9145
U4-9145 Updating TinyMCE to latest (4.4.3)
2017-03-06 12:14:18 +01:00
Mads Rasmussen
05fa58694e Merge pull request #1773 from umbraco/temp-ui-colors
fixes: U4-9583 Update UI colours and typography
2017-03-03 09:50:28 +01:00
Mads Rasmussen
ecc8575454 colour tweaks 2017-03-03 09:48:50 +01:00
Mads Rasmussen
df93dfe63c Merge pull request #1766 from umbraco/temp-U4-9538
U4-9538 - Add Keyboard shortcut (overview & template editor)
2017-03-02 16:12:56 +01:00
Mads Rasmussen
711981adab remove comment 2017-03-02 16:10:41 +01:00
Mads Rasmussen
199c5a9606 add keyboard shortcuts to partial view editor 2017-03-02 16:05:31 +01:00
Mads Rasmussen
9a99ad1416 combine documentation for localize component and attribute directive 2017-03-02 15:28:40 +01:00
Mads Rasmussen
5d298e4313 make sure overlays close after shortcut overlay has been opened 2017-03-02 14:45:08 +01:00
Mads Rasmussen
b67286f40d make showOverlay optional 2017-03-02 13:52:56 +01:00
Mads Rasmussen
dabeaa26e6 fix documentation 2017-03-02 13:14:02 +01:00
Mads Rasmussen
6c3f1c0e32 add mac/win versions of keyboard shortcuts 2017-03-02 13:04:55 +01:00
Mads Rasmussen
13cf9f46e7 fix ace shortcut overwrites on mac 2017-03-02 11:29:52 +01:00
Mads Rasmussen
d062b51326 fix reference to notificationsService 2017-03-02 11:20:08 +01:00
Warren Buckley
2b0f2577b5 Uppercases the Section name in the page <title> & if Deploy installed grab the CurrentWorkspace from the global JS obj 2017-02-28 21:56:30 +00:00
Mads Rasmussen
c2aa137293 more colour tweaking 2017-02-28 21:20:42 +01:00
Mads Rasmussen
555e0a2281 change blue button to green button 2017-02-27 21:21:38 +01:00
Mads Rasmussen
091a89b162 update colours 2017-02-27 21:21:20 +01:00
Mads Rasmussen
0eab0b606c remove border on reset password input 2017-02-27 21:20:32 +01:00
Mads Rasmussen
1fe06a0c9e update logo colour 2017-02-27 21:19:57 +01:00
Mads Rasmussen
6022c87540 clean up 2017-02-27 16:12:44 +01:00
Mads Rasmussen
06d7ae3861 update text colours / icon colours 2017-02-27 15:40:14 +01:00
Mads Rasmussen
3d4f999c07 small health check tweaks 2017-02-27 15:39:47 +01:00
Mads Rasmussen
3b7a83ab14 small colour improvements 2017-02-27 15:10:11 +01:00
Mads Rasmussen
796d665913 update grid colours 2017-02-27 15:07:19 +01:00
Mads Rasmussen
458e890c08 update health check colours 2017-02-27 15:06:52 +01:00
Mads Rasmussen
e32604183c update login colours 2017-02-27 15:05:57 +01:00
Mads Rasmussen
099b05dbbc update a loooot of gray colors 2017-02-27 13:26:28 +01:00
Claus
15150f9a16 Merge pull request #1763 from umbraco/temp-U4-9545
U4-9545 EntityRepository performs poorly for Media due to unnecessary outer joins
2017-02-27 12:00:06 +01:00
Daniel Sune Andreasen
ed87789abe collides with .legacy-custom-file 2017-02-27 11:14:37 +01:00
Mads Rasmussen
4cf7ae4b4d increase base font size 2017-02-27 10:08:10 +01:00
Mads Rasmussen
757b720a68 increase all small font sizes 2017-02-24 13:55:41 +01:00
Mads Rasmussen
c8968edd65 add margin bottom to item picker search field 2017-02-24 12:49:38 +01:00
Mads Rasmussen
58b4201eeb update query builder + insert code dialog 2017-02-24 12:45:34 +01:00
Mads Rasmussen
46eda4a3c3 update document type editor colours 2017-02-24 12:01:28 +01:00
Mads Rasmussen
89ebad2fbc fix colours + increase font-size in breadcrumb 2017-02-24 11:38:18 +01:00
Mads Rasmussen
815a288bcb update tree + sections 2017-02-24 11:37:40 +01:00
Mads Rasmussen
67bcd517bf test warmer version of turquoise 2017-02-24 11:36:07 +01:00
Mads Rasmussen
915503fb51 update content grid colours 2017-02-24 11:35:36 +01:00
Mads Rasmussen
ddefdf2627 increase font size in notifications 2017-02-24 09:12:06 +01:00
Mads Rasmussen
2289938486 update button colours 2017-02-23 16:01:58 +01:00
Mads Rasmussen
2b8db9d1b5 set preview button to style "info" 2017-02-23 14:56:51 +01:00
Mads Rasmussen
14c903f6a3 set colour on editor navigation to turquoise 2017-02-23 14:56:13 +01:00
Mads Rasmussen
b8a50b8da3 increase border-width on checkmark circle in media section 2017-02-23 14:54:47 +01:00
Mads Rasmussen
09300bba71 make checkmark in content picker green 2017-02-23 14:54:04 +01:00
Mads Rasmussen
f716479d01 increase font size + line-height on property help text 2017-02-23 14:53:35 +01:00