Commit Graph

449 Commits

Author SHA1 Message Date
Sebastiaan Janssen
c103f93004 Possible fix for U4-1452 Umbraco 6 beta / MySQL: Unable to find the requested
.Net Framework Data Provider.
2013-01-15 14:19:31 -01:00
Sebastiaan Janssen
a3338a5e22 Remove non-existing files from project.. 2013-01-14 16:56:19 -01:00
Sebastiaan Janssen
ac35d6ccbf Merge with 4.11.4 2013-01-14 14:14:58 -01:00
Sebastiaan Janssen
f7eb323bd5 Updated razor templates 2013-01-14 14:04:33 -01:00
Sebastiaan Janssen
d779422bf4 U4-1457 Missing File for "English (US)" Language Option 2013-01-14 09:08:23 -01:00
Shannon Deminick
98a171266e Fixes PhysicalFileSystem to use IOHelper instead of HostingEnvironment. Removes all references to new IFileSystem's that canont be supported currently, leaving only the media file system.
Updates all code to use PhysicalFileSystem in place of what 'could' eventually be an abstracted IFileSystem. Updates unit tests
accordingly.
2013-01-14 03:04:09 +03:00
Sebastiaan Janssen
c96891ad62 Merge with default 2013-01-12 17:33:41 -01:00
Sebastiaan Janssen
930e6a0989 Forgot some parenthesis .. 2013-01-12 17:29:48 -01:00
Sebastiaan Janssen
fc2d801a3a Merge 2013-01-12 16:32:19 -01:00
Sebastiaan Janssen
64c05cb50e Merge with 4.11.3 2013-01-12 14:52:14 -01:00
Sebastiaan Janssen
6a1fb52b25 Fixes U4-1442 This must be a bug. 4.11.2.2 can't create Macro. 2013-01-12 14:41:21 -01:00
Stephan
11ea698969 U4-1017 - more explicit error message on internal cache errors 2013-01-12 10:40:42 -01:00
Sebastiaan Janssen
c150a91e50 Update uGoLive & Fixes U4-1447 uGolive result: Unable to find node
/configuration/system.web/compilation/@debug in config file web.config
2013-01-14 08:43:50 -01:00
Stephan
2f482bdf53 U4-1017 - more explicit error message on internal cache errors 2013-01-12 10:40:42 -01:00
Sebastiaan Janssen
af0011f32a Fixes U4-1432 4.11.2 - Tinymce strips 'src' attribute from images 2013-01-11 08:23:31 -01:00
Sebastiaan Janssen
5e2a86bba7 Fixes U4-1432 4.11.2 - Tinymce strips 'src' attribute from images 2013-01-11 08:09:55 -01:00
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
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
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
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
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
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
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
Sebastiaan Janssen
4553fcedeb Remove comments/courier from dev dashboard config 2013-01-09 05:40:52 -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
937fc423ad Change word deprecated to obsolete 2013-01-08 13:27:16 -01:00
Sebastiaan Janssen
3f5e20ca0e Replaced a little bit too much in the compilation section 2013-01-07 15:19:53 -01:00
Sebastiaan Janssen
7d0fecb078 Update uGoLive to v1.3.0 (has better reporting of which folders have incorrect permissions) 2013-01-07 14:06:07 -01:00
Sebastiaan Janssen
a11a1a51c7 Set compilation debug=false explicitly for release version (for uGoLive) 2013-01-07 13:36:43 -01:00
Sebastiaan Janssen
759773deee Correct mistake in config transform 2013-01-07 08:55:43 -01:00
Sebastiaan Janssen
7e489af4c5 Fix an error during development where the razor version was ambiguous 2013-01-07 07:46:59 -01:00
Shannon Deminick
b5635d5b25 Finished: #U4-1303 - adds 'create macro' checkbox for the Partial View Macros tree. 2013-01-04 02:57:40 +03:00
Shannon Deminick
22c7f0d6cc Merge 2013-01-03 17:13:08 +03:00
Shannon Deminick
a6fa5508a8 Completes: #U4-1303 - UI integration for MVC views, partial views and partial view macros including ability to insert
macros in the view editor.
2013-01-03 17:11:59 +03:00
Sebastiaan Janssen
5994783644 Remove deleted images from the solution as well 2013-01-03 11:21:23 -01:00
Sebastiaan Janssen
35c16097af Changed all editor to use the HTML5 doctype to make CodeMirror work better 2013-01-03 07:20:04 -01:00
Shannon Deminick
872c163999 Updated EditMacro.js to support inserting different syntax depending on rendering engine. Just need to get it to insert the params for MVC now.
Added HttpRequestExtenions with a method GetItemAsString which obsoletes/supercedes the old 'umbraco.helper.Request' method.
2013-01-03 06:21:55 +03:00
Shannon Deminick
184b00b3fa Changed html doc type declaration back to transitional until we can properly test. 2013-01-03 02:01:43 +03:00
Sebastiaan Janssen
56bcb2f804 Remove version number from login / about page images and removed some old images 2013-01-02 09:02:13 -01:00
Sebastiaan Janssen
253d6b0387 Merge 2013-01-02 07:21:43 -01:00
Shannon Deminick
fdbf254e7a Changed over master pages to use Html5 DocType. Updated EditMacro to use correct JS classes and correct CSS instead of inline. Also updated
it to use knockoutjs for all UI handling and cleaned up a bit of the code (though it could still do with even more overhaul but at least its legible now).
Ensures that knockoutjs is included in all pages and dialog pages.
Now just need to update the EditMacro page to check for MVC vs Webforms to insert the correct macro syntax for MVC.
2013-01-02 07:20:01 +03:00
Shannon Deminick
a8f808f488 Converted EditMacro.aspx over to use the correct webforms inheritance. 2013-01-01 03:28:09 +03:00
Shannon Deminick
72898dc154 Updates RenderMacro syntax for inserting a macro in mvc views that have no params 2013-01-01 02:52:25 +03:00
Shannon Deminick
e88dce59fe Added create dialog to partial view macros files, now need to update that dialog to support creating
macros at the same time like with xslt, etc... but at least you can create/edit/delete them now.
2013-01-01 01:00:33 +03:00