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

4482 Commits

Author SHA1 Message Date
Shannon
fafb207799 U4-8658 RTE Editor: Edit an existing image by clicking 'media picker' in toolbar, show a blank picker 2017-03-22 18:27:18 +11:00
Shannon
b1aea424e8 U4-9659 Javascript error when inserting an image into the rich text editor from the media picker 2017-03-22 18:26:11 +11:00
Shannon Deminick
3598acaddc Merge pull request #1805 from umbraco/temp-u4-9644 
u4-9644 fix local link selection in the rich text editor
 2017-03-22 18:25:04 +11:00
Shannon
8e03a1ffca Updates tha a and img tags in the rte to use a data-udi attribute when udi's are used 2017-03-22 18:17:59 +11:00
Mads Rasmussen
dcd2b1eb6b Merge pull request #1807 from crgrieve/U4-9648 
U4-9648 Remove the relevant query rather than the first one in list.
 2017-03-21 19:59:57 +01:00
mikkelhm
3f3db006e7 When selecting a local link, also update the data-id to be the udi 2017-03-21 14:43:54 +01:00
mikkelhm
de9c5b88ab Updates the legacy linkpicker to show udi links properly, i.e. translate them to nice internal urls 2017-03-21 11:48:50 +01:00
Shannon
dfa58183c6 Fixes deleting partial view and script files 2017-03-21 18:38:54 +11:00
Shannon
e8668f3ed4 Don't pass in a value for snippets if it's not there, it will show up as a "undefined" string otherwise, adds the redirect method to the contentEditingHelper 2017-03-21 18:38:32 +11:00
Shannon
72ab51ea60 Fixes angular file controllers to not sync the tree if an item is being created, redirects to the correct path if the file is renamed 2017-03-21 18:36:14 +11:00
Shannon
215bc64a83 Fixes val-server directive since it wasn't picking up on ngModel changes 2017-03-21 18:20:22 +11:00
carole_grieve_eqtr
21f54dd4ff Remove the relevant query rather than the first one! 2017-03-20 17:55:48 +00:00
mikkelhm
ce8286dadd Sets the udi as well as the id when selecting a local link in the rich text editor 2017-03-20 15:53:32 +01:00
mikkelhm
504aac0350 Fixes variable names when selecting a local link in the rich text editor 2017-03-20 14:32:43 +01:00
Sebastiaan Janssen
e3bc6f148a New installer background image 2017-03-17 11:35:15 +01:00
Warren Buckley
a43bd13e6a Merge pull request #1798 from umbraco/temp-U4-9621 
Fixes: U4-9621 More UI color tweaks
 2017-03-16 15:31:30 +00:00
Mads Rasmussen
30d5bfa7b4 move nonode css to less file, update grunt build + update no node colors + font 2017-03-16 15:49:59 +01:00
Mads Rasmussen
00b0515fc1 Revert "less bright and "dangerous" alerts, notifications and validation messages" 
This reverts commit 691c13d1e1.
 2017-03-16 10:31:48 +01:00
Mads Rasmussen
c9fc0fbed1 Update installer gray buttons to purple buttons + align label with input 2017-03-15 14:35:11 +01:00
Mads Rasmussen
9ee3471153 add font smoothing to installer 2017-03-15 10:38:42 +01:00
Mads Rasmussen
691c13d1e1 less bright and "dangerous" alerts, notifications and validation messages 2017-03-15 10:26:05 +01:00
Sebastiaan Janssen
1a0046df95 Merge pull request #1795 from umbraco/temp-U4-9498 
U4-9498 LocalLinks as UDI
 2017-03-14 15:54:03 +01:00
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
Mads Rasmussen
fdfae0f78a increase font size for template insert description 2017-03-13 22:43:24 +01:00
Mads Rasmussen
9ebe7f683a increase font size for validation label 2017-03-13 22:40:12 +01:00
Mads Rasmussen
185af08e75 increase header description font-size 2017-03-13 21:02:43 +01:00
Mads Rasmussen
874c679bfe update tree header 2017-03-13 20:53:55 +01:00
Mads Rasmussen
76a6449ffa increase font size on actions menu 2017-03-13 20:47:36 +01:00
Mads Rasmussen
fd8e200bd7 make property editor placeholder lighter + increase font size 2017-03-13 20:38:02 +01:00
Mads Rasmussen
aa7e739b0e increase sections label font size 2017-03-13 20:09:44 +01:00
Mads Rasmussen
97f379ff44 add more contrast to placeholder text 2017-03-13 20:06:57 +01:00
Warren Buckley
7753993987 Adds in more checks for the UDI or int to be stored - as there is a similar call to open the dialog to pick content from another function name - unknown why 
Same for persisting data
 2017-03-13 13:48:13 +00:00
Shannon
aba325e109 Creates UDI Related Links Property Editor and deprecates the old one 2017-03-13 16:14: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