Stephan
44e567aa34
Prepare MB future
...
- implement manifest filters to tweak manifests after they have been parsed
- make IEditorValidator public
- stop relying on InternalsVisibleTo Umbraco.ModelsBuilder
2019-06-27 12:42:40 +02:00
Stephan
76d2421f0c
Restore some InternalsVisibleTo that we do need
2019-01-21 18:02:31 +01:00
Stephan
9522ee826f
Deal with fixme in Umbraco.Web
2019-01-21 16:01:37 +01:00
Stephan
f30171bcfd
Cleanup filenames
2018-07-31 13:35:12 +02:00
Shannon
d272dbf611
Merge branch 'dev-v7' into temp8
...
# Conflicts:
# build/NuSpecs/tools/Readme.txt
# src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs
# src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs
# src/Umbraco.Core/Packaging/Models/PackageAction.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
# src/Umbraco.Tests/Dependencies/NuGet.cs
# src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
# src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
# src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml
# src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml
# src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
# src/Umbraco.Tests/Services/PerformanceTests.cs
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
# src/Umbraco.Web.UI.Client/src/less/navs.less
# src/Umbraco.Web.UI.Client/src/less/tree.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI/Properties/Settings.Designer.cs
# src/Umbraco.Web.UI/Properties/Settings.settings
# src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
# src/Umbraco.Web.UI/config/feedProxy.Release.config
# src/Umbraco.Web.UI/config/feedProxy.config
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/de.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/es.xml
# src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/umbraco/config/lang/he.xml
# src/Umbraco.Web.UI/umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
# src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Install/InstallHelper.cs
# src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
# src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Properties/Settings.settings
# src/Umbraco.Web/Properties/Settings1.Designer.cs
# src/Umbraco.Web/Routing/PublishedContentRequest.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UI/LegacyDialogHandler.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
# src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
# src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
# src/Umbraco.Web/app.config
# src/Umbraco.Web/umbraco.presentation/item.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs
# src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs
# src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs
# src/umbraco.businesslogic/ApplicationTree.cs
# src/umbraco.businesslogic/BasePages/BasePage.cs
# src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
# src/umbraco.editorControls/uploadfield/uploadField.cs
2018-07-31 14:57:20 +10:00
Imran Haider
2660b31370
Updated our.umbraco.org to .com
2018-07-27 16:41:57 +01:00
Imran Haider
7baca85f6a
Update ourumbraco references to https
2018-07-27 16:08:38 +01:00
Stephan
7a615133ff
Renormalize
2018-06-29 19:52:40 +02:00
Stephan
38eae90640
Cleanup and get rid of warnings
2018-05-31 11:53:14 +02:00
Stephan
91396e561f
Deal with IDE1006
2018-05-30 10:00:17 +02:00
Stephan
cdd064ba08
Upgrade Dependencies
2018-04-03 14:54:01 +02:00
Stephan
0a4878d2a3
Port v7@2aa0dfb2c5 - WIP
2018-03-27 10:04:07 +02:00
Sebastiaan Jansssen
b76b09026b
Merge branch 'dev-v7' into dev-v7.8
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
# src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
# src/Umbraco.Web.UI.Client/src/controllers/search.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
# src/Umbraco.Web/Editors/TourController.cs
# src/Umbraco.Web/Models/BackOfficeTour.cs
# src/Umbraco.Web/Models/BackOfficeTourStep.cs
# src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
# src/Umbraco.Web/TourFilterResolver.cs
# src/Umbraco.Web/Trees/MacroTreeController.cs
# src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
# src/umbraco.cms/businesslogic/Packager/Installer.cs
# src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
2018-01-31 17:02:03 +01:00
Shannon
d33b617851
bumps version, checks for feature resolver
2018-01-15 20:40:40 +11:00
Shannon
5cb2dd0036
Makes the features internal
2018-01-05 15:19:16 +11:00
Stephan
42a046b80c
Cleanup AssemblyInfo
2017-07-27 11:18:41 +02:00
Stephan
c76403077f
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
Lars-Erik Aabech
f9252372ea
Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter") for more imperative exposure to custom unit test adapters.
2017-06-26 12:39:57 +02:00
Stephan
8561d85f7a
porting 7.6-rc1 into 8
2017-05-24 12:25:39 +02:00
Warren Buckley
f60ad15f70
Marks Forms access to internals in Umbraco.Web assembly - needed for [FileUploadCleanupFilter] in Forms
2017-03-21 15:42:30 +00:00
Claus
7fa8f04b11
deploy-257 Downgrade Core and Deploy to framework 4.5
2017-03-08 11:20:48 +01:00
Shannon
f04d70f2d9
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
2017-02-09 17:04:41 +11:00
Shannon
58c5618d30
Adds benchmarks for XML perf testing - had to make the init xml code static with out params to test but that's ok.
2017-02-09 16:42:59 +11:00
Shannon
72910cb35e
Updates everything to .Net 4.6.2, had to update the semver reference too - no breaking changes though
2017-02-07 00:22:34 +11:00
Shannon
038b155aea
Fixes constants and internalsvisibleto
2017-01-17 14:42:30 +11:00
Stephan
3a34e1fb90
Introduce Umbraco.Compat7
2016-09-19 16:33:48 +02: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
Shannon
4fa1ce42dc
WIP - moving tree and section service implementations to Web because they are web based and they need web based objects, there's no sense in coying all of the non-web objects to Core. Now we need to use IoC for the ServiceContext
2016-02-17 16:45:26 +01:00
Shannon
38a6f8c4a9
creates new EditorValidationResolver for external validators to work (internal for now), bumps version
2016-01-20 16:57:31 +01:00
Shannon
afe06ffb02
U4-5424 Upgrade to latest .Net framework version (4.6.1)
2015-12-21 19:23:13 +01:00
Lars-Erik Aabech
a14f0021bd
Can't log into youtrack. Simple changes to repositoryfactory and umbraco.web.ui assemblyinfo.
2015-12-16 09:50:17 +01:00
Shannon
087f0c0ede
updates internals visible for courier.
2015-08-10 13:09:48 +02:00
Shannon
1d0b5f3251
ensures courier has access to internals
2015-05-18 16:04:23 +10:00
Shannon
fbb46c9ffe
Allows Courier core to see internals
2015-05-14 14:42:53 +10:00
Shannon
f25463babe
Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
2014-06-17 19:05:22 +10:00
Shannon
b8575ef158
Started writing test implementation to mimic what developers might test in their controllers to expose the pitfalls of umbraco testing so we can make this simpler - identifying what needs to be public and how to re-strcuture some objects constructors, etc... to simplify and make this possible.
2014-06-17 18:53:23 +10:00
Shannon
c722e57914
Moves the our umbraco web reference to where it needs to be.
2013-11-01 09:21:29 +11:00
Shannon Deminick
8b841e19eb
Upgrades required projects to .Net 4.5
2013-05-26 13:33:43 -10:00
Shannon Deminick
eca01b845c
publicized some ObjectExtensions, added Umbraco.Belle to internals, updated the names in which plugin routes are created,
...
added HttpUrlHelper extensions for web api
2013-04-30 16:43:59 -10:00
Shannon Deminick
633d88c8c4
Changed DefaultServerMessenger to have an overridable method to send the request, added some internals visible to.
2013-03-25 20:54:21 +06:00
Shannon Deminick
3608242b25
Merge with 4.11.4
2013-02-01 06:22:28 +06:00
Shannon Deminick
a5bea7fc59
Added the ability to automate any c# scripts for an upgrade process. I realize this is superceded already in 6.0
...
but we need a way to do this in 4.x too especially for this release since we need to run a script to fix some db
issues. I've added a framework using an UpgradeScriptManager and another install step + unit tests for some of the
UpgradeScriptManager methods.
2013-01-31 04:26:37 +06:00
Shannon Deminick
97556de447
Changed methods created yesterday to internal so we can port to 6+ nicely.
2013-01-30 18:58:42 +06:00
Morten Christensen
00e316b5bd
Minor update to AssemblyInfo
2013-01-21 15:27:22 -01:00
Shannon Deminick
b292cb3ab3
Crated InsertMacroSplitButton webforms control instead of the hacky js code used to insert the split button in the template editor.
...
Have implemented it now in the EditView (will transition over its use in editTemplate soon but is low priority).
Have got the js callbacks working now for inserting a macro for the mvc editor but need to implement the correct syntax. Also need
to migrate and update the editMacro dialog screen to check if we are rendering for MVC or not and if it is MVC then use the correct
syntax.
2012-12-31 18:39:36 +03:00
Morten Christensen
78b05eb44c
Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies
2012-11-26 07:46:29 -01:00
Shannon Deminick
d83887e314
Ported updates to DynamicDocument to allow dynamic access to RTE content and still have it
...
render all embedded macro content without resorting to use some other mechanism.
Fixes the .Field method of the UmbracoHelper.
2012-09-08 11:30:19 +07:00
shannon@ShandemVaio
32bef227b7
Added App_Code assembly loading to new type finder, had to recompile log4net to support medium trust.
...
Updated TypeFinder and assembly info to support medium trust.
2012-08-04 06:07:29 +06:00
shannon@ShandemVaio
e55e688dc7
Added unit test for ContentStore, added object extensions and supporting classes from v5,
...
added RhinoMocks to the test project and httpcontext factory from v5 unit tests to be used
in our v4 ones.
2012-07-31 00:02:27 +06:00
shannon@ShandemVaio
9679d0f6df
Renamed umbraco.presentation to Umbraco.Web and changed the folder it resides in.
...
Started removal of files/folder from Umbraco.Web that belong in Umbraco.Web.UI.
2012-07-18 23:54:20 +06:00