Commit Graph

5066 Commits

Author SHA1 Message Date
Sebastiaan Janssen 645637d550 Merge with 6.0.6 2013-05-13 13:48:34 -02:00
Sebastiaan Janssen 5cfe9e57ce Merge with 4.11.9 2013-05-13 13:47:01 -02:00
Sebastiaan Janssen 4863e657df Fixes U4-2226 Javascript error "tinyMCE is undefined" in IE - THANKS Adriano Buscema! 2013-05-13 13:42:57 -02:00
Shannon Deminick 7d1a18638b missing proj checking 2013-05-12 21:06:53 -10:00
Shannon Deminick 748e88c3e8 added web.config files to the root of xslt folders which will disable the ability for people
to publicly download other's xslt files .
2013-05-12 19:29:05 -10:00
Shannon Deminick cb8d080f1d Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed.
Added better support for MVC profiling by using the built in ProfilingViewEngine and ProfilingActionFilter.
2013-05-12 19:05:49 -10:00
Shannon Deminick 67b57dea50 Changes profiler over to use a resolver and uses an interface for it. Changes core over to use a
LogProfiler and the web project to use a web profiler (MiniProfiler). Fixes medium trust implementation,
adds performance check for binding to begin request, changes Web profiler over to be decoupled from the
umbraco application objects (binds to events by itself)
2013-05-12 15:25:46 -10:00
Sebastiaan Janssen a43e0eb5b8 Display version comment in installer steps ("beta 2" in this case) 2013-05-10 10:55:55 -02:00
NielsHartvig@UMBRACORATI.localdomain f04916c9a9 Adds MiniProfiler support 2013-05-10 10:15:30 -02:00
Shannon Deminick f69a017078 Merge with 6.0.6 2013-05-08 18:11:52 -10:00
Shannon Deminick 6f26f7b57c Patching from 6.1 2013-05-08 18:08:55 -10:00
Shannon Deminick bda2614290 Patching from 6.1 2013-05-08 17:49:48 -10:00
Shannon Deminick efc482511e Patching from 6.1 2013-05-08 17:48:17 -10:00
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 dd1983dc55 Fixes macro script editor and syncing, changes over editPython to use correct webforms file format. 2013-05-08 17:01:48 -10:00
Shannon Deminick 78cd51d333 Fixed xslt editing and syncing. 2013-05-08 16:33:09 -10:00
Shannon Deminick 28b6c5897f Fixes up script editor and tree syncing. 2013-05-08 16:13:18 -10:00
Shannon Deminick baed852767 Re-fixed up stylesheet editing and syncing, starting fixup for script editor/syncing 2013-05-08 15:15:56 -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
Shannon Deminick 1f87470f89 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 55750b534b Fixed the template editor to ensure that the tree syncs and updated much of it to use correct JavaScript, however
id didn't have time to update the whole thing.
2013-05-07 22:19:42 -10:00
Shannon Deminick a31cb3b1df Fixed stylesheet property tree syncing, updated the stylesheet property page to use
correct web forms structure.
2013-05-07 21:13:30 -10:00
Shannon Deminick fc44138d9e Fixes Stylesheet tree-syncing. Converts editStylesheets over to correct web forms structure and
implements the correct Javascript.
2013-05-07 20:49:58 -10:00
Shannon Deminick f808aac4cd Fixes: #U4-644 - DynamicNode and MVC don't output RTE values for media 2013-05-06 14:36:47 -10:00
Sebastiaan Janssen 004d9ab3e6 Merge with 6.0.6 2013-05-06 11:12:31 -02:00
Sebastiaan Janssen 297f8e2a0b Remove reference to v4 in text. 2013-05-06 11:06:28 -02:00
Sebastiaan Janssen d746ec6409 Merge with 6.0.6 2013-05-06 09:34:11 -02:00
Robert Stocks 6d66fc6cb8 Remove extra space in name of http module in web.config 2013-05-03 07:24:28 -01: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 cbf84566e2 updated casing in proj file to be correct for a couple elements. 2013-05-02 15:57:02 -10:00
Shannon Deminick 0586042535 Merge with 4.11.9 2013-05-02 05:03:07 -10:00
Shannon Deminick 3fd1c49da7 Merge with 6.0.5 2013-04-29 12:09:36 -10: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 be049f9093 Fix merge issue 2013-04-29 12:36:03 -02:00
Sebastiaan Janssen 64bbfb8cbc Merge with 6.0.5 2013-04-29 12:31:13 -02: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 6cffa67518 Fixes merge issues and WebSecurity with the correct encryption (from failed merge along time ago).
Fixes ContentType to ensure that ALL property type values get reset, not just ones assigned to a group.
Fixes logic in ContentTypeService to ensure that xml is re-generated when a property type alias is changed too.
2013-04-25 21:09:07 -10:00
Shannon Deminick d2a285c120 Merge with 6.0.5 2013-04-25 19:43:03 -10: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 4a619967bd Merge with 4.11.8 2013-04-25 13:34:19 -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