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

34248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
fe7d4ed3e9 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-17 18:05:40 +02:00
Sebastiaan Janssen
f0f92db3dc First compile all the gulp things before trying to make the docs 2020-06-17 18:02:23 +02:00
Bjarke Berg
d5f2d8456a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs
#	src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
 2020-06-17 17:01:45 +02:00
Bjarke Berg
3a33e7bf29 Migrated ControllerContentTests.. Right now the test fails, but the test is correct 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-17 16:39:28 +02:00
Thomas Andresen
a9bd2ae856 Merge pull request #8266 from umbraco/v8/bugfix/macro-rte-render-fix 
Allows unpublished content to render a macro HTML in the RTE
 2020-06-17 15:59:50 +02:00
Warren Buckley
c52649883b Merge pull request #8304 from umbraco/v8/feature/improve-js-docs 
Improve jsDocs
 2020-06-17 13:42:42 +00:00
Niels Lyngsø
4ddd1a91ed make reload work 2020-06-17 15:41:08 +02:00
Niels Lyngsø
25488d2016 add watch functionallity 2020-06-17 15:32:54 +02:00
Bjarke Berg
e56f6b71a9 Merge pull request #8286 from AndyButland/feature/netcore-type-filters 
NetCore: Updated various type filters to attributes with nested filters.
 2020-06-17 14:56:51 +02:00
Warren Buckley
247fbb0950 Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev 2020-06-17 13:38:47 +01:00
Warren Buckley
d4c464c123 Remove duplicate comment 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
 2020-06-17 13:38:24 +01:00
Warren Buckley
d7cd52161f Fix SkipStep in tour directive was looking at wrong DOM selector it needs to be skipStepIfVisible 2020-06-17 13:37:40 +01:00
Bjarne Fyrstenborg
fe90f98515 Add id attribute so click on property label focus in input (#8078) 
Co-authored-by: Bjarne Fyrstenborg <bf@oerskov-gruppen.lan>
 2020-06-17 12:56:41 +02:00
Niels Lyngsø
0836118d54 force-resolutions and be able to run server including watching files for changes. 2020-06-17 12:07:15 +02:00
Warren Buckley
96ab448e74 Azure DevOps YML pipeline for creating C# & JS Docs (#8282) 2020-06-17 11:47:53 +02:00
Warren Buckley
797e666e81 Merge pull request #8257 from umbraco/v8/feature/8256_Raise_an_event_when_deleting_a_document_type_to_its_dependents 
If content type is deleted and other document types have a reference to it, raise an event
 2020-06-16 13:13:11 +00:00
Marc Goodson
57d08c964a Broadcast 'formSubmitting' event when Macro Parameter Overlay is submitted 
Some property editors - eg MultiUrlPicker listen out for the broadcast of the 'formSubmitting' event before setting their value of $scope.model.value... if these editors are used as Macro Parameters they do not save their value. This commit adds the broadcasting of the event when the 'submit' button is called and any parameters have been set.
 2020-06-16 14:15:09 +02:00
Bjarke Berg
a5f5b1a984 Migrated unit tests for FilterAllowedOutgoingContentAttribute and MediaController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 14:43:11 +02:00
Bjarke Berg
751a54f525 Merge pull request #8290 from umbraco/v8/bug/doctype-import 
Importing a doctype leaves behind temp files
 2020-06-15 13:30:09 +02:00
Bjarke Berg
a6b23fbfa0 Entity controller migrated 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 13:07:49 +02:00
Bjarne Fyrstenborg
35751e257f Ensure SVG image is shown in preview (#8007) 
Co-authored-by: Bjarne Fyrstenborg <bf@oerskov-gruppen.lan>
 2020-06-15 11:48:22 +02:00
Sebastiaan Janssen
567d7176a5 Importing a doctype would never assign a value to UploadedFiles, turns out we don't need UploadedFiles on the model 
Additionally added a check to see if temp files were left behind and delete them to prevent errors when the same file has just been uploaded
 2020-06-15 11:05:40 +02:00
Bjarke Berg
cf7ed273d7 Fix import/export 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 08:52:03 +02:00
Bjarke Berg
46e5625166 Fix issue with media located in wwwroot 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 08:23:25 +02:00
Andy Butland
1cf4374a48 Updated various type filters to attributes with nested filters. 2020-06-13 11:08:59 +02:00
Bjarke Berg
834a8173d0 Migrated Media controller + ContentTypeControllerBase + ContentTypeController, MediaTypeController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 22:13:43 +02:00
Bjarne Fyrstenborg
fda7251aed Upload media and select media type (#8043) 2020-06-12 16:01:19 +02:00
Bjarke Berg
52bc003c8e Migrated more stuff for MediaController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 15:58:53 +02:00
Sebastiaan Janssen
9be4775acf Make sure to use the new Utilities class 2020-06-12 15:46:06 +02:00
Bjarne Fyrstenborg
c4456c53a0 v8: Fix disappearing image cropper and grid content when using rollback (#5792) 2020-06-12 15:37:05 +02:00
Bjarke Berg
a4a074e22c More content model binding 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 13:35:37 +02:00
Bjarke Berg
989c83b452 Merge remote-tracking branch 'origin/netcore/feature/migrate-remaining-trees' into netcore/feature/contentcontroller_and_related 2020-06-12 10:03:37 +02:00
Bjarke Berg
609c1ffc5b Migrated content controller + related 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 08:27:22 +02:00
Bjarke Berg
b9da273cbd Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-12 07:13:00 +02:00
Bjarke Berg
82022240f3 Merge pull request #8277 from electricsheep/feature/netcore-unit-tests 
Migrate unit tests to new test project
 2020-06-12 06:42:24 +02:00
Bjarne Fyrstenborg
349a46c311 Adjust property editor settings (#8251) 
Co-authored-by: Bjarne Fyrstenborg <bf@oerskov-gruppen.lan>
 2020-06-11 19:14:46 +02:00
Ollie Philpott
5d5c7ba95e Move XmlExtensionsTests 2020-06-11 15:13:35 +01:00
Ollie Philpott
7aadae68d8 Move VersionExtensionTests 2020-06-11 14:59:14 +01:00
Ollie Philpott
663adc1db7 Move HexEncoderTests 2020-06-11 14:56:24 +01:00
Ollie Philpott
449bf55060 Move GuidUtilsTests 2020-06-11 14:54:19 +01:00
Ollie Philpott
299a461afb Move EnumExtensionsTests 2020-06-11 14:50:10 +01:00
Ollie Philpott
cb3a5d6b97 Move EnumerableExtensionsTests 2020-06-11 14:48:57 +01:00
Ollie Philpott
958b4f431e Move DelegateExtensionsTests 2020-06-11 14:47:08 +01:00
Ollie Philpott
3da8fd4a98 Move AttemptTests 2020-06-11 14:41:48 +01:00
Ollie Philpott
06a1671f95 Move ClaimsIdentityExtensionsTests 2020-06-11 14:39:45 +01:00
Ollie Philpott
eabf6f459b Move TestClone class 2020-06-11 14:39:10 +01:00
Bjarke Berg
f1257ef717 Inject specific IFileSystem into FilesTreeController 2020-06-11 15:38:12 +02:00
Bjarke Berg
e8c0a08ea8 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 15:21:51 +02:00
Bjarke Berg
918e7f1be3 Merge branch 'netcore/dev' into netcore/netcore 2020-06-11 15:17:42 +02:00
Bjarke Berg
d77c3dc8dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-11 15:16:39 +02:00