yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,235 Commits 4 Branches 7 Tags
5d7683e5fa1baab5ffdc31ffbf3bd8494d3b853d
Commit Graph

32235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
5d7683e5fa Merge branch 'v8/dev' into v8/contrib 2020-03-24 17:34:07 +01:00
Sebastiaan Janssen
df04ffa68d Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/packages.config
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/packages.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/umbraco.editorControls.csproj
 2020-03-24 17:30:10 +01:00
Alexander Karlsson
e8d63d9a7a #7780 Show all filters that is more then 0 hits 2020-03-24 17:08:01 +01:00
Arkadiusz Biel
3640ed259d GetAllIds for Roles (#7806) 2020-03-24 15:15:52 +01:00
Erik-Jan Westendorp
0a79e28205 #7803 Add EditorGroupAlias and WriterGroupAlias to Constants cl… (#7804) 2020-03-24 14:03:51 +01:00
dependabot[bot]
99152ffef3 Bump acorn from 5.7.3 to 5.7.4 in /src/Umbraco.Web.UI.Client 
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-24 14:01:11 +01:00
Chris Oliver
3edfc42623 Collapse navigation items based on container size 
- Previously a maximum of 8 items were shown.
- This change calculates the width of each item and displays as many as possible in the container.
- Any overflowing items will be moved to the ... menu
 2020-03-23 13:48:40 +01:00
Olivier Bossaer
ff2027df07 Fixes #7798 : Invalid implementation of IEnumerable in Content Cache 2020-03-23 13:27:04 +01:00
Shannon Deminick
51d7ce0dc6 Merge pull request #7782 from PerplexDaniel/v8/feature/variationcontext-get-segment 
Added GetSegment() method to VariationContext and uses it when conten…
 2020-03-23 16:55:40 +11:00
SimonCropp
8752ce871a fix assert order of expted V actual 2020-03-20 15:06:27 +01:00
Sebastiaan Janssen
b9b3777e46 Merge branch 'v7/7.15.4' into v7/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2020-03-19 14:18:59 +01:00
Sebastiaan Janssen
2f10051ee9 Merge branch 'v8/dev' into v8/contrib 2020-03-19 14:06:12 +01:00
Sebastiaan Janssen
8cd537cc96 Merge branch 'v8/8.5.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-03-19 14:03:38 +01:00
Jeffrey Schoemaker
ead3de05e4 Added the correct sources to the buildscripts. If you have inte… (#7089) 2020-03-13 13:30:54 +01:00
Shannon Deminick
0a45f4afef Fixes issue with deep cloning property values (#7795) 2020-03-13 10:52:38 +01:00
Sebastiaan Janssen
4c134f9701 Revert "Fix the build for people on VS version 16.4.5+" 
This has been properly fixed in Umbraco.Build 0.2.14 instead

This reverts commit f4861f6802.
 2020-03-13 09:47:05 +01:00
Sebastiaan Janssen
f4861f6802 Fix the build for people on VS version 16.4.5+ 2020-03-12 17:17:49 +01:00
Warren Buckley
2d3388d6d3 Update dependency for 8.5.5 2020-03-12 15:52:23 +01:00
Sebastiaan Janssen
d52695d81f Update dependency for 7.15.4 2020-03-12 15:45:21 +01:00
Niels Lyngsø
007fe8d894 7434 do not use umb outline for select (#7788) 2020-03-11 11:18:53 +01:00
Bjarke Berg
39026258ec Merge pull request #7752 from umbraco/v8/feature/AB5435-make-umbracohelper-props-obsolete 
Obsoleting UmbracoHelper properties
 2020-03-11 07:40:46 +01:00
Sebastiaan Janssen
a695a6ad76 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	apidocs/umbracotemplate/styles/main.css
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
#	src/Umbraco.Core/Serialization/JsonNetSerializer.cs
#	src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
#	src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
#	src/Umbraco.Web/Cache/MediaCacheRefresher.cs
#	src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Profiling/WebProfiler.cs
#	src/Umbraco.Web/Profiling/WebProfilerProvider.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
#	src/Umbraco.Web/Search/ExamineEvents.cs
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
 2020-03-10 22:03:28 +01:00
Sebastiaan Janssen
7dc6ddf3a8 Merge branch 'v7/dev' into v7/7.15 2020-03-10 21:54:01 +01:00
Steve Megson
d11a1946f5 V7: Don't call ClearPreviewXmlContent from ClearDocumentXmlCache (#6631) 2020-03-10 21:52:53 +01:00
Sebastiaan Janssen
959a6df634 Merge branch 'v7/dev' into v7/7.15 2020-03-10 21:51:00 +01:00
Marc Goodson
7ca6781d09 v7: Fix false matches for AltTemplate convention Urls (#7150) 2020-03-10 21:49:59 +01:00
Sebastiaan Janssen
cfdc4ce807 Merge branch 'v7/dev' into v7/7.15 
# Conflicts:
#	src/Umbraco.Core/Serialization/JsonNetSerializer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
 2020-03-10 21:38:33 +01:00
Bjarke Berg
cf060e9789 Merge remote-tracking branch 'origin/v8/feature/AB5435-make-umbracohelper-props-obsolete' into v8/feature/AB5435-make-umbracohelper-props-obsolete 2020-03-10 10:37:13 +01:00
Bjarke Berg
9be30f3e91 Added info to obsolete message 2020-03-10 10:36:34 +01:00
Daniël Knippers
3eb4c642c3 Added GetSegment() method to VariationContext and uses it when contentId is available 2020-03-09 17:07:56 +01:00
Shannon
d3ebdb6198 fixes test 2020-03-09 22:25:58 +11:00
Jason Elkin
bad1913e0e update Umbraco.ModelsBuilder.Embedded attributes to match assembly name 2020-03-09 10:19:26 +01:00
Anders Brohäll
46686ffd90 Corrected document outline 2020-03-09 08:51:00 +01:00
Shannon Deminick
a0aad045fb Merge pull request #7652 from benjaminhowarth1/patch-1 
Update PropertyType.cs
 2020-03-05 17:51:03 +11:00
Kenn Jacobsen
4ad73dc183 Fix completely broken(tm) media pickers 2020-03-04 16:27:28 +01:00
Bjarke Berg
6241bee1b2 Introduce methods on current, that can be necessary if not using the obsolete properties. 2020-03-04 13:49:13 +01:00
Bjarke Berg
8bc077fa18 Introduce methods on current, that can be necessary if not using the obsolete properties. 2020-03-04 13:37:05 +01:00
Warren Buckley
7bfeae7329 Merge pull request #7745 from kjac/v8/fix/media-picker-upload-rte 
V8: Fix broken "upload and insert media" in RTE
 2020-03-04 10:04:00 +01:00
Poornima Nayar
fd47c3300c Semantic fixes grid pre values (#7748) 
* Create Content Blueprints - Semantic fixes

* Grid Prevalues Screen -Semantic changes

* reverted a change I accidentally made
 2020-03-03 23:02:14 +01:00
Poornima Nayar
ffb5265f35 Create Content Blueprints - Semantic fixes (#7747) 2020-03-03 22:40:45 +01:00
Niels Lyngsø
8db6291c5f Adding more fine colors for UI (#7535) 
* adding colors: pinkExtraLight + gray-12 + @gray-13

* convert to hex color code

* adjusted color slightly

Co-authored-by: Kenn Jacobsen <post@kennjacobsen.dk>
 2020-03-03 21:46:00 +01:00
elitsa
4cbaec68f0 Obsoleting UmbracoHelper props which are going to be removed in the future 2020-03-03 12:07:56 +01:00
Kenn Jacobsen
55bfa57525 Fix broken "upload and insert media" in RTE 2020-03-02 21:57:59 +01:00
Kenn Jacobsen
9374f61d13 Make media picker open in a medium sized overlay 2020-03-02 08:49:31 +01:00
Kenn Jacobsen
fbe963a542 Make sure entity media path is mapped for DTO types of GenericContentEntityDto 2020-03-02 08:45:38 +01:00
Poornima Nayar
867232531c Create Content Blueprints accessibility improvements (#7020) 
* Create Content Blueprints - Disallow element types and some accessibility improvements

* re-enabled element types for content blueprint
 2020-02-29 22:36:56 +01:00
Poornima Nayar
2853448963 Improve accessibility of grid prevalues screen (#6949) 
* WIP Improve accessibility of grid prevalues screen

* Clean up of the view, improve accessibility and add localization fallbacks

* forgot to commit the stylesheet

* formatting fixes
 2020-02-29 21:50:50 +01:00
Poornima Nayar
0f540bc74d RTE config tool bar options are messed up 2020-02-29 12:09:17 +01:00
Nathan Woulfe
af7919ce65 make events public 2020-02-29 11:32:24 +01:00
Sebastiaan Janssen
ba4481319e Merge branch 'v8/dev' into v8/contrib 2020-02-28 09:01:52 +01:00