d58487fafc
Merge
2013-05-12 21:13:50 -10:00
ea9653fa83
patches fix for #U4-2214
2013-05-12 21:12:55 -10:00
8cca1b77b3
Merge with 4.11.9
2013-05-10 08:47:24 -02:00
53e4308c29
Fixes U4-2205 Log.GetLogItems(LogTypes, DateTime) fails with 'Conversion failed
...
when converting the nvarchar value 'Custom' to data type int'
2013-05-10 08:44:47 -02:00
6f26f7b57c
Patching from 6.1
2013-05-08 18:08:55 -10:00
bda2614290
Patching from 6.1
2013-05-08 17:49:48 -10:00
efc482511e
Patching from 6.1
2013-05-08 17:48:17 -10:00
40b90b8a58
Patching from 6.1
2013-05-08 17:45:53 -10:00
a009dfe2a1
Patching from 6.1
2013-05-08 17:39:03 -10:00
41e87fca98
Fixes macro tree syncing
2013-05-08 17:04:51 -10:00
f23c6c53cc
Fixes up created package tree sync.
2013-05-08 17:11:50 -10:00
0762decd92
Fixes up tree syncing for views, stylesheets and partial views. Now ensures we can actually
...
sync a tree for a file based node that doesn't have a static id. Also ensures that when we change a
Partial view name that we don't end up duplicating some files when we change it twice in the
same session.
2013-05-08 14:18:18 -10:00
0b58c1c03c
Patching from 6.1
2013-05-08 17:34:40 -10:00
38c6a21896
Patching from 6.1
2013-05-08 17:33:48 -10:00
15bff44ec1
Patching from 6.1
2013-05-08 17:24:00 -10:00
a626efa9b6
Merge with 4.11.9
2013-05-08 17:15:09 -10:00
54d2258634
added null checks into the uQuery .ToNameIds() methods
2013-05-08 16:29:29 -01:00
25be0621b2
Whoops, connection string doesn't contain the datalayer here
2013-05-08 13:14:02 -02:00
d5d00553b4
Fixed U4-2176 MySql Dashboard error for 4.11 as well
2013-05-08 08:09:13 -02:00
c52669fb05
Fixes: #U4-2094 - issue with duplicates in getting Descendants for media in mvc.
2013-05-07 18:56:24 -10:00
c4a071523e
Merge with 4.11.9
2013-05-06 15:12:10 -10:00
ca99319ead
Fixes: #U4-644 - DynamicNode and MVC don't output RTE values for media
2013-05-06 15:09:24 -10:00
aa36c66f39
Fixes U4-2176 6.0.5 Dashboard error
2013-05-06 12:27:15 -02:00
09e31d6595
Fixes U4-2179 Error with GetChildNodes after upgrade to Umbraco 6.0.5 from
...
Umbraco 6.0.0
2013-05-06 12:06:45 -02:00
f9fc2619fa
Fixes U4-2179 Error with GetChildNodes after upgrade to Umbraco 6.0.5 from
...
Umbraco 6.0.0
2013-05-06 12:06:45 -02:00
5d8cfa5efb
Merge
2013-05-06 11:06:54 -02:00
297f8e2a0b
Remove reference to v4 in text.
2013-05-06 11:06:28 -02:00
8ddfb5f6ad
Merge
2013-05-06 02:09:44 -10:00
9387544865
Fixes test outcome
2013-05-06 02:08:38 -10:00
66ddb21ef8
Fixes null check
2013-05-06 02:03:24 -10:00
9d19ed9463
Fix merge issues
2013-05-05 23:35:51 -10:00
df62697477
Merge with 4.11.9
2013-05-05 23:23:24 -10:00
f0cacf0d52
Fixed app_code assembly check.
2013-05-05 23:03:31 -10:00
d501fcb679
Fixes TypeFinder issue but retains the improved performance. Adds TypeHelper tests.
2013-05-05 22:57:41 -10:00
f5994d8442
Fixes up async methods in ContentTypeControlNew to ensure that the UmbracoContext is current since
...
the actions might run on different threads and therefore some event handlers might need access to the context.
2013-05-04 19:33:49 -10:00
4295cba915
Updated unit tests for TypeFinder - this shows the issue with the new refactored performance changes.
2013-05-04 18:12:02 -10:00
6d66fc6cb8
Remove extra space in name of http module in web.config
2013-05-03 07:24:28 -01:00
4484f83caa
Remove extra space in name of http module in web.config
2013-05-03 07:24:28 -01:00
0b6f05e630
Fixes: #U4-2172 - better single threaded supported for the database instance outside http context
2013-05-02 03:48:14 -10:00
c20c9c638f
Merge with 4.11.8
2013-05-01 13:04:06 -02:00
43b2a2185e
Fix unit test
2013-05-01 13:02:09 -02:00
2423bdd623
Merge with 4.11.8
2013-05-01 05:33:19 -02:00
bcb90d64a5
Fixes U4-1136 Class in MediaPickerDataType.cs wrongly named MemberPickerDataType
...
+ a bit of code cleanup
2013-05-01 05:32:29 -02:00
7d448d0959
Merge
2013-04-30 05:22:43 -02:00
53fe02db7e
And another update for WebPI...
2013-04-30 05:22:21 -02:00
a03dd7b11e
Merge with 4.11.8
2013-04-29 19:56:18 -10:00
6d994f48ac
merged in patch for TypeFinder changes
2013-04-29 19:55:44 -10:00
f0e8252e38
Merge with 4.11.8
2013-04-29 12:09:12 -10:00
ad06aded1b
Removed strange old legacy config section that never did anything
2013-04-29 12:08:36 -10:00
0ca52fcc60
Fix merge issues, update version number
2013-04-29 12:29:15 -02:00
Shannon Deminick