Commit Graph

199 Commits

Author SHA1 Message Date
Bjarke Berg
9ce475afa5 Do not reference System.Configuration.ConfigurationManager just because of an exception. And moved the reference to lucene to be safe 2021-03-11 13:14:28 +01:00
Mole
f5df05d685 Add metadata to all packages and rename UmbracoCms.Lucene.nuspec to UmbracoCms.Examine.Lucene.nuspec 2021-03-05 13:56:41 +01:00
Mole
a3c8638636 Create nuspec for Examine.Lucene
Need to do this to be able to add the Examine/Lucene dlls.

You can actually create and run a site with the template \o/
2021-03-05 10:03:32 +01:00
Elitsa Marinovska
a2cfd277ce Cleanup 2021-02-18 08:33:49 +01:00
Bjarke Berg
9ba04c394b Added Directory.Build.props to replace SolutionInfo 2021-02-15 13:53:06 +01:00
Bjarke Berg
e38972abf0 Updated to net5.0 and updated most nuget packages. Also fixed the nuspec files. + Fix typo Persistance => Persistence. 2021-01-20 21:01:45 +01:00
James Jackson-South
4a544829a9 Merge branch 'netcore/netcore' into netcore/linting 2020-12-02 16:19:37 +00:00
James Jackson-South
ed6706a145 Global rules with split rulesets. 2020-11-27 01:08:18 +00:00
Bjarke Berg
b0186e5a8e Added azure-pipelines.yml to the sln file
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-25 07:47:05 +01:00
James Jackson-South
b16c2e47a1 Align umbraco.sln 2020-11-20 00:10:49 +00:00
James Jackson-South
0e1f6fc69b Remove rulset noise and allow further customization 2020-11-20 00:02:05 +00:00
James Jackson-South
02122683a3 Add files to solution 2020-11-12 14:39:30 +00:00
Bjarke Berg
1599e74193 Removed Umbraco.Configuration project 2020-09-14 14:15:09 +02:00
Bjarke Berg
c561b256bf Updated solution to include correct filenames 2020-08-24 18:09:16 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
2020-08-11 08:33:11 +02:00
Bjarke Berg
3c2f2ac0b3 Netcore: Let build.ps1 create the dotnet new templates (#8591)
* Creates the Umbraco.Templates.nuspec on build

* Update nuspec to match nuget packages

* Updated namespace of Program.cs and Startup.cs and replace these with the project name in templates

* Bugfixes for sqlce

* Simplified template to have one template with --UseSqlCe as option

* Update build/build.ps1

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
2020-08-11 08:28:16 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Bjarke Berg
f85204eaa1 Fixed lot of small issues for linux 2020-07-04 15:07:07 +02:00
Shannon Deminick
df3dc32de6 Block Editor List (#8273)
* add style to create-option in itempicker + removing overflow hidden

* style adjustment

* clean up of html

* correct sentence to use the number 7

* correct overlays, so they can use size

* numberrange prevalue editor

* add confirmRemove overlay

* correcting primary btn colors

* move confirmMessage below content of overlay.

* min max validation for numberrange

* remove comment

* improved actions for block list

* use file tree for view picker

* style adjustment to border of creator item in item-picker

* vertical align

* clean up + validation limit range

* rename ElementTypes to Blocks

* implement block list editor

* renaming

* use Chrome Headless for unit tests

* test for blockEditorService

* safer code

* block list editor

* rename view to overlayView

* block editor work

* Revert "rename view to overlayView"

This reverts commit 5b910c178a.

* block editor implementation

* sync models

* block list editor copy paste feature

* order var declarations

* remove unused paste function

* block list editor better naming

* simpler label generation

* clean up

* compile config for test mode

* Chrome Debug for VS code

* promise test working

* space change

* another two tests

* more tests for block list editor

* provide key on blockModel for angularJS performance optimization

* syncronization from infinite editing layers

* use an isolated scope

* more tests

* fix C# test

* remove unused block watcher component

* clean css

* only show on hover or focus for block-actions

* clean up and prepare for implementing settings

* remove console

* Add ability to render block list editor using Grid style rendering extension

* Enable Block List Editor settings editing

* Add Stacked Content to Block List migration

* Block Editor: Clean-up, refactoring, one step closer being ready for Content-Apps

* changes naming to Submit, to avoid misunderstanding.

* use a common variable on the block model for isOpen, to be able to make Actions show when open.

* NotSupported property editor, to be used when an editor is not supported in the given context.

* remove unused controller

* Hide group header if only one group is presented

* rename notsupport property editor css class

* smaller header for property group

* hide description if no description is presented

* css adjustments

* Inline create button styling: Better spacing, darker blue color for Focus Outline, moving the plus icon to mouse position for better visual appearance.

* css correction

* Add references for picked items

* Revert commit 45e892f350 - Changes api to GetData

* Use the .Data propertry as opposed to GetData in this PartialView

* Fix block list test failures

* Just parsing layout as model for partial views.

* minor adjustments

* Remove DB migrations so that they can be reviewed as a block

* Add migrations for new block editor

* Update default rendering partial view

* Add error handling to default template

* Handle color picker data in stacked content

* BlockList PreValue Editor opens configurations as overlay

* translation for prevalue editor property group headlines

* blockcard corrections

* block list prevalue corrections

* revert agressive clean up

* Block Picker

* MaxPropertyWidth PreValue + Implementation

* Incorporate latest block list editor changes, update migration for changed configuration

* Change declared converter type

* Handle invalid data type references

* Remove code duplicated from PR #7957

* use ElementModel for the ContentModel of an ElementType. So we can use ElementTypeModel for the ModelDefinition aka. the Type.

* do still show itempicker for BlockConfiguration even though there is no ElementTypes to pick. This enables the option to create a new ElementType to be used.

* use the right wrapper, for correct spacing

* parse item

* correct fallback for label

* removed unused callback

* paste feature for block-picker

* localize block-picker tabs

* Slightly change for shadow on block-picker item hover

* Localization of BlockEditor Settings Tab

* localizationService

* only filter when more than 8 items available

* Add multiple blocks if hold down CTRL or SuperKey

* adds notes

* ability to add a scoped stylesheet for block view

* make scoped block draggable + style adjustments

* provide index for custom view

* rename contentModel to data + rename layoutModel to layout

* clean up

* more localization

* openSettings option for block editor

* minor changes for a better developer experience

* paste mistake corrected

* only manipulate content-content-app if its present

* make small overlays slightly bigger

* moved block list entry editor into block list editor folder

* limit labelinterpretator to only runs ones pr. edit. and lets make sure to have a label thought we dont have any properties.

* fixed inline views gulp watcher

* changed vm to a better controller instance name

* make watch for views work again.

* able to re run watch

* make js up to date

* fix white background of image-picker

* media-picker container class

* loading indication

* adjust unit tests to latest interface

* getting started on JS Docs

* converting code to use contentTypeKey instead of contentTypeAlias, still missing a few TODOs.

* revert change

* add todo

* use Guid for Key

* use key

* Updates the caching layer to handle GUID keys for content types while preserving backwards compat, fixes unit tests, removes the strongly typed lists for the block editor value since it's unecessary

* Reverts the nested content changes, fixes up the GetEmptyByKey

* Returns ContentTypeKey from the server, updates js to use this everywhere and fix all js tests.

* Allows key in SimpleContentType

* correct for the new spelling

* appended this. since the method is a non-static class method.

* only add background-image if value isnt null

* simplifyed limits validation

* clean up

* no need to execute a digest.

* define the full model for new configurations

* removed setDataFromBlockModel and general clean up and added documentation

* default size should be medium

* use retriveValuesFrom method to transfer data.

* ability to disable an navigation item

* createElementTypeAndCallback working again for settings.

* still have the ability to retrive a scaffold model by alias, since we are still using alias in clipboard service.

* disable clipboard tab if no available paste options

* ups, should stay as alias

* disable clipboard when empty

* use property alias for content add button

* use a grey that can be seen on top of grey and on top of white.

* some accessibility improvements

* rename entry to block

* appended ' and added space in Element Type

* use background color for hover to corospond with active state

* make nested content unsupported

* Moving BlockEditorModelObject into its own file for Documentation purpose. Same goes for renaming BlockModel to BlockObject. and a lot of documentation written.

* fix links in js docs

* added a blocklistentryeditor for unsupported blocks

* ability to retrive the $scope from UmbVariantContentEditors, needed for Block Editor to get a scope existing across variants and splitview.

* Appending the block objects to layout, to share it across variants and in split-view.

* removed trailing comma

* Unsupported block

* Dont copy unsupported blocks

* use grey color for unsupported block

* text correction

* we dont have this fallback anymore

* sort properties

* Text change

* css correction

* use active to determine if an inline editor is expanded. To enable the inline editor to be expanded on creation.

* using udi instead of key.

* bringing the runtime block key back

* live editing ability

* live editing for settings data

* call formSubmit before property editor are removed from DOM. Both for overlay-editing and inline-editing. Fire an postFormSubmitting event after formSubmitting event to let editors know that data could have been updated.

* make sure settings object exists

* only set active to false if it was false before opening the editor.

* update test with new scope parameter

* move destroy responsibility to blockObject

* rename onDestroy to destroy

* added some JS-Docs

* correction jsDocs

* Update ElementType Resource to not use hardcoded URL but to use the Umbraco.Sys.ServerVariables.umbracoUrls instead

* Remove partially completed ConvertToElement migration, fixed in issue 7939 instead.

* Remove external property editor migration

* corrected naming of umbBlockListScopedBlock and umbBlockListBlock

* correct ngdoc type

* removed vscode specific configuration of karma

* Finished Todo, gets name of documentType if copying all entities in an infinite editor

* changed comment from TODO to something that explains the state.

* stop tracking build output files.

* rename files to match file name conventions

* this should not happen.

* remove dublicated code

* rename requestCopyBlock to copyBlock

* make sure images does not repeat.

* scale thumbnail for block showcase

* renamed blockcard.component to umb-block-card and moved it.

* removed inline style

* correct style location

* corrected filepath

* corrected file path

* keep elementTypes up to date through the EventService.

* mark Umbraco.BlockList as unsupported inside Nested Content

* correct js docs name

* remove comment

* remove comment

* remove unused controller

* rename inline method name

* corrected spelling mistake

* remove not very used vars

* make binding one-way

* split in multiple lines

* corrected default rendering

* removing documentation that is relevant for developers of new block editors. this documentation will be transfered to Our documentation.

* added danish translation

* corrected blog to blok

* Remove invalid using statement

* use native forEach

Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
Co-authored-by: Benjamin Carleski <benjamin@proworks.com>
Co-authored-by: Warren Buckley <warren@umbraco.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Claus <claus@claus.nu>
2020-06-30 10:52:42 +01:00
Shannon
eedef91749 commits sln file that keeps changing because of acceptance tests 2020-05-26 17:42:31 +10:00
Bjarke Berg
cda531e34e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	.gitignore
#	src/Umbraco.Web/Editors/ContentController.cs
2020-05-18 10:37:28 +02:00
Bjarke Berg
45224a35d0 Initial acceptance test commit 2020-05-13 15:18:40 +02:00
Bjarke Berg
55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
2020-03-31 15:36:25 +02:00
Bjarke Berg
86fe83ca16 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore
# Conflicts:
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
2020-03-26 07:10:23 +01:00
Shannon Deminick
8b531b7aea Merge pull request #7820 from umbraco/netcore/feature/unit-test-project
NetCore: Introduces a seperate UnitTest project
2020-03-26 15:24:19 +11:00
Bjarke Berg
397b25f9ae Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs
2020-03-24 19:38:44 +01:00
Bjarke Berg
9339e1d999 AB#5820 - Introduced WebProfiler for asp.net core 2020-03-24 18:56:45 +01:00
Bjarke Berg
8c8a9764cd Post merge + Added new SmtpSettingsBuilder 2020-03-18 07:42:35 +01:00
Bjarke Berg
9bf2d650ec Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/unit-test-project 2020-03-18 07:03:03 +01:00
Shannon
7e679f34c4 fixes sln 2020-03-16 22:41:55 +11:00
Shannon
fea65897ba Merge branch 'netcore/dev' into netcore/feature/booting-netcore 2020-03-13 12:50:08 +11:00
Shannon
4e4df96140 Creates new Umbraco.Tests.Common netstandard project to host the common testing functionality between netframework and netcore, this will be ongoing work (doesn't need to be done all at once) 2020-03-13 12:08:25 +11:00
Shannon
da58b7a743 Adds integration test project for netcore3 and poc for crosswiring di container with msdi 2020-03-12 23:28:24 +11:00
Bjarke Berg
290e5b58a0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice
# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntime.cs
2020-03-04 10:10:03 +01:00
Bjarke Berg
53953338d8 Merged Umbraco.Abstractions into Umbraco.Core 2020-03-03 13:42:07 +01:00
cyberdot
01362d0dd0 NetCore: Abstract ConfigurationManager references 2020-03-03 11:18:54 +00:00
Bjarke Berg
5517186cb7 Added Web.Website 2020-02-24 10:51:48 +01:00
Bjarke Berg
c975162e14 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-24 09:57:27 +01:00
Bjarke Berg
683c0b8732 Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext 2020-02-24 08:24:19 +01:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Bjarke Berg
942bb0d585 Merge branch 'netcore/feature/move-mappings-after-httpcontext' into netcore/feature/executable-backoffice
# Conflicts:
#	src/Umbraco.Abstractions/CompositionExtensions.cs
2020-02-19 14:44:22 +01:00
Bjarke Berg
accef6d96a Merged Umbraco.Examine and Umbraco.Infrastructure and moved more files into Infrastructure 2020-02-18 13:34:31 +01:00
Bjarke Berg
5e79585149 Introduced Umbraco.Web.UI.Backoffice 2020-02-18 08:32:06 +01:00
Bjarke Berg
b850b3c8fe AB4950 - Created new Umbraco.Web.BackOffice project. Moved dashboards into this new project (#7615) 2020-02-10 09:06:29 +01:00
Bjarke Berg
d147b182ee Renamed the project to Umbraco.PublishedCache.NuCache - and move non NuCache related stuff to abstractions and infrastructure. 2020-02-06 14:40:46 +01:00
Bjarke Berg
0bc843b06d Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-06 14:09:23 +01:00
Bjarke Berg
c0a59cbad7 Renamed SqlCe Project 2020-02-06 08:49:02 +01:00
Bjarke Berg
a3867d93dd Replaced the Umbraco.Examine.Lucene.csproj with the new format (PackageReferences) 2020-02-05 08:17:30 +01:00
Bjarke Berg
420d8d2ba8 Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-04 07:14:41 +01:00