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

31548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
1e35aeb9cf ensures .jpg ext is added to test data 2019-12-18 16:01:27 +11:00
Shannon
000a8d2c94 manually merges changes for the NC validation stuff since there was conflicts 2019-12-18 15:37:00 +11:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-18 15:28:27 +11:00
Shannon Deminick
2a7faf36f0 Merge pull request #7075 from umbraco/v8/fix/6324-wrong-media-path-stored 
Wrong media path stored in database
 2019-12-18 15:02:33 +11:00
Shannon
63429dadb7 Adds notes, changes values to constants 2019-12-18 15:01:33 +11:00
Shannon
1d61bc829c Merge branch 'v8/dev' into v8/fix/6324-wrong-media-path-stored 2019-12-18 12:10:00 +11:00
Shannon
0d0f8e6beb adds debug timing 2019-12-18 11:08:15 +11:00
Shannon Deminick
62c701d5c3 Merge pull request #6630 from ronaldbarendse/v8/bugfix/6624-enable-disablecomposer-from-all-assemblies 
Get EnableComposer and DisableComposer attributes from all assemblies
 2019-12-17 06:56:34 +01:00
Shannon Deminick
25d1c454dc Update readme.md 2019-12-17 16:50:54 +11:00
Shannon
292a40194f updates readme, adjusts controller 2019-12-17 16:46:02 +11:00
Shannon
9e9a2d8379 Adds TestData project with an endpoint to create content/media hieararchy for testing 2019-12-17 10:38:03 +11:00
Warren Buckley
7d52ff98a9 Merge pull request #7335 from umbraco/v8/feature/0000-preview-ui-2019 
Preview UI supporting multiple choices
 2019-12-16 15:59:29 +00:00
Niels Lyngsø
e215d19f96 only show languages if we have any + select default if none is selected + right align dropdown menu 2019-12-16 16:31:04 +01:00
Niels Lyngsø
72054d7fe2 remove outcommented code 2019-12-16 15:08:00 +01:00
Niels Lyngsø
526b1e8b82 changed svg to icon 2019-12-16 15:05:58 +01:00
Niels Lyngsø
f20c11b37d Update src/Umbraco.Web.UI.Client/src/less/canvas-designer.less 
removed comment

Co-Authored-By: Warren Buckley <warren@umbraco.com>
 2019-12-16 14:32:53 +01:00
Niels Lyngsø
c4cf3cf5ea added motion to ensure attention brought to preview bar 2019-12-16 13:33:51 +01:00
Ronald Barendse
507db27337 Removed unnecessary WithCollectionBuilder call 2019-12-12 14:38:16 +01:00
Ronald Barendse
8b3e2c61af Add obsolete Composers constructor for backwards-compatibility 2019-12-12 13:55:43 +01:00
Niels Lyngsø
b722ae2008 bottom align preview bar 2019-12-11 13:08:19 +01:00
Niels Lyngsø
86c6fd5873 dropdown menus for preview 2019-12-10 14:07:09 +01:00
Niels Lyngsø
6c0cb723c6 new preview UI prototype 2019-12-10 09:40:41 +01:00
Warren Buckley
29ff95323c Merge pull request #7282 from umbraco/v8/feature/0000-gulp-only-render-sourcemaps-on-dev 
Basic setup for differentiating compile modes in gulp
 2019-12-06 09:57:25 +00:00
Warren Buckley
66801f09ab Remove the cleanup code of LESS Source Map files from the ZIP & Nupkg builds - this is done with Niels PR as only gulp dev creates LESS SourceMaps 2019-12-06 09:27:35 +00:00
Warren Buckley
1d0fb7be3b Merge branch 'v8/dev' into v8/feature/0000-gulp-only-render-sourcemaps-on-dev 2019-12-06 09:10:18 +00:00
Claus
a06946289d Merge pull request #7274 from umbraco/v8/bugfix/AB4075-activeNode-should-match-nodeType 
Checking nodeType on activeNode to ensure that nodes originate from same treeAlias
 2019-12-06 09:44:42 +01:00
Niels Lyngsø
37513a5161 basic setup for differentiating compile modes in gulp + only compile sourcemaps in dev mode 2019-12-06 09:34:53 +01:00
Bjarke Berg
a7687e9439 Merge pull request #7277 from umbraco/v8/feature/AB3324-maindom-switching 
Ability to swap out IMainDom
 2019-12-06 08:09:10 +01:00
Shannon
3e48022949 Fixes test 2019-12-06 13:19:14 +11:00
Bjarke Berg
1b5a577e30 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB3324-maindom-switching 2019-12-05 14:15:51 +01:00
Bjarke Berg
f7e5e81556 Merge pull request #6757 from umbraco/v8/bugfix/6546-MainDom-Cleanup 
Cleaning up MainDom and other resources preventing clean shutdown/startup
 2019-12-05 14:12:54 +01:00
Warren Buckley
4d78a2c848 Remove old & unecessary comment 2019-12-05 12:50:46 +00:00
Shannon Deminick
703cce266e Merge pull request #7228 from umbraco/v8/feature/community-package-tracking 
V8 - Community package tracking of references
 2019-12-05 23:44:15 +11:00
Warren Buckley
2948d506ea V8: Bye hardcoded colors lets use Variables (#7246) 
* Bye bye #fff let's use the variable @white instead

* Update to use @black

* Update canvas-designer file with variables where possible - ALOT was not found (need to see if we have similar matches already)

* Update all hex colour variables or add a TODO comment

* Empty LESS files so lets get rid of them

* Moves the color CSS classes out into own less file to ensure variables contains variables only

* Adds in gulp-sourcemaps to allow us to have LESS sourcemaps - https://www.npmjs.com/package/gulp-less#source-maps

* A VERY BAD first attempt at doing DARK mode, but plumbing done. Now a game of tweaking variables

* Revert "A VERY BAD first attempt at doing DARK mode, but plumbing done. Now a game of tweaking variables"

This reverts commit 5ac8080c8b314cd65b1bd735fea88569991736b2.

* Update hard-coded hex values to color variables

* Fix couple typos with LESS variables gray not grey

* Amend build script so we remove the /umbraco/assets/css/maps folder from the build ouput of the ZIP & Nuget Packages

* Removing more hard coded colour values
 2019-12-05 13:38:57 +01:00
Shannon
0e5bc264fc Merge branch 'v8/bugfix/6546-MainDom-Cleanup' into v8/feature/AB3324-maindom-switching 2019-12-05 23:27:24 +11:00
Shannon
3f78331145 Adds lots of notes, fixes tests to ensure we catch OperationCanceledException where necessary, adds logging to tests, fixes a boolean op 2019-12-05 23:26:49 +11:00
Warren Buckley
cad384a0a6 Moves logic out from ContentRepositoryBase & into a method on the Collection itself 2019-12-05 11:18:18 +00:00
Shannon
385722c43c Merge branch 'v8/bugfix/6546-MainDom-Cleanup' into v8/feature/AB3324-maindom-switching 2019-12-05 19:20:30 +11:00
Shannon
6f9062c0cf fixes test (cherry picked) 2019-12-05 19:19:09 +11:00
Shannon
d8c1c8fd13 fixes test 2019-12-05 19:18:15 +11:00
Shannon
15f75ce756 FIxes test and fixes boolean issue with bg task runner shutdown (issue exists in v7 too) 2019-12-05 18:07:43 +11:00
Warren Buckley
9e1a56eba5 Rename from DataValueReferenceFor to DataValyeReferenceFactory & Factories for the plural collection 2019-12-04 16:14:33 +00:00
Niels Lyngsø
0c3d3b229e Checking nodeType on activeNode to ensure that nodes originate from the same treeAlias 2019-12-04 14:42:06 +01:00
Shannon
1f481315bc Allow for switching out MainDom which will need to be done in the UmbracoApplication 2019-12-04 17:18:15 +11:00
Shannon
6bba032325 re-merges 2019-12-04 16:09:39 +11:00
Shannon
8218467e04 Merge branch 'v8/dev' into v8/bugfix/6546-MainDom-Cleanup 
# Conflicts:
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2019-12-04 16:09:22 +11:00
Shannon Deminick
f02c46bc5d Merge pull request #7253 from bielu/v8/bugfix/contentpopulators 
8.4RC: MediaIndexPopulator should use IUmbracoContentIndex instead of Umbrac…
 2019-12-04 10:56:36 +11:00
Warren Buckley
19497ee785 Fix up unit test - needed to add the collection to the Compositon for all tests inheriting from UmbracoTestBase 2019-12-03 11:52:46 +00:00
Warren Buckley
e1e5ac44cc Something gone funky/awol with my commits - remove dupe code :S 2019-12-02 15:35:13 +00:00
Warren Buckley
1b84051e8f Move DataValueReferceFors collection from Umbraco.Web to Umbraco.Core composer in order to see if that helps the Unit Test LightInject issue 2019-12-02 15:24:50 +00:00