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

4039 Commits

Author SHA1 Message Date
Shannon
bf1f78e3aa Finished content and media model mapping using AutoMapper and now the tabs display composite properties correctly. 2013-07-25 16:08:18 +10:00
Shannon
4b8fed9f06 Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well. 2013-07-25 15:31:26 +10:00
Shannon
7d6736907f adds correct messaging for when publishing fails even after validation might fail 2013-07-24 14:59:49 +10:00
Shannon
500d25fd5a Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
 2013-07-24 13:10:43 +10:00
Shannon
ffff9efaa8 Fixes: U4-2535 The actions/publish.aspx page does not publish correctly and show the correct publish result 2013-07-24 13:06:25 +10:00
Shannon
7f4abb4893 Fixed editContent.aspx to let the business logic handle the property validation when trying to publish and show the correct status message result (if it was not publishable). Adds the invalid properties collection to the PublishStatus so those can be shown too. 2013-07-24 12:54:10 +10:00
Shannon
4d39ce1202 Fixes Allow At Root styling 2013-07-24 11:44:26 +10:00
Shannon
7164f23a98 Fixes up validation styling and the validation summary close button display. 2013-07-24 11:31:31 +10:00
Shannon
8b2d1b8eab Fixed Template model class to not have it's own NodePath property which was always null since it wasn't mapped (and there was no point in it). 2013-07-24 10:11:05 +10:00
Shannon
80394f08fb Fixed runtime cache provider issues & unit tests. 2013-07-24 09:36:01 +10:00
Sebastiaan Janssen
ca1fe5ff2a Unit test for: U4-2514 Checkboxlist prevalues in packages broken 2013-07-23 16:13:20 +02:00
Sebastiaan Janssen
a1037ce43c Fixes U4-2187 - Enable support for MySQL on Linux 2013-07-23 15:38:26 +02:00
Sebastiaan Janssen
2cd2f3741d Merge branch '6.1.2' of https://github.com/stevetemple/Umbraco-CMS into stevetemple-6.1.3 2013-07-23 15:20:28 +02:00
Sebastiaan Janssen
e634dba4ea 2nd attempt: U4-2514 Checkboxlist prevalues in packages broken 2013-07-23 13:16:18 +02:00
Shannon
5dc43e99fa Got media controllers working just like content, have tried to share as much code as possible between them. Can probably do a bit better but there's minimal code replication. 2013-07-23 18:55:31 +10:00
Shannon
e7ed08b260 Fixes auto fill props when multiple files. 2013-07-23 18:03:35 +10:00
Shannon
d1eb8fd9eb Obsoletes UmbracoFile with new UmbracoMediaFile in the Core assembly and wraps the legacy class to use the new one. Improves performance of UmbracoMediaFile by ensuring any IO is lazy loaded and then saved to a local property so it doesn't need to re-read the file for things like length/size. 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2013-07-23 17:59:44 +10:00
Shannon
4dbec9264f obsoletes all of the old "DataType" classes since they won't be used anymore. 2013-07-23 17:53:56 +10:00
Shannon
a1206b25b7 Adds media service events to fill in all of the image properties in the uploadField property editor... at least this logic isn't completely hacked into the FileHandlerData anymore! 2013-07-23 17:51:37 +10:00
Shannon
739a6c47a4 Obsoletes UmbracoFile with new UmbracoMediaFile in the Core assembly and wraps the legacy class to use the new one. Improves performance of UmbracoMediaFile by ensuring any IO is lazy loaded and then saved to a local property so it doesn't need to re-read the file for things like length/size. 2013-07-23 17:49:54 +10:00
Shannon
53891a69af Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want. 2013-07-23 16:43:08 +10:00
Shannon
5aeac564cb Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-23 14:01:55 +10:00
Shannon
dadb98176d starts fixing up upload prop editor to be the same as the 6.x < one so that it is 100% compatible 2013-07-23 14:01:41 +10:00
Shannon
2e91c89c02 Fixes null check for changes to RuntimeCacheProvider 2013-07-23 14:00:52 +10:00
Shannon
d9deae39ef fixed merge issue 2013-07-23 13:46:59 +10:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Shannon
d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Shannon
8be54ba0cc Fixes: U4-1970 v6 API - need to implement caching for templates since we're doing a db lookup on a front-end request. This is a temporary fix until we implement the ApplicationCache properly but it still works by utilizing the existing RuntimeCacheProvider singleton. I've tweaked this provider as well to ensure we use the HttpRuntime.Cache when it is available (during a web session). We don't want to have a seperate caching bucket so that IIS can manage cache memory properly. Have ensured that the template cache is cleared when templates are updated/removed. 2013-07-23 11:46:18 +10:00
Shannon
3da7682415 reverted change for U4-2514 as this change will cause other unwanted problems. Added logging for DefaultDataKeyValue instead of blindly swallowing an exception. 2013-07-23 10:50:48 +10:00
Sebastiaan Janssen
775892ff5a U4-2514 Checkboxlist prevalues in packages broken 2013-07-22 16:23:16 +02:00
Sebastiaan Janssen
f30b4c8184 Slight refactor of UmbracoFile 2013-07-22 13:55:10 +02:00
Sebastiaan Janssen
319ba5c791 U4-2524 If tinyMCEImageHelper.DoResize fails, the src gets removed from the img tag 2013-07-22 13:51:13 +02:00
Sebastiaan Janssen
398bc6d767 Fix merge issue 2013-07-22 12:15:54 +02:00
Sebastiaan Janssen
5d3ef8d97f Merge branch '6.1.3' of https://github.com/Myster/Umbraco-CMS into Myster-6.1.3 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2013-07-22 12:09:41 +02:00
Sebastiaan Janssen
08a300fbe5 U4-2370 Style sheet property sorting broken 2013-07-22 10:47:01 +02:00
Shannon
b565a3468b Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly. 2013-07-22 18:40:02 +10:00
Shannon
feb1892e9e Gets notification msgs on the server side to be displayed. Fixes property existence checking... was checking on id before but that is incorrect, needs to be on alias since a new property id is gen'd on each save and we're not re-wiring them back up. Fixes YSOD messaging for content as well. Changes the ModelState to modelState to be consistent in js. 2013-07-22 18:16:50 +10:00
Shannon
ae2ed17050 missing files. 2013-07-22 17:13:56 +10:00
Shannon
b9d0bca1b6 Fixed up validation messages when we are not redirecting, fixed up how we re-bind the content values to make sure we only set the values if they have been changed by the server and added unit tests for that. Added more properties to our display model including a new INotificationModel to put localized notifications in. 2013-07-22 17:13:38 +10:00
Sebastiaan Janssen
845770c4bb Merge pull request #69 from abryukhov/patch-2 
tinyMCE internal language pack - RU
 2013-07-22 00:05:22 -07:00
Sebastiaan Janssen
771dc10c85 Merge pull request #68 from abryukhov/patch-3 
tinyMCE internal language pack - RU
 2013-07-22 00:04:23 -07:00
Sebastiaan Janssen
2ac76202e5 Merge pull request #67 from abryukhov/patch-4 
tinyMCE internal language pack - RU
 2013-07-22 00:04:11 -07:00
Sebastiaan Janssen
a5ecbe96e2 Merge pull request #66 from abryukhov/patch-5 
tinyMCE internal language pack - RU
 2013-07-22 00:04:03 -07:00
Sebastiaan Janssen
7240b22e48 Merge pull request #65 from abryukhov/patch-6 
tinyMCE internal language pack - RU
 2013-07-22 00:03:51 -07:00
Sebastiaan Janssen
1f00589cb4 Merge pull request #64 from abryukhov/patch-7 
tinyMCE internal language pack - RU
 2013-07-22 00:03:33 -07:00
Sebastiaan Janssen
60b14487a9 Merge pull request #63 from abryukhov/patch-8 
tinyMCE internal language pack - RU
 2013-07-22 00:03:24 -07:00
Sebastiaan Janssen
33bc85a843 Merge pull request #62 from abryukhov/patch-9 
tinyMCE internal language pack - RU
 2013-07-22 00:03:14 -07:00
Sebastiaan Janssen
e6642674d4 Merge pull request #61 from abryukhov/patch-10 
tinyMCE internal language pack - RU
 2013-07-22 00:03:01 -07:00
Sebastiaan Janssen
8ad5fb3c44 Merge pull request #60 from abryukhov/patch-11 
tinyMCE internal language pack - RU
 2013-07-22 00:02:50 -07:00
Sebastiaan Janssen
1752d14c57 Merge pull request #59 from abryukhov/patch-12 
tinyMCE internal language pack - RU
 2013-07-22 00:02:40 -07:00