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

458 Commits

Author SHA1 Message Date
Shannon
ffd63a9103 fixes merge issues 2017-05-16 15:51:30 +10:00
Shannon
bb436426a4 Merge remote-tracking branch 'origin/temp-U4-9776' into temp-U4-8632 
# Conflicts:
#	src/Umbraco.Web.UI/config/trees.config
 2017-05-16 15:19:45 +10:00
Shannon
d2d6b6654a Adds models and methods for the UserController 2017-05-11 13:11:41 +10:00
Shannon
24e2547656 Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b 
# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-05-04 18:29:43 +10:00
Shannon
1bfb63fe86 Adds validation for file names 2017-03-21 18:35:13 +11:00
Per Ploug
d3582e2296 An ID is required on all items edited in backoffice editors 
The ID is required when an item is saved, as the routing will
automatically redirect based on this ID - files, does not have an ID -
so the filepath is used in the same as it is used for the tree
 2017-02-22 15:47:36 +00:00
Shannon
6ae06ad2e0 Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9470 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
 2017-02-15 17:41:12 +11:00
Shannon
8387c435d4 Gets mini list view working so that only nodes with children show the arrow, added GetPagedChildren to EntityController 2017-02-15 17:40:10 +11:00
Shannon
e612bcae58 Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310 2017-02-10 10:04:58 +11:00
Shannon
a20cc60c10 Updates new UDI pickers that have start nodes for pre-values to also store UDIs for their prevalues, this has a knock on effect in that we need to be able to inject some server side config for pre-value editors (otherwise we'd have to make diff udi prevalue editors but that isn't very re-usable), so have implemented that and then updated all of the logic to deal with the udi idType. 2017-02-08 16:15:27 +11:00
Shannon
179523224a Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 2017-02-07 12:15:54 +11:00
Emil Wangaa
c21837e906 Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-9429 
# Conflicts:
#	src/Umbraco.Web/Editors/CodeFileController.cs
 2017-02-02 10:24:42 +01:00
Per Ploug
90448f1c78 Added comments and made helper internal 2017-01-31 11:06:14 +01:00
Emil Wangaa
431f91b900 Adds an api endpoint for getting the available snippets in the Umbraco folder 2017-01-30 14:57:08 +01:00
Per Ploug
b05c4711ce Fixes tree syncing issues 2017-01-30 13:33:05 +01:00
Shannon
0078a5d8cc Getting the media picker wired up for udi 2017-01-30 16:54:01 +11:00
Shannon
9ef53536bf Updates the base editor models to include a readonly UDI, updates all model mappers to map the UDI, 2017-01-28 01:14:24 +11:00
Mads Rasmussen
ab00ba8a12 Merge branch 'dev-v7.6' into temp-U4-9352 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-27 10:39:31 +01:00
Sebastiaan Janssen
0a2e5badd0 Merge branch 'temp-template-editor' into dev-v7.6 2017-01-26 18:27:10 +01:00
Niels Hartvig
ace111aefb Adding support for get, save and rename to new Partial View editor 2017-01-16 16:50:22 +01:00
Niels Hartvig
e7f7631d1e Fixes merge conflicts (needs updated ng-if in insert overlay) 2017-01-13 13:22:43 +01:00
Per Ploug
9b9db23461 Replaces the last static strings with language keys 2017-01-13 13:20:38 +01:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Shannon
8a11b0f7a8 publisizes a constant (moves it to where it should be), publicizes another required class for deploy, bumps version 2017-01-12 17:33:30 +11:00
Niels Hartvig
5a2687d520 Merge of temp-template-editor 2017-01-10 14:47:33 +01:00
Mads Rasmussen
82ab7c4a01 Merge branch 'temp-template-editor' into temp-U4-9324 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-10 11:52:03 +01:00
Shannon
77d47f0b28 fixes error with server side validation + data tyep editor, ensures template controller and data type controller inherit from BackOfficeNotificationsController, ensures BackOfficeNotificationsController is attributed with PrefixlessBodyModelValidator 2017-01-10 12:29:30 +11:00
Niels Hartvig
4c330c8654 Implements CodeFileController 2017-01-09 22:54:28 +01:00
Warren Buckley
5b88c57d94 Replace RequiredForPersistance with Required 2017-01-09 13:05:20 +00:00
Warren Buckley
1300764770 Adding in server side validation - but need to clarify that this is the 'right' way to do it that wires up correctly/magically back to the UI components 2017-01-04 14:12:45 +00:00
Mads Rasmussen
f6d8a980a6 Merge branch 'dev-v7' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-11-14 11:04:15 +01:00
Stephan
b26b415096 Merge origin/dev-v7-deploy into dev-v8-zbwip (builds) 2016-11-03 10:31:44 +01:00
AndyButland
b1800305b8 Removed user types and migrated them to groups. Returned to compiling state. 2016-10-28 09:20:52 +02:00
Claus
2279e6cc53 U4-8834 Removing code assigning PropertyData IDs for new properties even though it isn't used 2016-08-09 13:39:40 +02:00
Shannon
9ad84a7eab fixes repository mapping the GUID id for redirect urls and removes unused properties 2016-08-08 14:47:48 +02:00
Shannon
c331ba134a Fixes 301 redirect js naming conventions, fixes URL handling, moves c# classes to the correct/constistent namespaces, fixes up models and N+1 requests, adds model mapping to not return the business logic model, adds controller method to check if it's enabled instead of returning the result as part of the search. 2016-08-08 14:40:53 +02:00
Shannon
2c15db5950 U4-8530 Make it possbile to hide preview button by DocumentType or ContentItem 2016-08-04 18:34:20 +02:00
Shannon
a91b8e0acf Merge branch 'U4-8530' of https://github.com/Phosworks/Umbraco-CMS into Phosworks-U4-8530 2016-08-04 18:08:27 +02:00
Marc Goodson
379661e302 Fixes U4-8772, adds HasPublishedVersion property to mapping of IContent to ContentItemBasic, then adds existing 'has-unpublished-version' css class to list view row if item is published but has unpublished changes 2016-07-25 09:17:27 +01:00
Stephan
3c7245f9ba Merge origin/dev-v7 into dev-v8 2016-07-08 16:32:06 +02:00
Shannon
a67020ec31 Ensures that the package Icon is displayed for installed packages. Cleans up lots of try/catch/swallows in the packaging logic, adds better xml error handling (we really need a lot more though), ensures that if any part of the package installation fails, that angular bails and doesn't keep trying to install - same logic for installing forms. 2016-06-28 20:14:12 +02:00
Wincent
944898d6e5 http://issues.umbraco.org/issue/U4-8530 
Adds Preview property to ContentItemDisplay
 2016-06-21 14:18:55 +02:00
Shannon
3d2fe3c9da Install/uninstall working - just need a few ui updates and then get the repo install working 2016-06-13 20:10:31 +02:00
Shannon
2d9010caf4 I can haz package uninstallation 2016-06-13 19:43:04 +02:00
Shannon
c2b016d7d0 Gets local package installation 'working', now needs a little UI work. 2016-06-13 18:28:56 +02:00
Per Ploug
2368ea7cf8 Serverside template services 2016-06-12 18:49:05 +02:00
Shannon
1d8e0eb280 Merge branch 'u4-8192' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8192 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2016-05-19 18:16:47 +02:00
Shannon
d37d31246e Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Tests/Persistence/SyntaxProvider/MySqlSyntaxProviderTests.cs
	src/Umbraco.Web.UI/umbraco/create/content.ascx
	src/Umbraco.Web.UI/umbraco/create/member.ascx
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2016-03-16 15:02:53 +01:00
Shannon
d5fe8c11c8 U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value 2016-03-15 15:08:53 +01:00
Shannon
f6f54fd057 Merge branch 'master-v7' into dev-v8 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/Services/ContentTypeService.cs
	src/Umbraco.Core/Services/FileService.cs
	src/Umbraco.Core/Services/LocalizationService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
	src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
	src/Umbraco.Web/Services/ApplicationTreeService.cs
	src/Umbraco.Web/Services/SectionService.cs
	src/Umbraco.Web/Trees/MemberTreeController.cs
	src/Umbraco.Web/UI/Pages/ClientTools.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/api.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
	src/umbraco.businesslogic/BasePages/ClientTools.cs
	src/umbraco.businesslogic/UmbracoSettings.cs
	src/umbraco.cms/businesslogic/CMSNode.cs
	src/umbraco.cms/businesslogic/Content.cs
	src/umbraco.cms/businesslogic/cache/Cache.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
	src/umbraco.cms/businesslogic/propertytype/propertytype.cs
	src/umbraco.cms/businesslogic/web/Document.cs
	src/umbraco.cms/helpers/DeepLink.cs
	src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
 2016-03-10 19:20:15 +01:00