Stephan
|
e6bff12337
|
Merge branch temp8 into feature/IContentType-removale-from-IContent
|
2019-01-17 13:33:55 +01:00 |
|
Stephan
|
2c3b65c8b1
|
Fix migrations from 7.14
|
2019-01-17 13:24:19 +01:00 |
|
Chris Houston
|
941ede776b
|
Corrected all the miss spellings of:
Seperator -> Separator
Seperate -> Separate
|
2019-01-17 13:16:43 +01:00 |
|
Kenn Jacobsen
|
57b8a187b8
|
Add "Move" option for deleted items in the media tree
|
2019-01-17 12:27:42 +01:00 |
|
Sebastiaan Janssen
|
98fe3e823c
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
# src/Umbraco.Web.UI.Client/src/views/media/restore.html
|
2019-01-17 12:22:01 +01:00 |
|
Kenn Jacobsen
|
77cf071e04
|
Add "Move" option for deleted items in the media tree (#3914)
|
2019-01-17 12:20:13 +01:00 |
|
Sebastiaan Janssen
|
0d0179cb47
|
Use constants in upgrade migration
|
2019-01-17 12:14:17 +01:00 |
|
Sebastiaan Janssen
|
effed9efa7
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2019-01-17 12:08:27 +01:00 |
|
Sebastiaan Janssen
|
e6a99c5097
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
# src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
# src/Umbraco.Web/Scheduling/ScheduledTasks.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
|
2019-01-17 12:05:56 +01:00 |
|
Shannon
|
67c571fb28
|
Fixes tests
|
2019-01-17 10:56:24 +11:00 |
|
Stephan
|
5f7bf3a211
|
Ignore failing test
|
2019-01-16 17:04:15 +01:00 |
|
Shannon Deminick
|
c9ddd783f9
|
Merge pull request #4080 from umbraco/temp8-auto-install
install for Deploy
|
2019-01-17 01:44:27 +11:00 |
|
Shannon
|
899bb812aa
|
Creates RuntimeStateOptions and pre-loads the error page on the installer
|
2019-01-17 01:42:56 +11:00 |
|
Stephan
|
3ed1b44710
|
Try to bugfix a failing test
|
2019-01-16 15:21:10 +01:00 |
|
Shannon
|
c5da10cf10
|
Merge remote-tracking branch 'origin/temp8' into temp8-auto-install
|
2019-01-17 00:45:25 +11:00 |
|
Stephan
|
d170e4b5c3
|
Merge branch 'temp8-packages-ui' into temp8
|
2019-01-16 13:52:24 +01:00 |
|
Stephan
|
9f41457f45
|
Public composition.UrlProviders
|
2019-01-16 13:44:19 +01:00 |
|
Stephan
|
ba84d95308
|
Merge branch 'temp8' into temp8-packages-ui
|
2019-01-16 13:27:14 +01:00 |
|
Stephan
|
b5bda0b637
|
Some things have to be public for service events
|
2019-01-16 13:26:30 +01:00 |
|
Stephan
|
a60bdf5c01
|
HttpContext VariationContextAccessor fails nicely
|
2019-01-16 13:26:13 +01:00 |
|
Stephan
|
8347fd79a3
|
Reviewing packages PR, various fixes
|
2019-01-16 13:20:49 +01:00 |
|
Bjarke Berg
|
5f3596c7d9
|
Fixes after merge of temp8
|
2019-01-16 13:11:46 +01:00 |
|
Bjarke Berg
|
4ccc468cb6
|
Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent
# Conflicts:
# src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
|
2019-01-16 12:53:58 +01:00 |
|
Stephan
|
da079cf393
|
Merge branch 'temp8' into temp8-packages-ui
|
2019-01-16 10:42:52 +01:00 |
|
Stephan
|
d0016d6a7e
|
Upgrade to MB -alpha.33 supporting elements
|
2019-01-16 10:40:04 +01:00 |
|
Stephan
|
f56e2f0c72
|
Merge branch temp8 into temp8-packages-ui
|
2019-01-16 10:02:43 +01:00 |
|
Stephan
|
26b31f1fc8
|
Fix Git repository issue with casing of some filepaths
|
2019-01-16 10:01:04 +01:00 |
|
Stephan
|
ef3b542ff3
|
Merge branch temp8 into temp8-packages-ui
|
2019-01-16 08:54:40 +01:00 |
|
Stephan
|
8f9813d597
|
Merge branch 'temp8' into temp8-auto-install
|
2019-01-16 08:34:46 +01:00 |
|
Shannon
|
e8dead52c7
|
renames tests
|
2019-01-16 17:43:12 +11:00 |
|
Shannon
|
94da9a6681
|
Gets package upgrading working along with package uninstallation with multiple versions
|
2019-01-16 17:25:46 +11:00 |
|
Shannon
|
90be93d948
|
Got upgrade status showing in the ui, started implementing merging the package definitions for upgrades but have decided to have an element for each install like we currenlty have in case there are problems installing.
|
2019-01-16 16:27:51 +11:00 |
|
Stephan
|
d4edbc8e79
|
Fix tests
|
2019-01-15 19:38:52 +01:00 |
|
Stephan
|
eb3d3e129c
|
Bugfix package service
|
2019-01-15 19:15:06 +01:00 |
|
Stephan
|
4770756621
|
Bugfix ContentCacheRefresher
|
2019-01-15 18:41:02 +01:00 |
|
Stephan
|
1bd5127bcf
|
Actually run HealthCheck notifier
|
2019-01-15 17:27:18 +01:00 |
|
Shannon
|
00e951c394
|
fixes installer with async
|
2019-01-16 02:35:21 +11:00 |
|
Shannon
|
d97b100bab
|
fixes merge
|
2019-01-16 02:18:02 +11:00 |
|
Shannon
|
b34582b35c
|
Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui
# Conflicts:
# src/Umbraco.Core/Services/Implement/PackagingService.cs
|
2019-01-16 02:00:44 +11:00 |
|
Shannon
|
b7c15dc393
|
gets readme and our package install working
|
2019-01-16 01:53:08 +11:00 |
|
Robert
|
561ce94398
|
Merge pull request #3933 from umbraco/temo8-3895-infinite-editor-shortcut
Close an infinite editor through Escape key
|
2019-01-15 15:43:43 +01:00 |
|
Robert
|
f9cd22d908
|
Added a comment explaining why we need the delay
|
2019-01-15 15:43:10 +01:00 |
|
Bjarke Berg
|
be02d33fd6
|
Merge pull request #4082 from umbraco/temp8-elements-again
Merged
|
2019-01-15 15:15:48 +01:00 |
|
Bjarke Berg
|
0b9705ca3f
|
Revert "Revert "Support IContentType.IsElement""
This reverts commit a5efc25c
|
2019-01-15 15:13:10 +01:00 |
|
Bjarke Berg
|
11ffafacdf
|
Revert "Revert "Identify element types""
This reverts commit ff6a9ba9
|
2019-01-15 15:12:59 +01:00 |
|
Bjarke Berg
|
0436fb3699
|
Merge pull request #4081 from umbraco/tem8-elements-again
unrevert of Identify "element" content types. #4076
|
2019-01-15 15:07:47 +01:00 |
|
Bjarke Berg
|
5995a7ec84
|
a small change to let Git see changes
|
2019-01-15 15:05:04 +01:00 |
|
Shannon
|
20d6a3b4b4
|
some cleanup and ensure the package file is deleted after install
|
2019-01-16 01:02:21 +11:00 |
|
Shannon
|
db2a003444
|
change how the install status works, fixes infinite loop
|
2019-01-16 00:54:25 +11:00 |
|
Shannon
|
709df804e5
|
Updates tests and better type support for importing content
|
2019-01-16 00:13:40 +11:00 |
|