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

11929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alain
d94fe7df68 Update UserService.cs 2015-01-05 18:55:31 +00:00
Shannon
d4c0ea9c48 working on U4-5875 - Updated RequiredManifestValueValidator to automatically check for empty json strings if the value type is JSON. Updates the TagsPropertyEditor to check for empty json in it's required validator. Updated the tags JS to always update the model value so if there's a server side validation, it gets cleared on change. 2015-01-05 14:25:16 +11:00
Shannon
459d9b34e7 Fixes: U4-5974 User which is not administrator getting logged out when clicking recycle bin 2015-01-05 12:22:49 +11:00
Shannon
2ad86ec83d Merge branch '7.2.0-U4-4049' into dev-v7 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-01-05 10:26:27 +11:00
Shannon
70ddf646be Changed the DefaultUrlProvider's warnings to Debug statements since this can get logged very often when there are unpublished pages and a URL is requested for them which can occur a ton, especially when searching in the back office since a URL is attempted to be created on each search for each result. 2015-01-05 10:08:36 +11:00
Shannon
4de31249fd removes some usages of singletons 2015-01-05 10:01:58 +11:00
Shannon
26c3bb05d6 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-01-05 09:48:08 +11:00
Shannon
b1fe15ed56 fixes a null ref 2015-01-05 09:46:54 +11:00
Shannon Deminick
83f1613eb8 Merge pull request #611 from leekelleher/lk-contentservice-constants 
ContentService - Replaced the hardcoded -1 and -20 values with Constants
 2015-01-05 08:55:34 +11:00
leekelleher
e8e6f5f807 Replaced the hardcoded integer values for -1 and -20 in ContentService with the Constants values. 
I did this whilst working on PR #610 (U4-337), but separated out to its own branch so not to clutter the other PR.
 2015-01-04 21:02:20 +00:00
Shannon
920084b7c3 Merge branch 'sitereactor-ascii-art' into dev-v7 2015-01-02 16:21:12 +11:00
Shannon
ff2c71367f adds tests 2015-01-02 16:19:51 +11:00
Shannon Deminick
428efed7c3 Merge pull request #597 from chrisjsherm/issue-u4-4158 
Fix for Truncate function stripping out content between tags. This issue...
 2015-01-02 16:03:46 +11:00
Shannon
7c59c71261 updates PR for U4-6054 to just read directly from the file stream, no need to copy it first. 2015-01-02 15:58:31 +11:00
Shannon Deminick
a0c2914ce6 Merge pull request #604 from csharpforevermore/dev-v7 
Fixed: U4-6054 "Unit test 'Umbraco.Tests.IO.AbstractFileSystemTests.Can_...
 2015-01-02 15:54:11 +11:00
Shannon Deminick
dbb70a8646 Merge pull request #607 from gertdc/U4-6060 
Added dutch translations for the grid layout
 2015-01-02 15:49:50 +11:00
Shannon
6a423dd032 Fixes: U4-5940 Feature Request - Disable partial/macro caching when in debug mode 2015-01-02 15:45:33 +11:00
Shannon
73e9ff04e8 Fixes: U4-5943 Cannot render a macro on a virtual page when using UmbracoVirtualNodeRouteHandler and assigning virtual Ids 2015-01-02 15:34:51 +11:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
Shannon
a68fed42ad Merge branch 'madsoulswe-7.2.1' into dev-v7 2015-01-02 11:58:56 +11:00
Shannon
a427427564 fixes sql for sqlce for data integrity controller 2015-01-02 11:56:27 +11:00
Shannon
2286c0899c reverts UseTempStorage sync from examine settings on dev branch. 2015-01-02 11:55:18 +11:00
Shannon
55eea6e44f Merge branch '7.2.0' into 7.2.0-U4-4049 2015-01-02 11:44:29 +11:00
gertdc
ae257d0f50 Added dutch translations for the grid layout 2014-12-30 10:18:54 +01:00
Shannon
28a01d61a6 Fixes: U4-5981 Umbraco 7.2 Text encoding when saving partial view template 2014-12-29 13:50:33 +11:00
Chris Randle
bc776d787e Fixed: U4-6054 "Unit test 'Umbraco.Tests.IO.AbstractFileSystemTests.Can_Get_Size()' fails" by looking at the size of the string not the file which can vary - possibly dependent on encoding. 2014-12-27 00:11:59 +00:00
Shannon
2f74dfe5cb fixes missing using statement 2014-12-24 17:01:41 +11:00
Shannon
84d2caf5d8 Merge branch '21robin12-7.2.0-U4-6004' into dev-v7 2014-12-24 12:34:10 +11:00
Shannon
456e7d9fdf Merge branch '7.2.0-U4-6004' of https://github.com/21robin12/Umbraco-CMS into 21robin12-7.2.0-U4-6004 2014-12-24 12:33:35 +11:00
Shannon
dae66ad2d0 Merge remote-tracking branch 'origin/dev-v6' into dev-v7 
Conflicts:
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
	src/umbraco.businesslogic/Application.cs
	src/umbraco.businesslogic/ApplicationRegistrar.cs
	src/umbraco.businesslogic/ApplicationTree.cs
	src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
 2014-12-24 11:56:28 +11:00
Stephan
69d254a198 Merge pull request #600 from solutionmania/dev-v7 
Resolved U4-5193 and U4-6051
 2014-12-23 17:44:39 +01:00
Stephan
b30555f5a4 Merge pull request #599 from solutionmania/dev-v6 
Merge into dev v6
 2014-12-23 17:44:25 +01:00
Chris Roberts
d5b6428cdc Fixed: U4-6051 HasAccces method tests the roles of the wrong user 2014-12-23 16:32:24 +00:00
Chris Roberts
7d5bce76c2 Fixed: U4-5193 HasAccess override method name error 2014-12-23 16:30:11 +00:00
Chris Roberts
d4d77611eb Fixed: U4-5193 HasAccess override method name error 2014-12-23 16:27:51 +00:00
Chris Roberts
662ed03f0a Fixed: U4-6051 HasAccces method tests the roles of the wrong user 2014-12-23 16:23:47 +00:00
Shannon
fdac0ede45 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2014-12-22 15:14:57 +11:00
Shannon
83aa30d2c5 Adds a VirtualPath property to IFile which is the relative path of the file to the root of the website. 2014-12-22 15:14:44 +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
per ploug
2e2ea57ba6 Fixes grid editor always rending 12 columns 
When a user change grid cols, the editor keeps rendering 12 column
layouts - this fixes the 12 cols issue and falls back to 12 in case of
invalid/missing information
 2014-12-19 16:11:33 +01:00
Sebastiaan Janssen
72004768cf U4-5981 Umbraco 7.2 Text encoding when saving partial view template 
#U4-5981 In Progress Assignee Shandem
 2014-12-18 13:56:50 +01:00
Sebastiaan Janssen
b8e98ae017 No need to start a webserver for the Umbraco.Web.UI.Client project (correct me if I'm wrong) 2014-12-18 13:55:50 +01:00
Shannon
3c01dcb30c Fixes: U4-6030 2014-12-18 15:16:29 +11:00
Shannon
938b236f54 fixes initialized flag on section service 2014-12-18 15:12:22 +11:00
Shannon
aa439cacda working on U4-6030 2014-12-18 14:58:49 +11:00
Shannon
e643f2a0ba working on U4-6030 2014-12-18 14:20:41 +11:00
Shannon
5b9a98ad6a Simplifies the ILocalizedTextService to not have an extension method for null tokens, adds another extension method to accept an array of tokens, adds null checks. 2014-12-18 12:45:04 +11:00
Shannon
3323138232 Fixes up js localization service so that it doesn't make a ton of requests on first load, Fixes: U4-2675 Create new controller service to output the json for localization for use in angular service 2014-12-18 12:35:38 +11:00
Shannon
cd0aa5e342 Fixed null checks and error checking for duplicates in the xml file store, added test 2014-12-18 12:33:34 +11:00
Shannon
f63ec81c47 cleans up commented out code 2014-12-18 10:58:41 +11:00