Commit Graph

132 Commits

Author SHA1 Message Date
Stephan
7ea9c9c8e2 Move Web.Current to Composing 2017-05-30 18:13:11 +02:00
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Stephan
8aa730d986 Ensure U4-8720 is properly merged into v8 2016-11-05 13:16:22 +01:00
Stephan
b26b415096 Merge origin/dev-v7-deploy into dev-v8-zbwip (builds) 2016-11-03 10:31:44 +01:00
Stephan
341e817fd5 Get tests to run, troubleshoot 2016-10-17 11:00:18 +02:00
Stephan
3c698cbf8c Refactor UmbracoContext, PublishedContentRequest... 2016-10-17 11:00:14 +02:00
Stephan
0597eea72b Resvolution - Components, Runtime & Booting 2016-09-19 16:33:43 +02:00
Stephan
376dec2fed Resvolution - CultureDictionaryFactoryResolver 2016-09-19 16:33:36 +02:00
Claus
600d7be2ac U4-8567 UmbracoHelper.CreateEncryptedRouteString fails to parse additionalRouteVals when it is of type Dictionary<string, object> 2016-08-10 13:45:06 +02:00
Sebastiaan Janssen
1aa2845b4a Merge pull request #1360 from marcemarc/dev-u4-8657
Closes Issue U4-8657 - Add an overload to GetDictionaryValue to provide fallback text
2016-08-03 21:08:16 +02:00
Stephan
6c6c56645d U4-8720 - add documentation 2016-07-21 15:20:45 +02:00
Stephan
ffb30123cc U4-8710 - from Umbraco.Field, GetPropertyValue to Value 2016-07-21 10:03:11 +02:00
Stephan
d2de66ab5c U4-8626 - kill typed queries 2016-07-21 10:03:11 +02:00
Stephan
cdb1f29ec0 U4-8626 - kill dynamic support 2016-07-21 10:03:11 +02:00
Stephan
d08412c0fe Refactor - IPublishedContent, converters, fragments 2016-07-21 09:37:40 +02:00
Stephan
a0caab410e U4-8720 - add dynamic support, UmbracoHelper methods 2016-07-19 16:13:46 +02:00
Stephan
3c7245f9ba Merge origin/dev-v7 into dev-v8 2016-07-08 16:32:06 +02:00
Søren Kottal
44565226fe U4-7386: Adds summaries to string functions 2016-07-01 22:14:44 +02:00
Marc Goodson
29e45534c5 Add an overload to GetDictionaryValue to provide a fallback - U4-8657 2016-06-27 16:46:52 +01:00
Shannon
d6779619ea U4-6899 Change UmbracoHelper.TagQuery to return ITagQuery instead of the current hack to return a non interface 2015-12-22 15:45:15 +01:00
Shannon
c242383430 removes some obsolete code, ensures that UmbracoHelper is added to the container. 2015-12-21 17:50:00 +01:00
Shannon
99e7f84f79 Moves EnableCanvasDesigner to HtmlHelperRenderExtensions because it's for rendering html, obsoletes the old ones and fixes up the canvasdesigner to use
the correct umbraco paths instead of hard coded absolute paths.
2015-10-16 13:36:10 +02:00
Stephan
a542cf56d4 U4-7063 - Umbraco.TypedContent(ints) should not return nulls 2015-09-04 10:43:42 +02:00
Shannon
b4e496fceb Fixes backwards compat issue in 7.3 with TagQuery property on UmbracoHelper. see: http://issues.umbraco.org/issue/U4-6899 2015-07-30 14:03:17 +02:00
Timothy Lee Russell
1aaeb75e0e Update Field() methods in UmbracoHelper
Update Field() methods in UmbracoHelper to use the existing lazy
instantiation of ComponentRenderer to fix a problem where
_componentRenderer is not provided by the default constructor.
2015-07-21 14:58:34 -07:00
Shannon
93c1321b99 fixes potential null ref when accessing the TagQuery property of UmbracoHelper 2015-07-20 15:37:40 +02:00
Shannon
76fb595a55 Fixes: U4-6363 Expose Dictionary item access on UmbracoHelper 2015-05-18 13:38:14 +10:00
Shannon
4e195543ea fixes null ref with component renderer in UmbracoHelper 2015-03-24 15:12:58 +11:00
Shannon
c760a7c50d Merge branch 'dev-v7-7.3.0-UmbHelperInterfaces' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-7.3.0-UmbHelperInterfaces
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2015-02-18 17:14:55 +01:00
Shannon
428df7ae4a Merge branch 'dev-v7' into 7.3.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
2015-02-17 15:11:10 +01:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Shannon
1b161c8dbe Removes more usages of legacy Access class to use new IPublicAccessService 2015-01-28 19:46:05 +11:00
Shannon
b1fe15ed56 fixes a null ref 2015-01-05 09:46:54 +11:00
Shannon
ff2c71367f adds tests 2015-01-02 16:19:51 +11:00
chrisjsherm
34b524aabb Fix for Truncate function stripping out content between tags. This issue is referenced at issues.umbraco.org/issue/U4-4158. 2014-12-19 17:47:12 -05:00
antoine
c3c755755d Canvas designer, palette config path in EnableCanvasDesigner fixed 2014-10-01 15:01:16 +02:00
antoine
7fcb982e33 disable canvasdesigner css link on the preview mode (with canvasdesigner enable) 2014-09-23 19:45:35 +02:00
antoine
6d1ccaa7a4 Renames Tuning to canvasdesigner (code and comments) 2014-09-23 19:10:51 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
2014-08-24 21:35:08 -06:00
Shannon
81d8a90f59 Adds some simple request based caching for the retrieval of the current member in the Umbraco helper. 2014-08-20 12:31:54 -06:00
antoine
2e1e1eee1c Link to current tuned css file in preview mode 2014-07-01 13:55:39 +02:00
antoine
16d8481ad9 Tuning new concept, config throught json config or/and html5 data tags 2014-06-30 19:28:33 +02:00
Sebastiaan Janssen
344b880ba7 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
2014-06-10 15:22:31 +02:00
Stephan
0af19fa442 U4-5057 - fix UmbracoHelper.TypedSearch 2014-06-05 17:30:58 +02:00
antoine
2fdf040f73 Palette improvement 2014-06-02 10:55:53 +02:00
antoine
3dabd73ec2 Merge branch '7.1.2-Usky' into 7.1.2-Usky-Grid
Conflicts:
	src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
	src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
	src/Umbraco.Web.UI/Umbraco/js/tuning.panel.js
	src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
2014-05-30 19:56:51 +02:00
antoine
b57642003c Grid row unique id 2014-05-25 20:52:23 +02:00
antoine
7508613d13 First approach 2014-05-22 22:20:13 +02:00
antoine
9626e91c83 dependency with bootstrap.3.0.1.min.js 2014-05-21 19:51:13 +02:00