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

18004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren Buckley
b764a47e7e Adds in new format function to localizationService simialr to C# String.Format() usign %0% as tokens. 
Documents the new functions added.
 2017-02-22 10:58:27 +00:00
Warren Buckley
fc7cba1da9 Add in localizeMany & concat to localizationService as dont like seeing nested promises in our code base to fetch two items to pass to notificationService 2017-02-22 10:58:07 +00:00
Warren Buckley
883980ab8d Update localizationService documentation about the usage of %0% tokens being replaced with passed in values 2017-02-22 10:57:52 +00:00
Warren Buckley
23abbdb288 Update Localize Directive (attribute & element) with some specifics in documentation about the format of the string for the key. Localize attribute now supports a key without having to be prefixed with @ 2017-02-22 10:57:32 +00:00
Warren Buckley
652a7a3655 Update more translation keys from Per's update to the template editor (Will need to merge in after this) 2017-02-22 10:56:46 +00:00
Warren Buckley
8f73514c1d An initial start of localising the keyboard shortcut dialog for template editor (Only adding keys into en.xml for now) 2017-02-22 10:56:18 +00:00
Warren Buckley
304b863b02 Adds in keyboard shortcuts to power the dialog/UI and adds in the custom keyboard bindings for opening our cusotm dialogs for inserting macros, partials etc 2017-02-22 10:55:59 +00:00
Warren Buckley
f0bdb1a2e9 Updates ACE Editor Directive to load in the additional library that enables simple auto-complete 2017-02-22 10:55:44 +00:00
Warren Buckley
6fb3c91d3f Updates Keyboard Shorcut directive in template editor view to use the new attribute on the directive to pass in show overlay bool 2017-02-22 10:55:14 +00:00
Warren Buckley
b9095629ed Update Keyboard Shortcut Directive to support a callback function being passed in & the bool thjat toggles the overlay/div from being shown 2017-02-22 10:54:54 +00:00
Stephan
1a37d88855 ShadowFS in App_Data/TEMP 2017-02-22 10:05:53 +01:00
Claus
2d5ffabe1e adding missing files from last commits. 2017-02-21 18:15:11 +01:00
Stephan
f61b7579a2 Version 7.6-alpha066 2017-02-21 17:13:34 +01:00
Stephan
86a3780c61 Cleanup IFileSource for Deploy/IFileSource 2017-02-21 16:01:01 +01:00
Emil Wangaa
552909fde2 Merge pull request #1753 from umbraco/temp-U4-9293 
Fixes: U4-9293 Search the entire media section in Media Picker when inserting an image into content
 2017-02-21 12:00:26 +01:00
Emil Wangaa
7adae4d345 Merge pull request #1755 from umbraco/temp-U4-9470 
U4-9470 Mini list view: only show expand option for nodes with children
 2017-02-21 09:00:52 +01:00
Emil Wangaa
d747cf69c3 Fixes typo in comment 2017-02-21 08:23:21 +01:00
Shannon
bc5e3b4d66 Fixes issue of moving an item to the root, it will throw a JS error because target.nodeType is null 2017-02-21 15:44:49 +11:00
Shannon
febeb82d10 Fixes the EntityController.GetPagedDescendants to not return items in the recycle bin, added some tests. 2017-02-21 15:43:46 +11:00
Shannon
1c2b2c1409 Merge branch 'refs/heads/temp-U4-9470' into temp-U4-9293 2017-02-21 13:54:21 +11:00
Shannon
b4eb9f333e Gets the member picker working with mini list views, falls back to Examine search for when searching on member types - since the EntityService doesn't support that currently, gets the icon mapped correctly for members, 2017-02-21 13:49:58 +11:00
Shannon
af00a421cd Updates EntityController to deal with special Members root node id 2017-02-20 21:23:09 +11:00
Stephan
fed06c88e8 Version 7.6-alpha065 2017-02-17 14:28:26 +01:00
Stephan
5dec2861d9 Fix event name issue 2017-02-17 14:28:26 +01:00
Stephan
23b3bb37ee Scope - fix issue with EventMessages 2017-02-17 13:10:22 +01:00
Emil Wangaa
4dabb606e7 Fixes issue with the mediapicker search getting 404 and loading failing because of missing property values for folders 2017-02-17 09:53:23 +01:00
Mads Rasmussen
d5f66ebe02 update image properties to match media grid component 2017-02-16 19:59:45 +01:00
Stephan
c7783d1cd1 Merge pull request #1759 from umbraco/temp-deploy-214 
deploy-214 Add a "pretty" name to the IEntity or lookup a name when one is not immediately available
 2017-02-16 18:45:31 +01:00
Stephan
2104b109f2 Merge pull request #1746 from umbraco/temp-U4-9509 
U4-9509 Fix bugs in shadow filesystem
 2017-02-16 18:43:04 +01:00
Stephan
578ca7d41d Merge branch dev-v7.6 into temp-U4-9509 2017-02-16 18:38:22 +01:00
Emil Wangaa
bd38dde1fc Adds GetPagedDescendants to EntityController 
Implements GetPagedDescendants in the mediapicker Search
Removes duplicate ExamineSearch and Search endpoint code from MediaController
 2017-02-16 14:41:50 +01:00
Claus
42c23da9f5 removing IPrettyArtifact and moving properties to IArtifact instead. 2017-02-16 12:54:42 +01:00
Emil Wangaa
cab1536a30 Merge remote-tracking branch 'origin/temp-U4-9470' into temp-U4-9293 2017-02-16 12:46:35 +01:00
Claus
33d35fd9f7 bumping version just to be sure. 2017-02-16 10:01:37 +01:00
Claus
cc885c1231 Merge pull request #1750 from umbraco/deploy-219 
deploy-219 - files management
 2017-02-16 09:52:59 +01:00
Shannon
422dd1a627 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-02-16 13:22:59 +11:00
Sebastiaan Janssen
759e444624 Merge pull request #1467 from ArnoldV/dev-v7 
U4-8990 Updated Dutch Language File
 2017-02-15 22:39:44 +01:00
Sebastiaan Janssen
2a7ef5de26 Merge pull request #1756 from umbraco/temp-U4-9512 
U4-9512 Missing index on umbracoUser2NodePermission
 2017-02-15 15:14:33 +01:00
Claus
43e892563d Merge branch 'aarym-u4-9491' into dev-v7.6 2017-02-15 14:17:43 +01:00
Shannon
4d1e64b279 U4-9512 Missing index on umbracoUser2NodePermission 2017-02-15 21:51:14 +11:00
Shannon
975c97cfb0 Doh! Changed update to Execute 2017-02-15 21:24:45 +11:00
Shannon
0c613347ae Updates ClearPublished logic to be done in a single SQL statement instead of several 2017-02-15 21:22:08 +11:00
Mads Rasmussen
83f75fdaff nested mini list views: use visibility hidden instead of ng-if to better align list items 2017-02-15 11:00:35 +01:00
Mads Rasmussen
487792920b only show published state for content 2017-02-15 10:40:24 +01:00
Shannon
6ae06ad2e0 Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9470 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
 2017-02-15 17:41:12 +11:00
Shannon
8387c435d4 Gets mini list view working so that only nodes with children show the arrow, added GetPagedChildren to EntityController 2017-02-15 17:40:10 +11:00
Shannon
5807bbccc4 revert change to petapoco, we will calc the total manually for this due to an outer join/aggregate, adds GetDescendents + tests for EntityService 2017-02-15 16:38:43 +11:00
Shannon
1bfc041bbe Adds Paged query to entity repo/service + tests, had to fix paged queries in petapoco to strip ending GROUP BY otherwise the COUNT is incorrect 2017-02-15 15:13:23 +11:00
Claus
a5ca058cb2 adding another wildcard test for ShadowFileSystem. 2017-02-14 15:14:21 +01:00
Claus
88a1ad04aa ensuring filter is applied to the shadow filesystem when using GetFiles. 
added tests for various filters.
 2017-02-14 14:57:04 +01:00