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

3621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
ac608f7b3e Keep umbracoDbDSN in the appSettings in the released version to prevent people 
from deleting it during merge.. it will delete itself after install anyway
 2013-01-10 12:05:03 -01:00
Morten Christensen
9974e9b312 Possible fix for U4-1372 2013-01-10 11:50:47 -01:00
Morten Christensen
8c6292fda4 Merge 2013-01-10 11:47:36 -01:00
Morten Christensen
e3a8aa8345 Possible fix for U4-1420 2013-01-10 11:47:04 -01:00
Morten Christensen
24814da78d Possible fix for U4-1420 2013-01-10 11:46:26 -01:00
Sebastiaan Janssen
c3132dab4d Merge 2013-01-10 11:29:07 -01:00
Sebastiaan Janssen
a1cc58408f Include the new translation files in the project so they get in the build too 2013-01-10 11:22:42 -01:00
Sebastiaan Janssen
c4e6da52d3 Merge with default 2013-01-10 11:13:40 -01:00
Sebastiaan Janssen
ab6c5ac21a Added tag Release-4.11.2 for changeset 73711b806a40 2013-01-10 11:05:52 -01:00
Sebastiaan Janssen
227a38fb98 Removed tag 4.11.2 2013-01-10 11:05:43 -01:00
Sebastiaan Janssen
06f9dee649 Added tag 4.11.2 for changeset 73711b806a40 2013-01-10 11:05:34 -01:00
Sebastiaan Janssen
75680192bb Merge 4.11.2 into default 2013-01-10 11:05:13 -01:00
Sebastiaan Janssen
a53efb394f Closing 4.11.2 branch 2013-01-10 10:54:56 -01:00
Sebastiaan Janssen
98ed32c8cf Include the new translation files in the project so they get in the build too 2013-01-10 09:55:35 -01:00
Morten Christensen
8694253442 Merge 2013-01-10 08:28:46 -01:00
Morten Christensen
6d62bae0fa Fixes U4-1400 so rollback works. 2013-01-10 08:27:57 -01:00
Sebastiaan Janssen
df10ebebca Get latest translations in 2013-01-10 08:21:27 -01:00
Sebastiaan Janssen
46b1501ef5 Get latest translations in 2013-01-10 08:20:05 -01:00
Sebastiaan Janssen
04d85573fa Merge with 4.11.2 2013-01-10 07:44:28 -01:00
Sebastiaan Janssen
88dc73cd66 Fix the unpublished/pendinchanges/published display 2013-01-10 07:29:04 -01:00
Shannon Deminick
0c00f1e3b1 Fixes: #U4-1414 - split buttons not working in template editor 2013-01-10 06:18:12 +03:00
Shannon Deminick
8ed1d76bc7 cleans up a bit of code relating to U4-1412 2013-01-10 05:55:55 +03:00
Shannon Deminick
08859c3b32 Fixes: #U4-1412 - inserting macro with zero params causes JS error. 2013-01-10 05:48:03 +03:00
Shannon Deminick
89332bf3f5 updated all editors using the new html 5 doc type to declare the content area below the ASP.Net page declarations 
(I didn't even know asp.net allowed having controls listed above)
 2013-01-10 05:08:52 +03:00
Shannon Deminick
b8f455e50b Removed PluginManagerExtensions for finding IMigrations since we are manually initializing the resolver instead of type finding. Updated 
unit tests to use resolvers and are passing.
 2013-01-10 04:49:12 +03:00
Shannon Deminick
4532c1b5b9 Updated IMigrations to use the proper plugin format using resolvers, updated unit tests and are passing. 2013-01-10 04:33:30 +03:00
Shannon Deminick
c83db77980 Merge 2013-01-10 04:01:44 +03:00
Shannon Deminick
51c1c5c717 added more HttpRequestExtensions, cleaned up some code in legacyAjaxCalls, adds UmbracoRequestId to UmbracoContext 
(for future use)
 2013-01-10 03:59:11 +03:00
Morten Christensen
9c792a7a5e Fixes U4-1423 so PropertyTypes not in a group are also included in the list of a Content/MediaTypes PropertyTypes. 2013-01-09 18:48:44 -01:00
Sebastiaan Janssen
cd0919aeeb Update version to 4.11.2 2013-01-09 16:03:56 -01:00
Morten Christensen
dc158fee2e Fixes U4-1393 so Tabs shows as expected on both Content- and MediaTypes. 
Corrected malformed query for PropertyGroups.
 2013-01-09 14:37:54 -01:00
Sebastiaan Janssen
ce6711b587 Duplicate fix (ce2f47c11322) #U4-1366 - conflict with partial view macro engine. 2013-01-09 13:58:55 -01:00
Morten Christensen
03e7a5a80b A bit of tidy up related to the content typoe trees. 
The PropertyFactory contained an issue for MediaTypes similar to the one that existed for ContentTypes.
 2013-01-09 13:29:32 -01:00
Morten Christensen
0c7473717c Fixes U4-1386 structure problem where the same DocType would show up multiple times. 
Re-wired the tree to use the new api as its simply used for loading availab doc types.
 2013-01-09 12:32:40 -01:00
Morten Christensen
4f455c5532 Merge 2013-01-09 11:45:31 -01:00
Morten Christensen
db971bb0b9 Fixes U4-1418 caused by a size issue in PetaPoco when inserting a string larger then 4000 characters. 2013-01-09 11:44:30 -01:00
Sebastiaan Janssen
8a5e61bb26 Check if the _dataHelperTypeName is null 2013-01-09 10:43:12 -01:00
Morten Christensen
87017d75be Adding sorting to other usages of PetaPoco relators. 
Fixing Mapper test after having renamed a few properties yesterday.
 2013-01-09 10:11:23 -01:00
Morten Christensen
ad2a82cc65 Possible fix for U4-1407 and related to the install problems for uBlogsy. 
Ensures that PropertyGroups are sorted so they are properly mapped.
 2013-01-09 09:57:01 -01:00
Morten Christensen
b7ff6ae375 Merge 2013-01-09 07:31:36 -01:00
Morten Christensen
65dd21fafc Test and possible fix for U4-1392 2013-01-09 07:30:57 -01:00
Sebastiaan Janssen
b8d5d67abd Additional fix for U4-1394 - DocumentType "Allowed Templates" will not update 2013-01-09 05:51:01 -01:00
Sebastiaan Janssen
4553fcedeb Remove comments/courier from dev dashboard config 2013-01-09 05:40:52 -01:00
Sebastiaan Janssen
e0ba903974 Revert ordering of schema creation it only worked once by fluke and killed sqlce 2013-01-09 05:18:10 -01:00
Sebastiaan Janssen
d6121ebab2 Connectionstrings section used to be after mailsettings, makes merges easier 
for people who are upgrading
 2013-01-09 05:15:28 -01:00
Sebastiaan Janssen
1b5970b446 D'oh! Forgot to seperate out the connectionstring 2013-01-09 05:08:05 -01:00
Sebastiaan Janssen
daf5fb5dcf Fixes U4-1415 v6 Installing on MySQL gives error 2013-01-08 17:52:03 -01:00
Sebastiaan Janssen
c9ba61e103 Merge 2013-01-08 16:47:30 -01:00
Sebastiaan Janssen
a24d202efe Make sure MySql gets loaded with old AND new connectionstring 2013-01-08 16:46:56 -01:00
Stephan
03b1b34be7 U4-1411 - fix post-4.9 regression in NotFoundHandler url 2013-01-08 16:41:31 -01:00