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

15225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
efdeb757f6 Merge pull request #1023 from umbraco/temp-U4-7212 
U4-7212 All new text for content type editor needs to be localized.
 2016-01-15 12:05:38 +01:00
Shannon
4a30398499 fixes capitalisation 2016-01-15 12:04:29 +01:00
Shannon
2a905afe08 fixes translation files, removes duplicate and updates en_us 2016-01-15 12:03:03 +01:00
Shannon
b79c7407e6 Removes unecessary promise wrapping for localizing, fixes localization service so that it's not double requesting and fixes how it deals with promise returns. 2016-01-15 11:49:29 +01:00
Shannon
8399906c9a Merge branch '7.4.0' into temp-U4-7212 2016-01-15 11:17:28 +01:00
Shannon
4ce4bd25c4 Fixes package installer and export - doesn't import any folders for child doc types, doesn't export folders for child doc types, ensures that parent doc types are added as compositions (this was never working) and changed the list<string> to hashset<string> so it's always unique. 2016-01-15 11:07:21 +01:00
Claus
72eaec0ff8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

Merged branch over and ignored changes since they are not compatible with the new grid and they have been implemented correctly in the 7.4.0 branch.
 2016-01-15 10:34:20 +01:00
Mads Rasmussen
9e75a1821d Merge pull request #1024 from umbraco/temp-U4-6297 
Fixes: U4-6297 Add Settings to Grid Controls
 2016-01-15 10:22:49 +01:00
Mads Rasmussen
08e4f42974 do not show settings icon if there are no settings 2016-01-15 10:21:32 +01:00
Sebastiaan Janssen
0fbc0d5431 U4-7715 Update Gallery snippet for ImageCropper instead of the upload in 7.4.0 
#U4-7715 Fixed
 2016-01-15 10:19:35 +01:00
Claus
54e3f0f9ec Fixes: U4-6297 Add Settings to Grid Controls 
Added settings to grid controls in v.7.4.
 2016-01-15 10:04:49 +01:00
Claus
e1ee8a1437 Fix to ensure config array is copied and not referenced. 2016-01-15 10:00:05 +01:00
Claus
21ba88a34d Fixes: U4-6297 Add Settings to Grid Controls 
Reusing the existing code for calling the dialog instead of having a separate method for this.
 2016-01-15 09:43:01 +01:00
Shannon
a468cb78c5 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 19:56:43 +01:00
Shannon
ce3028446b Moves all serialization logic, including the part for folders into the EntityXmlSerializer where it needs to be, updates the data type repo to ensure paths are udpated correctly when moving, removes folder logic from other packaging logic, it's purely the responsibility of the serializer. adds new methods to content type and data type services to return an entities total folder collection. 2016-01-14 19:33:53 +01:00
Shannon
73f1458190 Fixes the Move content type command to ensure that all paths are updated correctly. 2016-01-14 18:25:14 +01:00
Shannon
684788cb62 Merge remote-tracking branch 'origin/dev-v7' into temp-U4-7557 2016-01-14 18:12:09 +01:00
Shannon
b5abbc7c30 Adds some null checks 2016-01-14 18:11:48 +01:00
Shannon
da9a2c59fc Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 17:40:36 +01:00
Shannon
7958b5fcb1 U4-7740 Speed up the current user's culture lookup 2016-01-14 16:43:31 +01:00
Shannon
44b22503e1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-14 16:36:13 +01:00
Shannon
bfa12856db Fixes issue with DefaultRepositoryCachePolicy when creating new items - we were generating the cache key before actually calling the method to create the item therefore there was no id assigned yet (it would be zero). 2016-01-14 16:36:03 +01:00
Claus
163f39b8be Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
 2016-01-14 15:53:20 +01:00
Stephan
46f3d0c647 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 15:51:53 +01:00
Per Ploug
cc8bb4c031 Fixes issue with Insert RenderSection 
Reported by doug for training build
 2016-01-14 15:37:24 +01:00
Sebastiaan Janssen
d9542f4ca5 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-14 15:06:39 +01:00
Sebastiaan Janssen
f057976f78 U4-7735 Localization fallback doesn't seem to work. 
#U4-7735 Fixed
 2016-01-14 15:06:16 +01:00
Claus
151c28a20f Merge pull request #642 from AussieInSeattle/U4-6297 
U4 6297
 2016-01-14 14:35:54 +01:00
Mads Rasmussen
b4bc0ca156 Fixes: RTE media picker 2016-01-14 14:07:46 +01:00
Claus
d2c8268fc4 Merge pull request #1014 from kvakulo/fix-media-item-without-image 
Fix the media picker not rendering when a media item has no image
 2016-01-14 13:46:12 +01:00
Simon Busborg
977369fb2d Danish translation for grid templates 2016-01-14 11:44:32 +01:00
Simon Busborg
ed8847821d Added localizationService to user.controller 2016-01-14 11:44:32 +01:00
Simon Busborg
bf3f482fe8 Danish translations 2016-01-14 11:44:32 +01:00
Mads Rasmussen
1489070afd start on danish translation 2016-01-14 11:44:31 +01:00
Mads Rasmussen
487d2c6ea1 localize property settings overlay 2016-01-14 11:44:31 +01:00
Mads Rasmussen
c66a6bb06f localize list view checkbox text 2016-01-14 11:44:31 +01:00
Mads Rasmussen
4bb4ce0ef4 localize header 2016-01-14 11:44:31 +01:00
Mads Rasmussen
b67b7c91a5 localize no compositions 2016-01-14 11:44:31 +01:00
Mads Rasmussen
a7627e3482 fix save list view button 2016-01-14 11:44:31 +01:00
Mads Rasmussen
2e6621f31b fix key for umbChildSelector directive 2016-01-14 11:44:31 +01:00
Mads Rasmussen
8a07f47077 add localizationService as dependency on ysod overlay 2016-01-14 11:44:31 +01:00
Simon Busborg
5cefd9ad20 localize property validation 2016-01-14 11:44:31 +01:00
Simon Busborg
96db5a5be3 translation file for drop zone directive 2016-01-14 11:44:30 +01:00
Simon Busborg
cdcadab68b localize overlay titles 2016-01-14 11:44:30 +01:00
Simon Busborg
67112b640c localized component views 2016-01-14 11:44:30 +01:00
Simon Busborg
c9ad7659a8 localize components views 2016-01-14 11:44:30 +01:00
Simon Busborg
cc1764dc88 Added localization for controllers (member, media and document types) 2016-01-14 11:44:30 +01:00
Simon Busborg
3888853a40 Added localization to controllers 2016-01-14 11:44:30 +01:00
Simon Busborg
397a9bffb2 localized documentypes, memberstypes and mediatypes, only controllers missing 2016-01-14 11:44:30 +01:00
Simon Busborg
5965552494 localized documenttypes 2016-01-14 11:44:30 +01:00