Shannon
|
07f15ec7b3
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
# src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.aspx
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/es.xml
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs
# src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
# src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
# src/umbraco.cms/businesslogic/language/Language.cs
|
2018-12-06 17:13:23 +11:00 |
|
Shannon
|
3be300db09
|
Merge remote-tracking branch 'origin/revert-3745-temp8-tinymce' into temp8
|
2018-12-06 16:44:52 +11:00 |
|
Shannon
|
2216a40d01
|
Merge commit '2a0748fc1e85c468064f309c03b24a43ed42e177' into temp8
|
2018-12-06 16:41:45 +11:00 |
|
Stephan
|
c3d0bee4d3
|
Fix boot issue
|
2018-12-05 17:34:34 +01:00 |
|
Stephan
|
c74fc7a8f9
|
Misc cleanup and renaming
|
2018-12-05 12:57:23 +01:00 |
|
Sebastiaan Janssen
|
f26353a34e
|
Fix broken build
|
2018-12-05 11:00:49 +01:00 |
|
Sebastiaan Janssen
|
901af2be8e
|
Fix docs build
|
2018-12-05 10:44:06 +01:00 |
|
Sebastiaan Janssen
|
f002b371b9
|
Update npm marked reference
|
2018-12-05 10:42:44 +01:00 |
|
Shannon
|
24300e76f9
|
oops committed a config change
|
2018-12-05 17:42:31 +11:00 |
|
Shannon
|
d549cb8e3d
|
Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code
|
2018-12-05 17:36:50 +11:00 |
|
Shannon
|
cb9eec97e2
|
Fixes tests
|
2018-12-05 17:20:48 +11:00 |
|
Shannon
|
11d8d17156
|
Fixes build with ctor change to UmbracoHelper
|
2018-12-05 17:00:51 +11:00 |
|
Shannon
|
1eba69b070
|
Fixes build with ctor change to UmbracoHelper
|
2018-12-05 16:59:33 +11:00 |
|
Shannon
|
b48a7fa4a9
|
Gets search tools working for explicitly defined searchers, have tested with a multi index searcher, refactors SupportsUnpublished vs SupportSoftDelete vs OnlyPublishedContent booleans and made some sense out of the reindexing items in ExamineComponent which didn't really work, cleans up IPublishedContentQuery implementation
|
2018-12-05 16:53:25 +11:00 |
|
Stephan
|
50f4e12ca1
|
Merge pull request #3819 from umbraco/temp8-fix-dashboard-manifest
Refactor package.manifest dashboards JSON structure
|
2018-12-04 12:12:44 +01:00 |
|
Stephan
|
73f31dd800
|
Refactor manifest dashboards, security
|
2018-12-04 11:37:07 +01:00 |
|
Shannon
|
1717f94fcf
|
Gets searching on dashboard working with paging and viewing field values
|
2018-12-04 15:41:54 +11:00 |
|
Shannon
|
56d1a317c0
|
Gets searching working in the dashboard, updates to latest examine
|
2018-12-04 14:25:37 +11:00 |
|
Kenn Jacobsen
|
9ad69c11cb
|
Fix publish dates issues (#3507)
|
2018-12-03 18:45:50 +01:00 |
|
Warren Buckley
|
b361d1c950
|
Refactor package.manifest dashboards JSON structure
|
2018-12-03 14:26:16 +00:00 |
|
Sebastiaan Janssen
|
a8d7660150
|
So close, come on dependencies!
|
2018-12-03 13:30:25 +01:00 |
|
Sebastiaan Janssen
|
0410a788cb
|
One more attempt to fix vulnerable dependencies
|
2018-12-03 13:23:37 +01:00 |
|
Shannon
|
fce5b29b1c
|
index rebuilding updates
|
2018-12-03 23:15:18 +11:00 |
|
Warren Buckley
|
8b5eb1f0a4
|
Merge pull request #2478 from Shazwazza/U4-2827
U4-2827 Allow dashboards via manifest
|
2018-12-03 12:13:12 +00:00 |
|
Sebastiaan Janssen
|
763fda2857
|
Hopefully resolve the rest of the vulnerabilities
|
2018-12-03 13:11:39 +01:00 |
|
Sebastiaan Janssen
|
137439d6eb
|
Fixes the flatmap-stream issue. package-lock went nuts, but couldn't figure it out even with Mads' help :/
|
2018-12-03 12:43:39 +01:00 |
|
elitsa
|
41271c7fab
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2018-12-03 12:38:28 +01:00 |
|
Warren Buckley
|
53df1dfc82
|
Merge pull request #3815 from umbraco/temp8-upgrade-dev-dependencies
Temp8 upgrade dev dependencies
|
2018-12-03 11:19:51 +00:00 |
|
Shannon
|
69c939c444
|
Some cleanup and renames
|
2018-12-03 22:19:35 +11:00 |
|
elitsa
|
3ef4da0615
|
Reverting.
|
2018-12-03 12:15:34 +01:00 |
|
Shannon
|
f8d203abff
|
Updates latest examine + api updates + fixes tests, gets different validation working (valid, failed, filtered)
|
2018-12-03 22:10:56 +11:00 |
|
Warren Buckley
|
0d6ee927bc
|
Merge remote-tracking branch 'origin/temp8' into temp8-upgrade-dev-dependencies
|
2018-12-03 11:01:32 +00:00 |
|
Warren Buckley
|
37eeeba76b
|
Merge pull request #3798 from umbraco/temp8-upgrade-depdendencies
Temp8 upgrade depdendencies
|
2018-12-03 10:07:16 +00:00 |
|
Warren Buckley
|
e4fb2dff96
|
Merge remote-tracking branch 'origin/temp8' into temp8-upgrade-depdendencies
|
2018-12-03 09:39:26 +00:00 |
|
Warren Buckley
|
8b77c5e278
|
Merge pull request #3792 from umbraco/temp8-upgrade-jquery
Temp8 upgrade jquery
|
2018-12-03 09:35:45 +00:00 |
|
Warren Buckley
|
dd7b4669d5
|
Merge pull request #3786 from umbraco/temp8-3651
add overlay to tree when infinite editing is open
|
2018-12-03 09:21:41 +00:00 |
|
Warren Buckley
|
a40a6fbe8f
|
Merge pull request #3783 from umbraco/temp8-3110
Temp8 3110
|
2018-12-03 09:16:33 +00:00 |
|
Matthew Wise
|
673735c2fe
|
Added eslintignore file
|
2018-12-03 09:50:24 +01:00 |
|
Mads Rasmussen
|
32ed237729
|
package-lock
|
2018-12-03 09:48:59 +01:00 |
|
elitsa
|
ae36e02f4c
|
Reverting to the origin.
|
2018-12-03 08:54:08 +01:00 |
|
elitsa
|
3a26fe8fe2
|
Removing malicious code from the name of a Stylesheet.
|
2018-12-03 08:45:11 +01:00 |
|
Shannon
|
774b968112
|
Cleans up the dashboard config that we release
|
2018-12-03 16:55:06 +11:00 |
|
Shannon
|
a5b331f6d7
|
Gets site running with dashboards
|
2018-12-03 16:40:28 +11:00 |
|
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 |
|
James Coxhead
|
df961d9199
|
Merge branch 'temp8' into 3436-relations-editor
# Conflicts:
# src/Umbraco.Web/Trees/RelationTypeTreeController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
|
2018-12-02 23:31:54 +00:00 |
|
James Coxhead
|
c6d09cbcff
|
Split relation type and associated relations into tabbed view
|
2018-12-02 22:53:30 +00:00 |
|
James Coxhead
|
a4f270bd02
|
Added localisation
|
2018-12-02 22:33:15 +00:00 |
|
James Coxhead
|
f87dac9972
|
Remove redundant webforms views
|
2018-12-02 21:56:03 +00:00 |
|
James Coxhead
|
4617c0c24f
|
Tidy up - remove obsoleted classes
|
2018-12-02 18:17:20 +00:00 |
|