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

2550 Commits

Author SHA1 Message Date
Shannon
c39b8f6eb5 Merge branch 'dev-7.4.0-ModelsBuilder' of https://github.com/umbraco/Umbraco-CMS into dev-7.4.0-ModelsBuilder 2016-01-15 16:56:49 +01:00
Shannon
b776a32a64 fixes the models builder API controller URL 2016-01-15 16:54:38 +01:00
Sebastiaan Janssen
c752c9e2bf Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 16:24:30 +01:00
Sebastiaan Janssen
d1cdff6349 Reference to System.Runtime is required 
Release with a reference to ModelsBuilder
 2016-01-15 16:24:14 +01:00
Sebastiaan Janssen
742e0d69fa Removes duplicate requestFiltering node in web.Template.config 2016-01-15 15:56:26 +01:00
Sebastiaan Janssen
df266a202a Fix build and dependencies 2016-01-15 15:31:16 +01:00
Sebastiaan Janssen
49bafe51b7 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:24:39 +01:00
Stephan
244d09068a Merge branch 'dev-7.4.0-ModelsBuilder' of https://github.com/umbraco/Umbraco-CMS into dev-7.4.0-ModelsBuilder 2016-01-15 13:11:53 +01:00
Stephan
99cf7a096c Import missing ModelsBuilder files 2016-01-15 13:11:34 +01:00
Shannon
cee20e968f fixes csproj, should no longer reference Zbu DLL 2016-01-15 13:04:18 +01:00
Stephan
fb1a72600e Upgrade to Umbraco.ModelsBuilder 2.2.0-beta002 2016-01-15 12:37:15 +01:00
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
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
Per Ploug
cc8bb4c031 Fixes issue with Insert RenderSection 
Reported by doug for training build
 2016-01-14 15:37:24 +01:00
Simon Busborg
977369fb2d Danish translation for grid templates 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
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
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
e47d72a51f Added localize to dialogs 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
9a5f8c2899 start localizing content type editor 2016-01-14 11:44:29 +01:00
Shannon
6ae1806615 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 11:40:06 +01:00
Shannon
632cdac90b adds translations for content type editor to en_us 2016-01-14 11:36:12 +01:00
Shannon
c2c350a517 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-14 10:37:14 +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
20f2773f38 removes the config option registered in the file 2016-01-13 17:09:55 +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
Shannon
fae5618865 Merge branch 'UKFest-6322' of https://github.com/JJCLane/Umbraco-CMS into JJCLane-UKFest-6322 2016-01-13 12:23:26 +01:00
Per Ploug
849d7c45e0 Fix merge conflicts 2016-01-13 12:18:14 +01:00
Shannon
94a1f7e078 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
 2016-01-13 12:11:27 +01:00
Per Ploug
cec1f6dae3 Merge remote-tracking branch 'refs/remotes/origin/7.4.0' into dev-7.4.0-ModelsBuilder 
# Conflicts:
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/Editors/ContentTypeController.cs
 2016-01-13 12:10:08 +01:00