yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,331 Commits 4 Branches 7 Tags
3094dea5d4b28cb2f8a87639acb4d647e67c5be1
Commit Graph

9942 Commits

Author SHA1 Message Date
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
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
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
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
Aaron Powell
b8097219fb Implementing a test for U4-6035 2014-12-21 17:56:33 +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
redmorello
e5ec935128 Update forms.less 
Removed negative left margin from checkbox and radio button inputs.
 2014-12-18 11:08:44 +00:00
redmorello
3ea16e66d4 Update forms.less 
Removed negative left margin from input and radio button inputs.
 2014-12-18 11:07:08 +00:00
Shannon
938b236f54 fixes initialized flag on section service 2014-12-18 15:12:22 +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
Dennis Öhman
5b63a8e9d9 Colspan change 
Changed colspan from fixed 5 to includeProperties.length + 3
 2014-12-17 17:10:22 +01:00
Robin Herd
c256266432 isResized now determined by regex 2014-12-17 13:06:46 +00:00
Shannon
db087a9e78 pretty much got 5966 working just need to do some more tests. 2014-12-17 17:08:12 +11:00
Shannon
4e33552a5c wip - working on U4-5966 2014-12-17 16:19:42 +11:00
Shannon
da25970f79 wip - working on U4-5966 2014-12-17 15:19:03 +11:00
Phil Hughes
562367e9a2 Label on files not just folders 2014-12-16 15:25:13 +00:00
Shannon
0807597a3c Fixes: U4-5977 The debounce timeout on the main search is too big which produces a lag in searching & U4-5994 Global search needs to only show results for the 'last' search request made and ignore previous ones 2014-12-16 15:50:54 +11:00
Shannon
d564866b07 Merge branch 'Aaen-7.2.0' into dev-v7 2014-12-16 14:34:13 +11:00
Shannon
99a45d26ae Merge branch '7.2.0' of https://github.com/Aaen/Umbraco-CMS into Aaen-7.2.0 2014-12-16 14:33:21 +11:00
Shannon
a32d38f7ea Fixes: U4-5992 Caching of XPathNodeIterator in umbraco.library is not thread safe and will cause media errors like valueDictionary exception 2014-12-16 14:26:53 +11:00
Shannon Deminick
5bf9362c92 Merge pull request #586 from Alain-es/Fix-for-U4-5852 
Fix for U4-5852
 2014-12-16 11:24:56 +11:00
Shannon Deminick
d9925e3453 Merge pull request #589 from teeto/patch-1 
Update es.xml
 2014-12-16 11:08:16 +11:00
Shannon
e1106a9d67 Merge branch '7.2.1-doctype-fixes' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Services/ContentTypeService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
 2014-12-16 09:47:53 +11:00
Sebastiaan Janssen
a8d7a1d01d Makes the test green: don't add the passed in composition as a dependency to itself.. also added another invariant check 2014-12-15 19:52:28 +01:00
Sebastiaan Janssen
e62597521e Remove the renaming to 'title' which would cause a duplicate and make the next test fail 2014-12-15 19:51:37 +01:00