yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,366 Commits 4 Branches 7 Tags
8aafc583de76bfc991fa0f41c9fbcaede3a6450c
Commit Graph

10366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Hartvig
8aafc583de New styling for content / media titles 2014-06-08 16:29:04 +02:00
Shannon
ebbbd80bb3 Fixes: U4-5065 Add event to modify the model on front-end for IRenderMvcControllers 2014-06-08 14:14:12 +02:00
Shannon
7b33eca014 disables dist call 2014-06-08 13:14:27 +02:00
Shannon
f8e06e54de Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 13:09:37 +02:00
Shannon
23d9ef624b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	build/Build.bat
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-06-08 13:09:31 +02:00
Morten Christensen
cdb5b0470d Implementing tests for all methods in the LocalizationService. 2014-06-08 12:59:30 +02:00
Shannon
b43f39a0cb disables dist call 2014-06-08 12:50:45 +02:00
Shannon
d0cb27d1c1 Completes: U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance 2014-06-08 12:49:20 +02:00
Shannon
e8990eb6b2 Merge commit 'beb1979b4655a529b703ceec094a50f6a3dd8602' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config
 2014-06-08 12:24:29 +02:00
Shannon
05524c643e Merge branch '7.1.5-backoffice-miniprofiler' into 7.1.5 2014-06-08 12:08:34 +02:00
Shannon
ed989079b4 positions mini profiler to the bottom right 2014-06-08 12:08:05 +02:00
Morten Christensen
feed5c5e51 Fixes #U4-4593 EntityService.GetObjectType with passed in integer id or guid unique id 2014-06-08 09:46:43 +02:00
Stephan
0af19fa442 U4-5057 - fix UmbracoHelper.TypedSearch 2014-06-05 17:30:58 +02:00
Shandem
5b17bc6d5f Merge pull request #393 from henrikrossen/7.1.5 
Migrated obsolete method calls and cleaned ContentTypeServiceTests.cs
 2014-06-04 10:46:36 +10:00
Henrik Rossen Jakobsen
06a1f790dd Migrated obsolete method calls and cleaned ContentTypeServiceTests.cs 2014-06-03 21:47:18 +02:00
Shannon
e7994d077e minor logic change for checking if sort exists 2014-06-02 15:40:24 +10:00
Shannon
f55f9edb71 Ensures each property type has a real sort order when adding to the property type collection 2014-06-02 14:04:40 +10:00
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Sebastiaan Janssen
d1c5ddc03d Merge branch 'AndrewSwerlick-7.1.1' into 7.1.5 2014-05-29 18:19:52 +02:00
Sebastiaan Janssen
f11d209177 Merge branch '7.1.1' of https://github.com/AndrewSwerlick/Umbraco-CMS into AndrewSwerlick-7.1.1 2014-05-29 18:19:22 +02:00
Sebastiaan Janssen
ea32776174 Bump version 2014-05-28 17:07:51 +02:00
Sebastiaan Janssen
92ef071883 Don't do a ToString() in a IsNullOrEmpty.. 2014-05-28 16:37:16 +02:00
Sebastiaan Janssen
b42d0bc17e Bump version and fix dashboard 2014-05-28 16:04:11 +02:00
Sebastiaan Janssen
020a416dc5 en_us lang also updated like en 2014-05-28 13:15:20 +02:00
Sebastiaan Janssen
d491c133a7 Merge pull request #391 from danlister/patch-1 
Updated en.xml to fix some minor spelling mistakes
 2014-05-28 13:13:01 +02:00
Sebastiaan Janssen
b68dd6b35c U4-5006 Typo: "struture" in the Copy and Move dialogs 2014-05-28 13:12:10 +02:00
Sebastiaan Janssen
ba9d023cc0 Additional fix for U4-4950 U7.1.3 multiple media picker 2014-05-28 13:10:17 +02:00
Sebastiaan Janssen
eb6fe1e4d3 Fix unit test that was failing after moving from yepnope to LazyLoad.js 2014-05-28 13:06:23 +02:00
Stephan
c972ae566e Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 
Conflicts:
	src/Umbraco.Core/Dynamics/PropertyResult.cs
	src/Umbraco.Core/Models/IPublishedProperty.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
 2014-05-28 11:45:45 +02:00
Stephan
320b53ae3c U4-4773 - bring back IPublishedContentProperty Alias and Version (compat) 2014-05-28 11:36:31 +02:00
Sebastiaan Janssen
84f94d6471 U4-4752 No "change password" dialog available in 7.x backoffice 2014-05-28 11:17:33 +02:00
Morten Christensen
f758eb6a62 Extra open namespace for hackers 2014-05-28 10:54:52 +02:00
Shannon
7ec4d3f26d Fixes: U4-4950 U7.1.3 multiple media picker 2014-05-28 13:33:03 +10:00
Shannon
2a0d2bdb86 Fixes: U4-4945 Slider type stops working on ajax load in 7.1.3 2014-05-28 13:25:47 +10:00
Shannon
24d3e465ea Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 2014-05-28 12:42:43 +10:00
Shannon
d987dfb5a2 Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page 2014-05-28 12:40:43 +10:00
Shannon
2ede32fe70 minor change, using non obsolete user id 2014-05-28 12:39:12 +10:00
Shannon
fce8c9d3ec Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page 2014-05-28 12:38:11 +10:00
Shannon
f5194efb6e Fixes: U4-4999 Image cropper - Image file duplicated each time the page (content) is saved/published 2014-05-28 12:29:41 +10:00
Dan Lister
1b360226d6 Updated en.xml to fix some minor spelling mistakes 2014-05-27 12:01:41 +01:00
Sebastiaan Janssen
524d6fb76a U4-4914 Add icon for 'Import Document Type' action menu 2014-05-27 12:12:34 +02:00
Sebastiaan Janssen
7185a6dba5 Merge pull request #383 from imulus/colorpicker-toggle 
Allow colors to be toggled on/off in Color Picker - U4-4935
 2014-05-27 11:53:55 +02:00
Sebastiaan Janssen
2496a8e77e Merge branch '6.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.4 
Conflicts:
	src/Umbraco.Web/Models/PublishedContentBase.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
 2014-05-27 11:49:31 +02:00
Sebastiaan Janssen
13e8e972eb U4-4956 UserService.SavePassword method always throws a not supported exception 2014-05-27 11:43:50 +02:00
Stephan
d631039c0d U4-4928 - issue with missing media content properties 2014-05-26 18:07:20 +02:00
Stephan
b1e879bf68 U4-4928 - issue with missing media content properties 2014-05-26 15:59:28 +02:00
Stephan
95b9a46b88 U4-4928 - issue with missing media content properties 2014-05-26 15:02:05 +02:00
Shannon
766ca78725 Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 2014-05-23 10:00:34 +10:00
Shannon
3ca4fb76b2 Merge branch 'darrenferguson-7.1.2' into 7.1.4 2014-05-23 09:52:11 +10:00
Shannon
0a76757cea Merge branch '7.1.2' of https://github.com/darrenferguson/Umbraco-CMS into darrenferguson-7.1.2 2014-05-23 09:51:48 +10:00