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

7905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephan
c2e7fc2f10 PropertyValueConverter - add converters for built-in data types 2013-10-04 20:14:38 +02:00
Stephan
e31dd688bf Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2013-10-04 14:54:18 +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
perploug
a42bd4dbf0 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-03 20:59:04 +02:00
perploug
21d6209793 Removing unussed libraries, moving legacy tinymce plugins 2013-10-03 20:58:47 +02:00
perploug
9ee1584ede Initial PublishedContent service for niceUrl access 2013-10-03 20:58:16 +02:00
perploug
a3d77b7e72 Adds RTE and stylesheet services 2013-10-03 20:57:36 +02:00
perploug
14e1e741ed Added configuration fetching to tinymce service 2013-10-03 20:53:34 +02:00
perploug
94f72b3938 minor log.resource docs update 2013-10-03 20:53:16 +02:00
bjawnie
20ab14beb4 Made two minor corrections to the texts. 
"Content>alias" changed to "Alternativ link" from "Alias", so it makes more sense.

"defaultdialogs>treepicker" changed to "Vælg" from "Vælg punkt", so it fits in the button.
 2013-10-03 20:43:42 +02:00
Stephan
e14e5bee95 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
 2013-10-03 18:49:58 +02:00
Stephan
9e1364db42 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-10-03 18:48:42 +02:00
Stephan
1902bc4807 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-03 18:17:35 +02:00
Stephan
a264342bcc Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
 2013-10-03 18:16:29 +02:00
Stephan
08660704cc Core.StringExtensions - adjust to new default IShortStringHelper (see f64b8d6) 2013-10-03 18:10:51 +02:00
Stephan
4c13dbf8b7 Core.StringExtensions - fix methods that should be extension methods 2013-10-03 18:10:50 +02:00
Stephan
9a10863760 Core.EnumerableExtensions - bugfix f9663a9 2013-10-03 18:10:48 +02:00
Tim Geyssens
74e414d858 Related links prop editor WIP 2013-10-03 16:46:32 +02:00
Tim Geyssens
6a1072e918 Related links prop editor: more WIP 2013-10-03 15:09:52 +02:00
Tim Geyssens
fb1ea4b880 Related links prop editor: more work 2013-10-03 14:58:12 +02:00
Tim Geyssens
cbe566302c Related links prop editor: first attempt at UI 2013-10-03 14:20:13 +02:00
Tim Geyssens
4ace6e10db Related links prop editor: adds RelatedLinksPropertyEditor.cs 2013-10-03 13:27:13 +02:00
Tim Geyssens
bd32c7cc4a Related links prop editor: adds controller / view stubs 2013-10-03 13:05:13 +02:00
Shannon
25a0c595e7 Fixes up the DashboardController to use the new configuration classes, creates DashboardSecurity (which needs some unit testing) and removes all that ugly code. 2013-10-03 19:00:31 +10:00
Shannon
3d3be5ecbc Renames Control to DashboardControl so it has some meaning. 2013-10-03 17:59:23 +10:00