Mads Rasmussen
|
f8068801af
|
add docs
|
2018-11-26 15:12:38 +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 |
|
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 |
|
Shannon
|
e6718c6989
|
more manual merging
|
2018-11-20 17:44:24 +11:00 |
|
Shannon
|
bc66d4cbc6
|
manually merges list view changes with new blueprint functionality, manually merges other files, fixes issue with Action drop down in v8
|
2018-11-20 17:00:37 +11:00 |
|
Shannon
|
d5a8e7751b
|
Removes the word "Kim" from the list view
|
2018-11-20 15:25:02 +11:00 |
|
Shannon
|
96d7cca68d
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
|
2018-11-20 14:12:26 +11:00 |
|
Shannon
|
b4c2c8bd74
|
manually merging
|
2018-11-20 14:11:35 +11:00 |
|
Shannon
|
9ae4d1cdf5
|
fixes how the grid rte resizes when a tab changes to use the proper event handler
|
2018-11-20 14:10:20 +11:00 |
|
Shannon
|
80070e7332
|
Fixes how the new move method on MediaService deals with event messages
|
2018-11-20 12:20:16 +11:00 |
|
Shannon
|
f7f81945a0
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-11-20 11:51:59 +11:00 |
|
Shannon Deminick
|
c981f5e1b0
|
Merge pull request #3711 from aaronpowell/temp8-3710
Fixes 3710: Removing the usage of HostingEnvironment.MapPath
|
2018-11-20 11:31:26 +11:00 |
|
Mads Rasmussen
|
bd23cbed20
|
null checks clean up debug data
|
2018-11-19 15:50:11 +01:00 |
|
Mads Rasmussen
|
0f07e6830d
|
delete bootstrap datepicker files
|
2018-11-19 14:56:27 +01:00 |
|
Mads Rasmussen
|
301cc00e10
|
use flatpickr in query builder
|
2018-11-19 14:29:35 +01:00 |
|
Mads Rasmussen
|
d6bd5e7e85
|
change query builder dropdowns to umb dropdowns
|
2018-11-19 14:14:37 +01:00 |
|
Mads Rasmussen
|
477a9bae0e
|
use umb dropdown instead of boostrap dropdown in permissions context menu
|
2018-11-19 13:15:28 +01:00 |
|
Mads Rasmussen
|
138895d5e7
|
use umb dropdown component for actions menu
|
2018-11-19 12:48:31 +01:00 |
|
Mads Rasmussen
|
5e4770fd8c
|
use umbraco components instead of bootstrap for button groups
|
2018-11-19 12:47:30 +01:00 |
|
Mads Rasmussen
|
24913128d1
|
add option to show a caret in a umb-button
|
2018-11-19 12:42:27 +01:00 |
|
Aaron Powell
|
8a809fe97a
|
Pushing crash handling on app domain into CoreRuntime
|
2018-11-19 22:02:51 +11:00 |
|