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

6041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sebastiaan Janssen
ec4ccba1a7 Merge pull request #58 from abryukhov/patch-13 
tinyMCE internal language pack - RU
 2013-07-22 00:02:32 -07:00
Sebastiaan Janssen
0244492a89 Merge pull request #57 from abryukhov/patch-14 
tinyMCE internal language pack - RU
 2013-07-22 00:02:22 -07:00
Sebastiaan Janssen
546cf2c84d Merge pull request #56 from abryukhov/patch-15 
tinyMCE internal language pack - RU
 2013-07-22 00:02:14 -07:00
Sebastiaan Janssen
d354dde774 Merge pull request #55 from abryukhov/patch-16 
tinyMCE internal language pack - RU
 2013-07-22 00:02:03 -07:00
Sebastiaan Janssen
22c9e9acd9 Merge pull request #54 from abryukhov/patch-17 
tinyMCE internal language pack - RU
 2013-07-22 00:01:47 -07:00
Shannon
8b7bbed1b5 Implemented YSOD overlay when an unhandled server exception is thrown, this also ensures only when debug=true in the web.config which is injected into the server vars. 2013-07-22 15:18:10 +10:00
Alexander Bryukhov
5dd14723e9 tinyMCE internal language pack - RU 2013-07-22 10:29:12 +07:00
Alexander Bryukhov
7134e80c44 tinyMCE internal language pack - RU 2013-07-22 10:27:31 +07:00
Alexander Bryukhov
f7196ee8f9 tinyMCE internal language pack - RU 2013-07-22 10:26:47 +07:00
Alexander Bryukhov
fdecd697b7 tinyMCE internal language pack - RU 2013-07-22 10:26:04 +07:00
Alexander Bryukhov
6c03dac869 tinyMCE internal language pack - RU 2013-07-22 10:25:18 +07:00
Alexander Bryukhov
6cdb564a9f tinyMCE internal language pack - RU 2013-07-22 10:24:31 +07:00
Alexander Bryukhov
0da8a8db36 tinyMCE internal language pack - RU 2013-07-22 10:23:51 +07:00
Alexander Bryukhov
a4a9620889 tinyMCE internal language pack - RU 2013-07-22 10:22:46 +07:00
Alexander Bryukhov
2307424fb6 tinyMCE internal language pack - RU 2013-07-22 10:22:01 +07:00
Alexander Bryukhov
ca124fb662 tinyMCE internal language pack - RU 2013-07-22 10:21:16 +07:00
Alexander Bryukhov
6787252f9b tinyMCE internal language pack - RU 2013-07-22 10:20:36 +07:00
Alexander Bryukhov
ef3094f8d9 tinyMCE internal language pack - RU 2013-07-22 10:19:51 +07:00
Alexander Bryukhov
a2a20133aa tinyMCE internal language pack - RU 2013-07-22 10:18:38 +07:00
Alexander Bryukhov
bb750d186a tinyMCE internal language pack - RU 2013-07-22 10:17:56 +07:00
Alexander Bryukhov
f2a7dde5ce tinyMCE internal language pack - RU 2013-07-22 10:16:00 +07:00
Alexander Bryukhov
73e2559a13 tinyMCE internal language pack - RU 2013-07-22 10:14:48 +07:00
Shannon
80f8a9d01c Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-22 12:44:06 +10:00
Shannon
6f9883d373 Fixes MNTP required validation (U4-1975) 2013-07-22 12:30:12 +10:00