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

445 Commits

Author SHA1 Message Date
Shannon
de7294335f Adds nicer extensions for the Localize methods to not pass in a Culture and take the Culture from the current thread. Adds GUID Id display to the content/media/members editor 2015-05-13 17:33:59 +10:00
Shannon
19715ef45f Fixes build, updated BackgroundTaskRunner to get an ILogger injected 2015-04-09 17:12:52 +10:00
Shannon
a1c7352da1 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Integration/GetCultureTests.cs
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Tests/Models/ContentTypeTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/Mvc/SurfaceController.cs
 2015-04-09 16:50:07 +10:00
Stephan
22ac571c7d U4-6479 - fix GetCulture for unpublished content + add tests 2015-04-01 15:40:34 +02:00
Stephan
cd26a1ad21 U4-6479 - fix GetCulture for unpublished content + add tests 2015-04-01 12:59:01 +02:00
Shannon
d185f93c35 Fixes unit tests 2015-04-01 14:29:35 +11:00
Shannon
90b562a0a1 Update the PostLogin method to write the auth ticket the way that webapi is supposed to, not sure how this was actually working before because writing cookies directly with HttpContext and then also using WebApi normally doesn't work (maybe in very specific circumstances), so now the cookie writing is done consistently and it is working, prior to this i was getting lots of issues with the xsrf tokens. Updated some user model mappings for convenience and update naming conventions for some properties of the BackOfficeIdentityUser for consistency. 2015-04-01 13:42:07 +11:00
Shannon
d9cf9cee88 Includes nice social buttons, updates styling on login and user panel, updates logic to un-link accounts 2015-04-01 13:41:40 +11:00
Shannon
52c4d80cfc more identity awesome 2015-04-01 13:41:33 +11:00
Stephan
3b2ae6bc4a Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web/Models/ContentExtensions.cs
 2015-03-19 09:39:31 +01:00
Stephan
5ddcf42bc3 U4-3753 - keep some things internal 2015-03-19 09:37:39 +01:00
Shannon
d3eff734aa Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-19 17:37:00 +11:00
Helmuth Bederna
f742c0a958 fixed issue U4-6419 by removing that character 2015-03-18 10:41:15 +01:00
Stephan
3eb0dac48a U4-3753 - fix the build 2015-03-16 09:28:24 +01:00
Stephan
420c334af4 U4-3753 - refactor 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-12 15:03:46 +01:00
Stephan
20b21c86ea U4-3753 - add a way to get the rendering culture of a content 2015-03-12 15:02:18 +01:00
Stephan
b52f234c02 U4-3753 - refactor 2015-03-12 15:01:25 +01:00
Stephan
99598ec060 U4-3753 - add a way to get the rendering culture of a content 2015-03-05 10:47:02 +01:00
Shannon
428df7ae4a Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-02-17 15:11:10 +01:00
Shannon
15c36a63d3 Fixes: U4-6168 Custom Section is not showing correctly in 7.2 if custom tree is empty 2015-02-13 12:35:57 +11:00
Stephan
0c5acb7f32 Implement IContent.HasPublishedVersion 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
 2015-02-10 15:39:12 +01:00
Shannon
c3640f2a3d Merge branch 'dev-v7' into 7.3.0 2015-02-04 12:14:45 +11:00
Shannon
a7c134a375 fixes last failing test 2015-02-04 12:11:10 +11:00
Stephan
1d80fc66af Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-30 14:03:01 +01:00
Shannon
f037f8541c Fixes: U4-6210 ExtensionMethodFinder doesn't work with overloaded extensions - this means overloaded extension methods for dynamic content won't work. and finalizes: U4-6209 GetGridHtml needs to be an extension on HtmlHelper not IPublishedContent so that ViewData and ModelState are inherited 2015-01-30 19:04:39 +11:00
Shannon
b7f2152535 fixes a test, adds a null check 2015-01-30 10:18:19 +11:00
Shannon
19037ee1ba Ensures all stylesheet usages in RTE are working as expected 2015-01-15 12:40:09 +11:00
Shannon
8abf6fc2b5 Cleans up legacy stylesheet code to wrap the new APIs better, creates a new OriginalPath property on IFile to track if the path has changed, updates FileRepository to deal with path's changing and automatically deal with renaming files. Adds new methods to IFileService: GetStylesheetsAtPath. Fixes up the stylesheet and stylesheet property editors to use the file names, gets tree syncing working nicely for them both even with files or properties are renamed. Updates stylesheet editors and controllers to use the new APIs 2015-01-15 11:49:32 +11:00
Shannon
89b8fe93b7 Updes more code for U4-337 2015-01-06 15:36:14 +11:00
Shannon
46e939715a Merge branch 'dev-v7' into 7.3.0 2015-01-06 12:22:54 +11:00
Shannon
4de31249fd removes some usages of singletons 2015-01-05 10:01:58 +11:00
Shannon
fff1da2a12 Merge branch 'dev-v7' into 7.3.0 2015-01-02 16:25:52 +11:00
Shannon
73e9ff04e8 Fixes: U4-5943 Cannot render a macro on a virtual page when using UmbracoVirtualNodeRouteHandler and assigning virtual Ids 2015-01-02 15:34:51 +11:00
Shannon
2b25815eee Merge branch '7.2.0' into 7.3.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-12-01 12:22:19 +11:00
Shannon
6afd9b37a6 Merge branch '7.1.9' into 7.2.0 2014-11-26 15:29:18 +11:00
Shannon
bece953fa3 fixes a null check 2014-11-26 10:20:19 +11:00
Shannon
e2cc342adf Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. 2014-11-25 17:36:44 +11:00
Shannon
5af67facad Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. 2014-11-25 17:36:02 +11:00
Shannon
be9e4c9623 Merge branch '7.2.0' into 7.3.0 2014-11-25 17:07:35 +11:00
Shannon
ee040eb04f Merge branch 'umbukfest-U4-4731' of https://github.com/tompipe/Umbraco-CMS into tompipe-umbukfest-U4-4731 
Conflicts:
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2014-11-21 09:25:57 +11:00
Tom Pipe
8a214b5181 Correctly translate property label and description on ALL Tabs 
Fixes U4-4731
 2014-11-20 15:19:58 +00:00
Shannon
e558918432 Completes migrating the lang tree to the new format, a good starting place to convert the other ones even with having the legacy dialogs in place. 2014-11-20 17:54:30 +11:00
Stephan
e597886d0f Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 10:32:28 +01:00
Stephan
10e53de029 Safe compositions for 7.2 2014-11-18 10:29:46 +01:00
Shannon
1accc6275a Updates how the validation works in the member model mapper to use the native validation stuff instead of custom pre-values. 2014-11-18 14:32:51 +11:00
Robert Foster
ca951aa56b Fix for issue U4-5755 Issue: Multiple mixins with same tab cause content node edit crash 2014-11-08 01:13:17 +11:00
Shannon
cc8f07c0d8 Fixes: U4-5694 When searching in a picker, the filtering rules are ignored 2014-10-28 15:23:05 +10:00
per ploug
1de59f048b Fixed U4-5664 Change icon overlay on system list views 2014-10-27 14:29:01 +01:00
Shannon
fa2337f806 Fixes: U4-5649 Ensure NodeCount is on TagModel for TagQuery 2014-10-16 16:23:13 +10:00
Shannon
48d34af7bb Gets tree picker working better with searching and list views. 2014-10-13 17:27:22 +11:00