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

5580 Commits

Author SHA1 Message Date
Mads Rasmussen
ab00ba8a12 Merge branch 'dev-v7.6' into temp-U4-9352 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-27 10:39:31 +01:00
Warren Buckley
784c84a166 Merge pull request #1474 from umbraco/temp-U4-8963 
U4-8963 Updates for ImageProcessor parameters to support background c…
 2017-01-26 20:45:35 +00:00
Sebastiaan Janssen
0a2e5badd0 Merge branch 'temp-template-editor' into dev-v7.6 2017-01-26 18:27:10 +01:00
Sebastiaan Janssen
90b0bf9d82 Merge branch 'dev-v7.6' into temp-template-editor 2017-01-26 18:26:32 +01:00
Warren Buckley
2465eb233e Adds in same workaround as other trees like DataTypes & DocTypes where Folders/Containers set an inline piece of JS that does nothing & returns 2017-01-26 11:32:13 +00:00
Claus
56bc47302c Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-24 09:59:03 +01:00
Claus
b08e38f9ed Merge branch 'dev-v7.6' into temp-deploy-176 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-01-24 09:51:59 +01:00
Warren Buckley
47e4c12395 Adds in translations into the JSON objects we send back from the API as the display name (not the aliases for querying) 2017-01-23 16:04:14 +00:00
Sebastiaan Janssen
12922f8413 No need to warn if attribute is not present 
Adds some logging about indexing being done.. the number of committed items seems to differ a little from the number of items in the index, not sure wh
 2017-01-20 09:55:41 +01:00
Warren Buckley
2f7b532209 Adds in code summaries for C# doc generation. Removes unused references & some tidying up (mostly sensible R# suggestions) 2017-01-19 15:43:29 +00:00
Per Ploug
eefd13547c More localization of querybuilder 2017-01-19 12:53:39 +01:00
Claus
29d86b8675 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-19 12:08:23 +01:00
Sebastiaan Janssen
b260f6c6de Merge pull request #1679 from umbraco/U-9333 
Add support for GUIDs in media and content pickers
 2017-01-19 11:25:34 +01:00
Niels Hartvig
afae06a866 Adds support for icons and encoding of directories for Code files 2017-01-19 10:41:08 +01:00
Warren Buckley
736cf94155 Merge pull request #1687 from umbraco/temp-U4-9354 
Fixes: U4-9354 SPIKE Update content picker UI
 2017-01-19 09:35:49 +00:00
Niels Hartvig
051af5c48e Wire up the editors and controllers 2017-01-19 09:49:27 +01:00
Warren Buckley
fc5bf81991 Returns a string as opposed to a Dynamic object - however cannot return a string object from this method as the result is wrapped in quotes hence we use a HttpResponseMessage & StringContent to return a raw string from the API endpoint 2017-01-18 12:33:43 +00:00
Sebastiaan Janssen
54e460cf5b U4-9392 Upgrade ImageProcessor with cache header and high CPU fix 
U4-9393 Upgrade to Examine 0.1.80
 2017-01-18 11:47:23 +01:00
Warren Buckley
6710ac8c85 Fix up camelCase method name to GetChildren 2017-01-18 09:43:21 +00:00
Sebastiaan Janssen
931db6f0b1 U4-9395 - Handle errors with non-existing fields and invalide JSON data 2017-01-17 16:47:54 +01:00
Mads Rasmussen
907afa11ad combine "open" end "edit" prevalues into one setting (open in dialog) + remove "show path on hover" setting because it is not used anymore 2017-01-17 11:11:20 +01:00
Shannon
44732e5f52 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-01-17 18:21:45 +11:00
Stephan
90f2fc4cd9 Merge pull request #1686 from umbraco/temp-U4-9388-2 
Finds all other instances where a reader would be executed inside ano…
 2017-01-17 08:18:54 +01:00
Shannon
038b155aea Fixes constants and internalsvisibleto 2017-01-17 14:42:30 +11:00
Shannon
deaa2d939a Moves GridValue to Models 2017-01-17 12:38:54 +11:00
Niels Hartvig
a162f21a70 Fixing missing mapping - let the green build lights appear 2017-01-16 19:49:57 +01:00
Niels Hartvig
c0a2a78f3d Fixes issue with entities not being returned from Keys (Guids) 2017-01-16 19:13:05 +01:00
Niels Hartvig
ace111aefb Adding support for get, save and rename to new Partial View editor 2017-01-16 16:50:22 +01:00
Mads Rasmussen
3bdc2e63ab get url for items + set published/unpublished state 2017-01-16 14:45:50 +01:00
Claus
594c3b8a85 Merge pull request #1630 from abjerner/patch-14 
Typo (sorta)
 2017-01-16 08:11:09 +01:00
Shannon
ede342feba Finds all other instances where a reader would be executed inside another reader's loop and fixes 2017-01-16 16:38:23 +11:00
Niels Hartvig
e7f7631d1e Fixes merge conflicts (needs updated ng-if in insert overlay) 2017-01-13 13:22:43 +01:00
Per Ploug
9b9db23461 Replaces the last static strings with language keys 2017-01-13 13:20:38 +01:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Mads Rasmussen
04f79ffaf1 lazy load ace editor source file - change to an isolated scope and don't rely on ngModel to get it working 2017-01-12 15:31:21 +01:00
Per Ploug
2085063231 Fixes issue with creating template below a parent template 2017-01-12 10:07:44 +01:00
Per Ploug
73f77df5ad Ensures VirtualPath is reset if a template alias is changed 2017-01-12 09:47:42 +01:00
Shannon
8a11b0f7a8 publisizes a constant (moves it to where it should be), publicizes another required class for deploy, bumps version 2017-01-12 17:33:30 +11:00
Shannon
cfd8d39878 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-01-12 13:39:15 +11:00
Per Ploug
0b7f60c0f8 Fixes to issues with query generation 
Ensures its typed content and children is called as a method
 2017-01-10 16:55:30 +01:00
Per Ploug
d563eb07a2 Adds .FirstChild(string alias) extension to Model.Content 2017-01-10 16:55:03 +01:00
Per Ploug
f036bc90c3 Fixes failing mapper test 2017-01-10 16:54:46 +01:00
Niels Hartvig
14e402878a Merge conflict fixes 2017-01-10 14:49:19 +01:00
Niels Hartvig
5a2687d520 Merge of temp-template-editor 2017-01-10 14:47:33 +01:00
Niels Hartvig
f75e0cf4ba Updates to PR based on Review 2017-01-10 12:47:00 +01:00
Mads Rasmussen
9718324e6e add check for master not being equal to template 2017-01-10 12:22:18 +01:00
Mads Rasmussen
82ab7c4a01 Merge branch 'temp-template-editor' into temp-U4-9324 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-10 11:52:03 +01:00
Shannon
77d47f0b28 fixes error with server side validation + data tyep editor, ensures template controller and data type controller inherit from BackOfficeNotificationsController, ensures BackOfficeNotificationsController is attributed with PrefixlessBodyModelValidator 2017-01-10 12:29:30 +11:00
Niels Hartvig
4c330c8654 Implements CodeFileController 2017-01-09 22:54:28 +01:00
Stephan
5e6f1a92ca Merge branch origin/dev-v7 into dev-v7.6 2017-01-09 15:31:41 +01:00