Commit Graph

7407 Commits

Author SHA1 Message Date
Shannon
d102db795e Adds better compatibility for the legacy data layer and the ToXMl method - using our new xml converter. 2013-10-08 11:22:08 +11:00
Shannon
6f2a7180d8 Adds new ConvertDbToXml converter on the PropertyValueConverter and simplifies the ToXml method for PropertyExtensions. 2013-10-08 11:08:36 +11:00
Shannon
6cec665f7d Renames the PropertyValueEditor converter methods to be inline with the new converter method names 2013-10-08 10:58:47 +11:00
Shannon
d0cd8ba346 Moves GetPath to EntityController and entityResource since all entities can have a path not just content. 2013-10-08 10:55:47 +11:00
Shannon
16bce4248d Fixes merge issues with 6.2 and copying across TempData properly. 2013-10-08 10:46:02 +11:00
Shannon
a2e9ec0412 Merge remote-tracking branch 'origin/6.1.6' into 6.2.0
Conflicts:
	src/Umbraco.Web/Mvc/UmbracoPageResult.cs
2013-10-08 10:37:46 +11:00
Shandem
11c9abf359 Merge pull request #145 from florisrobbemont/6.1.6
U4-3007 RouteDefinition should not store instance of controller
2013-10-07 16:31:50 -07:00
perploug
4b942dcc32 Working link picker and TinyMCE plugin 2013-10-07 15:15:02 +02:00
Sebastiaan Janssen
12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
perploug
ec4eeb5de6 tree syncing 2013-10-07 10:09:03 +02:00
perploug
f676ce6ac2 Remove missing file to unbreak build 2013-10-07 10:08:48 +02:00
perploug
aa0bb166a8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-07 10:08:28 +02:00
perploug
60a81ac879 Allows legacy editors to sync the tree 2013-10-07 09:48:08 +02:00
perploug
a9bc67538d Fixes: U4-3000 2013-10-07 09:39:25 +02:00
perploug
c0a7a9a427 adds section alias to framed urls 2013-10-07 09:33:29 +02:00
Sebastiaan Janssen
df909983db Update NuGet Core dependency to AutoMapper 3+ 2013-10-07 08:37:33 +02:00
Sebastiaan Janssen
1a9e5f20a8 U4-2511 Locallink:NODEID not working 2013-10-07 08:36:26 +02:00
Sebastiaan Janssen
a90f32035d U4-2733 call to umbraco.library:Request broken? 2013-10-07 08:18:44 +02:00
Sebastiaan Janssen
33b09c80aa Forgot to commit csproj file 2013-10-06 18:55:52 +02:00
Sebastiaan Janssen
b2980cedc6 Also apply to media types - U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:54:46 +02:00
Sebastiaan Janssen
34b7f86b8b U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:24:46 +02:00
Sebastiaan Janssen
130f6d3a42 Additions for U4-2776 Default Content For A Razor Layout Section 2013-10-06 17:52:46 +02:00
Sebastiaan Janssen
3ff9d6adbc U4-2509 Umbraco backend search not working correctly with spaces - Also updated search.aspx dialog 2013-10-06 16:55:54 +02:00
Sebastiaan Janssen
fd5de171c9 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-10-06 16:45:31 +02:00
Sebastiaan Janssen
45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
Floris Robbemont
b02657f32c Cleaning up commit for issue U4-3007
Changed documentation on UmbracoMvcHandler
2013-10-05 23:31:02 +02:00
Sebastiaan Janssen
9f3784aaed U4-1242 Template editor sometimes stops editing. 2013-10-05 19:26:01 +02:00
Sebastiaan Janssen
2ab2a5a9f3 Fix bug where Right ALT+S would save in Firefox instead of inserting the correct character 2013-10-05 19:23:57 +02:00
Sebastiaan Janssen
2d83ba06a5 Fix small styling issues in installer 2013-10-05 19:18:11 +02:00
Sebastiaan Janssen
06d5c60803 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-05 19:09:49 +02:00
Sebastiaan Janssen
fe18722e1f Merge pull request #147 from AndyButland/u4-2958
Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
2013-10-05 19:08:03 +02:00
perploug
5060dab7a5 adds getpath to contentController 2013-10-04 14:01:07 +02:00
perploug
c8fa22c767 Tree can now sync, only need to bridge it with the old legacy umbClient calls 2013-10-04 14:00:43 +02:00
perploug
418a29cbbf Odd, missing config files crashed the site 2013-10-04 11:18:57 +02:00
perploug
0b907d4ae3 more work on link picker, added dialog service and views 2013-10-04 10:53:07 +02:00
perploug
765ed9687a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-04 09:37:09 +02:00
perploug
66e7a6322a Start on link picker for RTE 2013-10-04 09:36:53 +02:00
Sebastiaan Janssen
b595ec4d88 Merge pull request #149 from bjawnie/patch-1
Made two minor corrections to the text
2013-10-04 00:25:59 -07:00
Shannon
7425e070d2 Got the SetTags and RemoveTags methods in place and working. 2013-10-04 17:13:57 +10:00
Shannon
3cb70f67c9 TagsRepository is all working with unit tests, now to make the service and integrate the extension methods. 2013-10-04 16:11:51 +10:00
Shannon
a029d98209 Adds db index to cmsTags over tag/group 2013-10-04 14:35:51 +10:00
Shannon
db6b8930ab Removes appsettings,connectionstring configs from the repo and adds them to the ignore list. 2013-10-04 12:18:05 +10:00
Shannon
4d8a3f4453 Updated the proj file to create the appSettings, connectionString config files if they are missing, then we also ignore these files and remove them from the repo - just like the web.config 2013-10-04 12:15:35 +10:00
Shannon
f1f5374b81 Fixed that damn upgrade checker to not throw exceptions 2013-10-04 11:05:19 +10:00
Shannon
961928105c Moves connectionStrings to external file, now to figure out how to deal with both of these files with multiple devs 2013-10-04 10:53:22 +10:00
Shannon
c6229f131a Moves appSettings to external file and updates the code that modifies the app settings. 2013-10-04 10:34:00 +10:00
Shannon
ff3aebd4b1 Completes: U4-2893 Remove the entire umbraco.macroRenderings assembly 2013-10-04 10:01:57 +10:00
Shannon
ad6e4ae745 Adds ability to use the c# property name as the pre-value field key, adds examples of declaring pre-value fields. 2013-10-04 09:22:07 +10:00
Shannon
b462082ed9 Fixes up some naming conventions and removes need to instantiate another umbraco helper 2013-10-04 09:00:02 +10:00
perploug
95f120e98f Unpublishing button on the content editor 2013-10-03 22:18:44 +02:00