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
|
a468cb78c5
|
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
|
2016-01-14 19:56:43 +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 |
|
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 |
|
Simon Busborg
|
f504a98bcd
|
localized placeholders
|
2016-01-14 11:44:29 +01:00 |
|
Simon Busborg
|
e47d72a51f
|
Added localize to dialogs
|
2016-01-14 11:44:29 +01:00 |
|
Mads Rasmussen
|
e334f669b8
|
localize member types create
|
2016-01-14 11:44:29 +01:00 |
|
Mads Rasmussen
|
679d9c1e0a
|
translate media types create
|
2016-01-14 11:44:29 +01:00 |
|
Mads Rasmussen
|
a3d9cbb5fd
|
translate document type editor create dialog
|
2016-01-14 11:44:29 +01:00 |
|
Mads Rasmussen
|
30c928a734
|
fix localize bug with reorder and compositions button in content type editor
|
2016-01-14 11:44:29 +01:00 |
|
Mads Rasmussen
|
9a5f8c2899
|
start localizing content type editor
|
2016-01-14 11:44:29 +01:00 |
|
Shannon
|
632cdac90b
|
adds translations for content type editor to en_us
|
2016-01-14 11:36:12 +01:00 |
|
Shannon Deminick
|
4068c527bc
|
Merge pull request #1019 from umbraco/temp-U4-7560
Fixes: U4-7560 Default member properties should not be editable
|
2016-01-14 11:29:56 +01:00 |
|
Mads Rasmussen
|
b116a96058
|
Fixes: U4-7581 Why so curvy?
|
2016-01-14 09:52:55 +01:00 |
|
Claus
|
b9cafa2016
|
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
|
2016-01-14 09:41:14 +01:00 |
|
Claus
|
13a9f40815
|
Fixes: U4-7728 Folder view in media section gives an exception
Ensuring umbracoFile property isn't accessed if this is called on a folder.
|
2016-01-14 09:40:40 +01:00 |
|
Claus
|
1a8ae67dd1
|
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
Conflicts:
src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
|
2016-01-14 09:04:42 +01:00 |
|
Claus
|
67f8141015
|
Merge branch 'bjarnef-dev-v7-mediapicker-only-images' into dev-v7
|
2016-01-14 08:56:34 +01:00 |
|
bjarnef
|
06a098215b
|
Add media picker config to restrict the editors to only pick images
|
2016-01-14 00:36:53 +01:00 |
|