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

7420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perploug
fac71dfd11 Merge killed the listview namespace 2013-10-09 15:12:43 +02:00
perploug
1e6b80e45e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
 2013-10-09 15:10:51 +02:00
perploug
31d3b88a5b dictionary tree icons 2013-10-09 15:07:17 +02:00
perploug
de14a6dad7 labels for localization support 2013-10-09 15:07:09 +02:00
perploug
e3102cf95b style updates 2013-10-09 15:06:36 +02:00
perploug
ce97350d76 listview bugfixes 2013-10-09 15:06:21 +02:00
perploug
a5b597e2f7 localized tree names 2013-10-09 15:05:52 +02:00
perploug
2b76d4b22d Adds publishById method to contentController 2013-10-09 15:05:27 +02:00
perploug
d7b732ba4b working clientside localization 2013-10-09 15:05:05 +02:00
perploug
2d3cf3da23 section mapper 2013-10-09 15:04:30 +02:00
perploug
2ff5b63089 RTE now works without a provided configuration 2013-10-09 15:04:05 +02:00
Shannon
530f88aa11 Changes how the property and tab validation is notified about validation changes - we use a new directive on the parent form to notify child changes, this is much better for performance so we don't have multiple $watches. This also fixes the tab validation since watching $invalid on a form for some reason isn't always accurate. 2013-10-09 23:16:09 +11:00
Shannon
c42e957c4c fixes unit tests 2013-10-09 20:36:12 +11:00
Shannon
659cba563a Changes property editor controller namespace to be PropertyEditors instead of just Editors 2013-10-09 20:02:39 +11:00
Shannon
d255b3a6a3 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-09 19:54:08 +11:00
Shannon
ba7713fb93 Auto selects all text in the header if it is still empty 2013-10-09 19:53:29 +11:00
Sebastiaan Janssen
d5498cc66e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-09 10:45:43 +02:00
Sebastiaan Janssen
a023ddb76b Fix json.net NuGet problem 2013-10-09 10:44:54 +02:00
Shannon
f7c49758e1 Fixes more of the umbcontentname directive - but we still have no design to show a validation message 2013-10-09 19:42:41 +11:00
Shannon
95a834b8b6 Started creating the member create dialog - but really we should just do this like content/media will save this revision since it was a nice form :) 2013-10-09 19:08:03 +11:00
Shannon
5d71e08922 Fixes manifest file again - just tested that the app loads even if a manifest is invalid 2013-10-09 18:22:27 +11:00
Shannon
e51b43084b Fixes: U4-2762 Handle errors in package.manifest & fixes manifest stylesheet parsing with unit test 2013-10-09 18:13:24 +11:00
Shannon
f299fe76e4 fixes localization with empty recycle bin menu 2013-10-09 17:35:16 +11:00
Shannon
128cceaf91 Fixes: U4-3045 Can't empty recycle bin with unit tests 2013-10-09 17:32:13 +11:00
Shannon
ccedd6757b removes cascade deletes for upgrade since we do not support these for install currently and we want to make sure they are the same... and i don' thave time to implement that. 2013-10-09 16:26:43 +11:00
Shannon
a94f61702f Changes plugin folder convention to use sub folder BackOffice instead of umbraco 2013-10-09 16:08:39 +11:00
Shannon
2b2cf48fdb Implements HideLabel for property editor value editors for both c# and manifest declarations. 2013-10-09 16:06:07 +11:00
Shannon
858135175e Completes: U4-2956 Update all services with correct public methods/properties 2013-10-09 15:21:01 +11:00
Shannon
de8b69a399 Creates public IApplicationTreeService and ISectionService interfaces, adds initialization methods 2013-10-09 14:31:30 +11:00
Shannon
1c13a896eb Fixes up merge issues. 2013-10-09 13:52:24 +11:00
Shannon
f8d6c85779 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Models/ContentBase.cs
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs
 2013-10-09 13:41:14 +11:00
Shannon
09b7186713 Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data - fixes merge issues and explicitly implements interface for entities that are not UmbracoEntity and hides other implementations from intellisense. 2013-10-09 13:32:58 +11:00
Shannon
c6389852ea Adds public ctors for ApplicationContext, ServiceContext, DatabaseContext, RepositoryFactory, makes IDatabaseFactory public, makes an interfaces for IEntityService, adds EnsureContext methods for ApplicationContext - to set the singleton. 2013-10-09 13:17:19 +11:00
Shannon
49f10ccd32 Fixes merge issue , fixes the ServiceContext lazy fields to be the underlying interfaces, adds public ctor 2013-10-09 12:18:42 +11:00
Shannon
a8b037f2e0 Fixes member type repository when member types don't have properties declared and adds tests. Adds IMemberTypeService. 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Services/ServiceContext.cs
 2013-10-09 12:09:28 +11:00
Shannon
3c38b335a6 Converts DlrScripting & xslt to the correct webforms structure. 2013-10-09 12:07:50 +11:00
Shannon
3a8bbcc8fc Fixes up the PartialView, PartialViewMacro and Xslt create dialogs after merge and ensures PartialView dialog is up to v7 legacy standard 2013-10-09 11:57:14 +11:00
Shannon
1ecb864e5f Fixed umbsections directive - do not make any requests until the user is logged in - if they are already logged in, the event still executes. 2013-10-09 11:29:41 +11:00
Shannon
d281f97659 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-09 11:12:33 +11:00
Shannon
38761e1413 started on member create dialog (wip!) 2013-10-09 11:01:43 +11:00
Sebastiaan Janssen
f85f418d52 We need Json.Net v5+ 2013-10-08 20:41:54 +02:00
Sebastiaan Janssen
0184b396be Whoops! Left a weird linebreak in there 2013-10-08 19:08:30 +02:00
Sebastiaan Janssen
8b2e2f8447 Create appSettings.config / connectionString.config if they don't exist yet 2013-10-08 19:00:57 +02:00
Sebastiaan Janssen
2fc8244f71 Fix NuGet package creation 2013-10-08 19:00:24 +02:00
perploug
7c5b6851a1 Added standard js libs to usercontrol proxy 2013-10-08 15:29:53 +02:00
perploug
a2ebb1b06f support for loading actions directly from search results 2013-10-08 15:04:47 +02:00
perploug
196ce492be Section menu overflow detection and extra tray 2013-10-08 13:18:42 +02:00
perploug
dfc3e468c4 fixes: U4-3046 rollback dialog 2013-10-08 11:07:42 +02:00
perploug
90ec849b5f adding tree states css 2013-10-08 10:35:13 +02:00
perploug
30f147a9d3 excluding appsettings and connectionstrings config 2013-10-08 10:27:22 +02:00