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

6022 Commits

Author SHA1 Message Date
Shannon
826102ea4d Merge remote-tracking branch 'origin/temp-v8-UI' into dev-v8 2018-03-29 22:42:18 +11:00
Shannon
7fd9caf889 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 
# Conflicts:
#	src/Umbraco.Web/PublishedContentQuery.cs
 2018-03-29 22:35:46 +11:00
Stephan
c72ce0b759 Fix Examine PR, fix migrations and upgrades 2018-03-29 11:31:33 +02:00
Shannon
881fbb7f76 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
# Conflicts:
#	build/Modules/Umbraco.Build/Umbraco.Build.psm1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/IO/FileSystemProviderManager.cs
#	src/Umbraco.Core/ObjectExtensions.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
#	src/Umbraco.Core/Services/IdkMap.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests.Benchmarks/app.config
#	src/Umbraco.Tests/UI/LegacyDialogTests.cs
#	src/Umbraco.Web/Cache/MediaCacheRefresher.cs
#	src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
#	src/Umbraco.Web/PublishedContentQuery.cs
#	src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
 2018-03-29 20:01:14 +11:00
Shannon
5482b8f2f0 Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11102 
# Conflicts:
#	src/NuGet.Config
#	src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
#	src/Umbraco.Web/IPublishedContentQuery.cs
#	src/Umbraco.Web/PublishedContentQuery.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
#	src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
 2018-03-29 14:00:20 +11:00
Dave Woestenborghs
d1eb6b1aa8 U4-11161 don't show help text when it's not a multipicker 2018-03-28 17:07:56 +02:00
Dave Woestenborghs
458d023ff4 U4-11161 set min and max number in default config 2018-03-28 17:03:35 +02:00
Shannon
88d66cfb53 Examine v1.0.0 integration, it now builds! now to run tests and fixup 2018-03-27 18:14:21 +11:00
Mads Rasmussen
486ead0983 Merge pull request #2537 from umbraco/temp-U4-11129 
U4-11129 Updates Content Delete Dialog with new copy/warning about variants
 2018-03-23 14:57:46 +01:00
Warren Buckley
5449de6426 Merge pull request #2538 from umbraco/temp-U4-11126-variant-switch-prompt 
Temp u4 11126 variant switch prompt
 2018-03-23 13:50:31 +00:00
Mads Rasmussen
4fa27c09fa fix user dialog toggle 2018-03-23 14:47:12 +01:00
Mads Rasmussen
fe32481b6e bring dashboards back to life 2018-03-23 14:14:25 +01:00
Mads Rasmussen
cf81f97f73 show discard changes prompt when swithing variant 2018-03-23 11:28:27 +01:00
Mads Rasmussen
26b575b2f6 remove console log 2018-03-23 11:27:42 +01:00
Mads Rasmussen
8e8102a51d update styling for discard changes dialog 2018-03-23 11:27:24 +01:00
Warren
9269a257e8 Adds new info bar to content delete dialog with warning about variants/languages 2018-03-23 10:04:26 +00:00
Mads Rasmussen
2250943c87 remove gray bg in context menu header 2018-03-22 15:43:13 +01:00
Warren Buckley
c5365b7d0d Merge pull request #2528 from umbraco/temp-U4-11120 
Temp u4 11120
 2018-03-22 11:37:44 +00:00
Stephan
0cbfebe21c Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:08 +01:00
Mads Rasmussen
f3859f891e localize "add language" 2018-03-22 10:46:38 +01:00
Mads Rasmussen
bb7c96f408 better naming of tree language selector 2018-03-22 09:59:49 +01:00
Mads Rasmussen
c701bf5a74 fix unit tests 2018-03-21 16:51:08 +01:00
Mads Rasmussen
32daf0f8d7 only show default language info when toggle is turned on 2018-03-21 15:31:51 +01:00
Mads Rasmussen
a23f122f5f only delete language when allowed 2018-03-21 14:01:48 +01:00
Mads Rasmussen
bc4e97be48 fixes: U4-11120 Create new Language dashboard to create/remove/set default languages - angular 2018-03-21 13:39:16 +01:00
Shannon
b361cfebb7 updates npm build dependencies 2018-03-21 13:55:01 +11:00
Shannon
ebea5e8170 fixes boolean pre-value editor Html Id 2018-03-21 13:53:54 +11:00
Shannon
2ad79956d9 Re-apply Drop Down Flexible "Merge pull request #2502 from umbraco/temp-U4-11032"" 2018-03-21 12:37:26 +11:00
Shannon
96c6a17d03 Merge branch 'dev-v7' into dev-v7.10 2018-03-21 12:36:55 +11:00
Shannon
1a590664e7 Revert "Merge pull request #2502 from umbraco/temp-U4-11032" 
This reverts commit 2aa0dfb2c5, reversing
changes made to 2c6e7e46c2.
 2018-03-21 12:32:27 +11:00
Shannon
084af43dab Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10 2018-03-21 10:20:20 +11:00
Sebastiaan Janssen
79ecaecc9e Merge pull request #2503 from umbraco/temp-U4-11070 
Adds support for *not* closing an overlay on enter
 2018-03-20 11:14:57 +01:00
Sebastiaan Janssen
f604117c6d Merge pull request #2504 from umbraco/temp-U4-11071 
U4-11071 Prevalue editor for multiple values TLC
 2018-03-20 11:14:42 +01:00
Robert
3aed889e2a Merge branch 'dev-v7' into temp-U4-11032 2018-03-19 14:14:51 +01:00
Robert
2c6e7e46c2 Merge pull request #2517 from dawoe/patch-1 
Fixed documentation of umb-overlay directive
 2018-03-19 08:58:23 +01:00
Dave Woestenborghs
0c868fb72d Remove console.log from slider property editor 
removed console.log statement from slider property editor controller
 2018-03-16 18:43:54 +01:00
Dave Woestenborghs
a96cbce9b1 Fixed documentation of umb-overlay directive 
- Removed lorem ipsum text 
- Fixed casing of subtitle
 2018-03-16 18:12:46 +01:00
Sebastiaan Janssen
e3e425695f U4-8724 tinyMceConfig.config customConfig bool not correct deserialized 2018-03-16 16:34:58 +01:00
Mads Rasmussen
2d263447cf lighten border on tree 2018-03-16 08:19:03 +01:00
Shannon
82820284f3 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10 
# Conflicts:
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Features/EnabledFeatures.cs
 2018-03-16 14:30:55 +11:00
Sebastiaan Janssen
5f3090c81e grunt was discontinued in 7.7 and shouldn't exist here any more to avoid confusion 2018-03-15 10:40:40 +01:00
Sebastiaan Janssen
f66e239584 PhantomJs doesn't understand fancy ES6 notation 2018-03-15 10:32:25 +01:00
Sebastiaan Janssen
a465ed415d Rename to javascriptLibraryService 2018-03-15 10:08:00 +01:00
Sebastiaan Janssen
eac9785c45 Apply PR #2507 2018-03-15 10:02:20 +01:00
Sebastiaan Janssen
054a8b48fa Revert PR #2507 - needs to go in 7.10 2018-03-15 09:59:04 +01:00
Sebastiaan Janssen
dfbc3c477a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into pr/2507 2018-03-15 09:38:44 +01:00
Niels Hartvig
57426ae895 Feedback from review. Makes the moment service more generic and changes promises chaining 2018-03-14 11:10:01 +01:00
Shannon
b4aad19573 Revert "Merge pull request #2508 from umbraco/temp-U4-11076" 
This reverts commit 4161d244c1, reversing
changes made to eea87e411f.
 2018-03-14 13:23:33 +11:00
Shannon
1b6c070752 Merge remote-tracking branch 'origin/dev-v7' into temp-UAASSCRUM-1405 2018-03-14 12:56:07 +11:00
Shannon
0e08a56ada Merge branch 'dev-v7' into temp-UAASSCRUM-1405 
# Conflicts:
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Features/EnabledFeatures.cs
 2018-03-14 12:25:37 +11:00