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

15062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bjarnef
051b320904 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7 2016-01-13 23:16:10 +01:00
Mads Rasmussen
88f63c7890 only set pointer events to none on search icon, so you can click back in content picker 2016-01-13 21:37:35 +01:00
Shannon Deminick
791c45e085 Merge pull request #1017 from umbraco/temp-deploy-29 
deploy-29 - Sanitize UniqueId
 2016-01-13 19:22:27 +01:00
Shannon
afe2aeda1b Merge branch '7.4.0' into temp-deploy-29 2016-01-13 19:11:20 +01:00
Claus
b9e7990b7c Fixes: U4-7560 Default member properties should not be editable 
Added locked property to content type properties by alias.
Ensured built in member properties are locked in the editor.
Content type editor changes for supporting locked properties.
 2016-01-13 18:43:06 +01:00
Shannon
8b2606f681 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:31:35 +01:00
Shannon
5aab50ba3b Ensures fcnMode and file size maximums are set for the debug web config transform and also for the nuget transform. 2016-01-13 17:27:56 +01:00
Shannon
dfa687e695 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:18:30 +01:00
Shannon
5b9cbae860 Fixes: U4-7712 fcnMode = Single by default 2016-01-13 17:17:39 +01:00
Shannon Deminick
b026245b3f Merge pull request #1007 from umbraco/temp-U4-7634 
Temp u4 7634
 2016-01-13 17:11:59 +01:00
Shannon
20f2773f38 removes the config option registered in the file 2016-01-13 17:09:55 +01:00
Shannon
88b8cfb2bd streamlines how the disabled check boxes work - will perform better too - fixes re-allowing the checkbox on refilter for ancestors. 2016-01-13 16:59:14 +01:00
Shannon
54669ee2bc Ensures you cannot move a child doc type, changes the result of GetAvailableCompositions to be a model instead of a tuple, the result also includes the current ancestor list which we can use to disable items in the list, makes these models/methods internal since they'll most likely be changing, 2016-01-13 16:25:35 +01:00
Shannon
6d5435c2e8 Merge branch '7.4.0' into temp-U4-7634 2016-01-13 14:49:37 +01:00
Shannon
1f245ec553 fixes alias validation when saving an existing contenttype 2016-01-13 14:48:19 +01:00
Shannon
17902712ac fixes merge/build 2016-01-13 14:44:17 +01:00
Claus
59759c4919 Merge pull request #1018 from umbraco/temp-U4-5982 
U4-5982 Webpages unpublishing by themselves
 2016-01-13 14:29:37 +01:00
Shannon
9dc57b0e37 Merge branch '7.4.0' into temp-U4-7634 
Conflicts:
	src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-13 14:08:19 +01:00
Shannon
68ddea2776 refactors a bit of code from the PR, adds more translations to the other english file. 2016-01-13 12:33:57 +01:00