Shannon
|
162b90194d
|
Gets sln building, removes old legacy settings, removes ascx dashboard support
|
2018-12-03 16:14:49 +11:00 |
|
Shannon
|
953f37f2db
|
Merge remote-tracking branch 'umbraco/temp8' into U4-2827
# Conflicts:
# src/Umbraco.Core/Manifest/ManifestBuilder.cs
# src/Umbraco.Core/Manifest/ManifestParser.cs
# src/Umbraco.Core/Manifest/PackageManifest.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/SectionController.cs
|
2018-12-03 15:25:31 +11:00 |
|
Stephan
|
ec3fd890ec
|
Merge pull request #3761 from kjac/v8-fix-move-copy-status-type-ysod
V8: Fix YSODs when moving and copying things in the Settings section
|
2018-11-28 21:45:15 +01:00 |
|
Kenn Jacobsen
|
d62de961a0
|
Add a minimum height to the query builder dropdowns
|
2018-11-27 23:51:14 +01:00 |
|
Kenn Jacobsen
|
8e423d9c75
|
Sort the dictionary items alphabetically
|
2018-11-27 22:43:19 +01:00 |
|
Jannik Anker
|
80f9fed3f3
|
Pointed "unfinished tasks" link to Github
Link points to open tasks with v8 label. Not sure if "known issues" link also has a Github equivalent?
|
2018-11-27 21:00:03 +01:00 |
|
Robert
|
2d30e57617
|
Merge pull request #3778 from umbraco/temp8-3777
When a node is opened through a content picker don't allow editing do…
|
2018-11-27 11:41:13 +01:00 |
|
Warren Buckley
|
7c5f5e873d
|
Merge pull request #3621 from umbraco/temp8-controllers
Refactor/fix registering controllers
|
2018-11-27 10:18:28 +00:00 |
|
Stephan
|
e47566ca4e
|
Fix build
|
2018-11-27 10:49:41 +01:00 |
|
Mads Rasmussen
|
c0f5158b03
|
When a node is opened through a content picker don't allow editing doc type and template
|
2018-11-27 09:58:57 +01:00 |
|
Robert
|
3f75274283
|
Merge pull request #3766 from umbraco/temp8-remove-bootstrap-slider
Temp8 remove bootstrap slider
|
2018-11-27 09:51:08 +01:00 |
|
Robert
|
4f7b9cd61a
|
Update umbrangeslider.directive.js
Updated comment
|
2018-11-27 09:50:22 +01:00 |
|
Stephan
|
13f6469590
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-11-27 09:45:07 +01:00 |
|
Stephan
|
d2a474f6ff
|
ContentService should remain public for now
|
2018-11-27 09:44:08 +01:00 |
|
Warren Buckley
|
0983726b85
|
Forgot to update the nuspec for the Serilog.Settings.AppSettings nuspec minor version upgrade
|
2018-11-26 15:17:15 +00:00 |
|
Warren Buckley
|
58b1c9e9fb
|
Update Serilog.Settings.AppSettings Nupkg reference from 2.1.2 to 2.2.2 in Umbraco.Core
|
2018-11-26 15:03:39 +00:00 |
|
Mads Rasmussen
|
f8068801af
|
add docs
|
2018-11-26 15:12:38 +01:00 |
|
Stephan
|
27c2b3ba5e
|
Cleanup
|
2018-11-26 14:43:19 +01:00 |
|
Mads Rasmussen
|
99c5fdbd9d
|
Merge branch 'temp8' into temp8-remove-bootstrap-slider
|
2018-11-26 14:30:17 +01:00 |
|
Mads Rasmussen
|
d314361996
|
delete bootstrap slider javascript and css files
|
2018-11-26 14:28:51 +01:00 |
|
Robert
|
334fd778dd
|
Merge pull request #3723 from umbraco/temp8-remove-bootstrap-datepicker
Temp8 remove bootstrap datepicker
|
2018-11-26 14:23:48 +01:00 |
|
Mads Rasmussen
|
d6b24ac92d
|
Merge branch 'temp8' into temp8-remove-bootstrap-slider
# Conflicts:
# src/Umbraco.Web.UI.Client/package.json
|
2018-11-26 14:10:57 +01:00 |
|
Mads Rasmussen
|
a7e53be079
|
Merge branch 'temp8' into temp8-remove-bootstrap-datepicker
|
2018-11-26 13:57:52 +01:00 |
|
Mads Rasmussen
|
16b57ac022
|
remove bootstrap logic from slider controller
|
2018-11-26 13:46:47 +01:00 |
|
Mads Rasmussen
|
e169de917d
|
remove unused config
|
2018-11-26 11:53:52 +01:00 |
|
Mads Rasmussen
|
6257416c4a
|
remove a bunch of slider prevalues.
|
2018-11-26 11:38:15 +01:00 |
|
Mads Rasmussen
|
f4728e5b83
|
add custom styling + add pips
|
2018-11-26 11:18:23 +01:00 |
|
Kenn Jacobsen
|
fee968b94e
|
Make MoveOperationStatusType of underlying type byte to fix move and copy YSODs
|
2018-11-26 08:19:49 +01:00 |
|
Bjarke Berg
|
31b4e944e7
|
Fixed issue where tree root was not shown when moving items. Pair programming with @mads
|
2018-11-23 13:57:26 +01:00 |
|
Mads Rasmussen
|
e54e1989ba
|
format numbers to not have decimals
|
2018-11-22 10:52:48 +01:00 |
|
Mads Rasmussen
|
f24a347b01
|
load in new slider + basic setup
|
2018-11-22 10:06:00 +01:00 |
|
Shannon
|
77f855a649
|
Removes a ton of duplicate code
|
2018-11-22 17:46:49 +11:00 |
|
Shannon
|
08dc94a535
|
Merge branch 'temp8' into temp-tinymce
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
|
2018-11-22 15:38:58 +11:00 |
|
Shannon
|
57074d3545
|
some code cleanup
|
2018-11-22 15:26:10 +11:00 |
|
Shannon
|
3947a471be
|
Fixes tree sync with sorting media
|
2018-11-21 16:59:23 +11:00 |
|
Shannon
|
fda327a604
|
removes $routeParams from a dependency on content.resource, fixes event ordering during nav init, fixes tree re-syncing after sorting, removes some obsolete/old code
|
2018-11-21 16:40:13 +11:00 |
|
Stephan
|
64dd7c113c
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-11-20 15:19:07 +01:00 |
|
Stephan
|
e056f1b282
|
Fix tests
|
2018-11-20 15:17:01 +01:00 |
|
Mads Rasmussen
|
d754aa94c0
|
Merge branch 'temp8' into temp8-remove-bootstrap-datepicker
|
2018-11-20 13:18:46 +01:00 |
|
Mads Rasmussen
|
219b38ff77
|
fix authorize upgrade screen
|
2018-11-20 12:33:26 +01:00 |
|
Mads Rasmussen
|
b685c04c51
|
Merge branch 'temp8' into temp8-remove-bootstrap-datepicker
|
2018-11-20 11:52:02 +01:00 |
|
Shannon
|
63470c80dd
|
fixes build
|
2018-11-20 20:28:17 +11:00 |
|
Shannon Deminick
|
e8e6374c95
|
Merge pull request #3693 from umbraco/temp8-3096-angular-bulk-publish
Angular bulk publishing integration
|
2018-11-20 19:38:12 +11:00 |
|
Shannon
|
9e7384a330
|
Merge branch 'temp8' into temp8-3096-angular-bulk-publish
# Conflicts:
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
|
2018-11-20 19:37:39 +11:00 |
|
Shannon
|
d2a61e5b9c
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-11-20 19:31:08 +11:00 |
|
Shannon
|
82e7be4ae9
|
Fixes creating content type collections
|
2018-11-20 18:43:41 +11:00 |
|
Stephan
|
8aaa75778e
|
Cleanup
|
2018-11-20 08:35:28 +01:00 |
|
Stephan
|
5f8e46e3cd
|
Merge branch 'temp8' into temp8-3713
|
2018-11-20 08:15:26 +01:00 |
|
Shannon
|
fad566afba
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
|
2018-11-20 18:14:36 +11:00 |
|
Shannon
|
3dfa3eaac7
|
fixes media picker svg handling to only use a single IMG tag, else this resulted in a number of 404's with invalid paths like [Object,object]
|
2018-11-20 18:13:19 +11:00 |
|