Shannon
|
219a236069
|
removes unused lang keys
|
2018-12-07 12:06:16 +11:00 |
|
Shannon
|
8da992aabf
|
manually merges changed lang files and a few other things
|
2018-12-07 12:03:33 +11:00 |
|
Shannon
|
f671f41f7c
|
removes commented out Relation type editor and the unused/disabled xml health check
|
2018-12-06 17:25:24 +11:00 |
|
Shannon
|
3e95d94726
|
fixes build
|
2018-12-06 17:24:06 +11:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
elitsa
|
3ef4da0615
|
Reverting.
|
2018-12-03 12:15:34 +01: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 |
|
Anders Bjerner
|
5f165d23db
|
Link picker overlay: Changed the order of execution to avoid an unnecessary delay
|
2018-11-30 10:38:36 +01:00 |
|
Mads Rasmussen
|
704a1ee840
|
upgrade dev-dependencies
|
2018-11-30 09:12:58 +01:00 |
|
Mads Rasmussen
|
80afcb64e0
|
remove bootstrap javascript
|
2018-11-29 15:10:11 +01:00 |
|
Mads Rasmussen
|
3a839ca1ef
|
don't ship with moments libraries including locales
|
2018-11-29 14:24:15 +01:00 |
|
Mads Rasmussen
|
45feb9577d
|
get spectrum color picker from npm + get latest version
|
2018-11-29 13:30:37 +01:00 |
|
Mads Rasmussen
|
9f557d5697
|
fix color picker model.value
|
2018-11-29 13:03:43 +01:00 |
|
Mads Rasmussen
|
5a33990a74
|
fix js error in diff + break words
|
2018-11-29 12:29:52 +01:00 |
|
Mads Rasmussen
|
89cac781ae
|
fix checkmark when copying password
|
2018-11-29 11:01:50 +01:00 |
|
Mads Rasmussen
|
aa9950ff29
|
fix assets service
|
2018-11-29 11:01:21 +01:00 |
|
Mads Rasmussen
|
1daddf484c
|
update npm for packages not running latest
|
2018-11-29 11:00:09 +01: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 |
|
Mads Rasmussen
|
44478201cf
|
update package-lock
|
2018-11-28 20:47:02 +01:00 |
|
Mads Rasmussen
|
e512ba0b8b
|
remove css for jquery-ui
|
2018-11-28 20:40:40 +01:00 |
|
Laura W
|
9ecc0f35f8
|
Saving content id against initial SavePublish action
|
2018-11-28 16:09:07 +01:00 |
|