Commit Graph

584 Commits

Author SHA1 Message Date
Shannon Deminick
40b90b8a58 Patching from 6.1 2013-05-08 17:45:53 -10:00
Shannon Deminick
a009dfe2a1 Patching from 6.1 2013-05-08 17:39:03 -10:00
Shannon Deminick
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
Shannon Deminick
0b58c1c03c Patching from 6.1 2013-05-08 17:34:40 -10:00
Shannon Deminick
38c6a21896 Patching from 6.1 2013-05-08 17:33:48 -10:00
Shannon Deminick
15bff44ec1 Patching from 6.1 2013-05-08 17:24:00 -10:00
Sebastiaan Janssen
297f8e2a0b Remove reference to v4 in text. 2013-05-06 11:06:28 -02:00
Robert Stocks
4484f83caa Remove extra space in name of http module in web.config 2013-05-03 07:24:28 -01:00
Shannon Deminick
f0e8252e38 Merge with 4.11.8 2013-04-29 12:09:12 -10:00
Shannon Deminick
ad06aded1b Removed strange old legacy config section that never did anything 2013-04-29 12:08:36 -10:00
Sebastiaan Janssen
0ca52fcc60 Fix merge issues, update version number 2013-04-29 12:29:15 -02:00
Sebastiaan Janssen
c53342ba4c Merge with 4.11.8 2013-04-29 12:13:00 -02:00
Sebastiaan Janssen
25ce7baa7d Removing the umbraco.webservices project 2013-04-29 10:36:11 -02:00
Shannon Deminick
7fc4822bbe Fixes merge issues. Fixes Fixes for cmsContentXml table since the Content type heirarchy tables are different in v6. 2013-04-25 19:26:06 -10:00
Shannon Deminick
d65bee76b2 Merge with 4.11.8 2013-04-25 14:15:09 -10:00
Shannon Deminick
385d6396b0 disables auto-complete on the login page. 2013-04-25 13:28:47 -10:00
Shannon Deminick
46858af1ed Ensures user cookie is encrypted, removes ASP.Net headers from being returned in our response. Ensures
that our auth cookie is httponly.
2013-04-25 13:25:25 -10:00
Sebastiaan Janssen
ab37f9ae35 Closing 6.0.4 2013-04-25 11:16:29 -02:00
Shannon Deminick
4bfb8569c8 Fixed up merge issues 2013-04-23 21:37:03 -10:00
Shannon Deminick
df9a887032 Merge with 4.11.7 2013-04-23 20:50:30 -10:00
Shannon Deminick
8416764a83 removed the trace from the page 2013-04-23 20:01:26 -10:00
Shannon Deminick
2d3eb8c208 Working on #U4-493, updated ContentTypeControlNew and EditNodeTypeNew to use correct webforms class structures.
Changed the saving logic in ContentTypeControlNew to use the page's async execution and changed the page to support async.
Changed the page's async timeout to be 5 minutes.
2013-04-23 20:00:48 -10:00
Morten Christensen
c573459626 Fixing nuget related issue #U4-2067 and updating version 2013-04-22 06:01:31 -02:00
Shannon Deminick
034aa6d8f9 Fixes merge issue 2013-04-20 03:58:15 +06:00
Shannon Deminick
1484fba1ad Merge with 4.11.7 2013-04-20 03:51:22 +06:00
Shannon Deminick
82fc1a5304 updated proj file 2013-04-20 03:47:57 +06:00
Shannon Deminick
f0aab6ae81 Fixes: U4-2089 - sort dialog behavior when clicking on column headers. Updated to latest version of table sorting, had to create a custom sort parser
upgraded the sort.aspx to have the proper code behind structure and updated the page to have proper css and js files instead of inline. Fixes missing images.
2013-04-20 03:42:47 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
6c9e82e735 fixed typo 2013-04-19 04:31:55 +06:00
Shannon Deminick
c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick
e9c4a031c9 Fixes up directory browser and removes legacy request params which are prone to xss 2013-04-19 04:10:35 +06:00
Shannon Deminick
12b1168de9 Fixes merge issues 2013-04-12 02:59:03 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Shannon Deminick
25b9262cf1 Merge with 4.11.7 2013-04-10 03:51:53 +06:00
Shannon Deminick
436322f58c updates #U4-2070 for directoryBrowser.aspx 2013-04-10 02:34:44 +06:00
Shannon Deminick
30be665a40 Merge with 4.11.7 2013-04-09 07:41:55 +06:00
Shannon Deminick
29bf61b1f2 Starts on #U4-2078, mostly just some initial code cleanup 2013-04-09 06:07:25 +06:00
Shannon Deminick
3d51dd767b Fixed merge issues. 2013-04-06 00:27:44 +06:00
Shannon Deminick
e22988e435 Merged with 4.11.7 2013-04-06 00:21:06 +06:00
Shannon Deminick
bf3fa20a53 Cleaned up the code fro rsd and wlwmanifest and ensures wlwmanifest actually returns the results in xml format. 2013-04-06 00:04:23 +06:00
Shannon Deminick
1bd20c9b06 Fixes: #U4-2059 and removes un-needed ping.aspx files, cleans up some code 2013-04-05 23:28:43 +06:00
Shannon Deminick
165d9c7dff Fixed nonodes to now show version information and updated it so that it redirects to root if there
is actually content so the page is actually not accessible unless you actually have no nodes.
2013-04-05 21:58:13 +06:00
Shannon Deminick
7edbc34e6c Merge with 4.11.7 2013-04-05 06:46:13 +06:00
Shannon Deminick
60b6608289 patch for fix #U4-2027 2013-04-05 06:42:52 +06:00
Sebastiaan Janssen
bea50f4562 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:50:27 -02:00
Sebastiaan Janssen
ff337457f8 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:31:03 -02:00
Shannon Deminick
13e555f50b Fixed merge issue based on overlap with class + namespace name. 2013-03-29 23:52:40 +06:00
Shannon Deminick
48c809a797 Merge with 4.11.7 2013-03-29 23:22:18 +06:00
Shannon Deminick
55c7f72d8e Converts create.aspx to have the correct webforms file/class structure, fixed logging for userTask,
fixed issue with last regex fix for xss
2013-03-29 23:14:42 +06:00