Commit Graph

7640 Commits

Author SHA1 Message Date
Stephan 159ae136f3 Merge branch 'temp8' into temp8-3675-variant-tags 2018-12-07 08:49:25 +01:00
Shannon 8da992aabf manually merges changed lang files and a few other things 2018-12-07 12:03:33 +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 dd2c43485d Moves tag editor to a component, fixes issue with typeahead and invariant properties, fixes migration to update the IX_cmsTags index correctly 2018-12-06 01:10:53 +11: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
Kenn Jacobsen 9ad69c11cb Fix publish dates issues (#3507) 2018-12-03 18:45:50 +01: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
Warren Buckley 0d6ee927bc Merge remote-tracking branch 'origin/temp8' into temp8-upgrade-dev-dependencies 2018-12-03 11:01:32 +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
Mads Rasmussen 32ed237729 package-lock 2018-12-03 09:48:59 +01:00
Shannon 162b90194d Gets sln building, removes old legacy settings, removes ascx dashboard support 2018-12-03 16:14:49 +11:00
Stephan 18c382d888 in progress tags 2018-11-30 16:30:59 +01: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
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
Mads Rasmussen e4a4a17739 get jquery touch punch from npm 2018-11-28 15:34:51 +01:00
Mads Rasmussen df193987c4 add back jquery-ui and remove jquery-migrate 2018-11-28 15:18:14 +01:00
Mads Rasmussen d0d44bf542 remove unused treepicker overlay 2018-11-28 14:54:01 +01:00
Mads Rasmussen 6fc38b1d12 fix tooltip and overlay calculations 2018-11-28 14:53:39 +01:00
Mads Rasmussen 350bfb3461 remove keypress shorthand 2018-11-28 14:52:49 +01:00
Mads Rasmussen f3d30342b4 change from bind/unbind to on/off 2018-11-28 14:32:30 +01:00
Mads Rasmussen 9c9a05f32c changing from click and focus shorthands 2018-11-28 13:22:30 +01:00
Mads Rasmussen 85d61ee127 remove unused focus search field code 2018-11-28 13:17:08 +01:00
Mads Rasmussen 4e29a3709d upgrade jquery + temp add jquery migrate + temp remove other jquery libraries 2018-11-28 13:16:26 +01:00
Mads Rasmussen f956a035a1 remove jquery validation libraries 2018-11-28 13:12:00 +01:00
Mads Rasmussen 7032f1424d add overlay to tree when infinite editing is open 2018-11-28 10:13:48 +01:00
Kenn Jacobsen d62de961a0 Add a minimum height to the query builder dropdowns 2018-11-27 23:51:14 +01:00
Steve Morgan af6b649845 #3565 - U 7.12.3 - Validation of Value type for Label Data Type
Added a required flag. Seems to now require a selection. Not sure if this will affect anything else that relies on this though?
2018-11-27 23:49:31 +01:00
Kenn Jacobsen 2ae2c3f6f6 Fix the flickering on the data type selector 2018-11-27 23:40:03 +01:00
Kenn Jacobsen 451fb50539 Fix checkbox list mandatory validation 2018-11-27 23:37:29 +01:00
Kenn Jacobsen 8393856b15 Fix dropdown validation (#3504) 2018-11-27 23:36:49 +01:00
Søren Kottal 75be42f8ff Change back to a-tag
Has to be an `<a>` with an empty `href` for the ng-click to fire.
2018-11-27 22:39:02 +01:00
Søren Kottal 7f858899a3 Changes add-button to a button
Makes it possible to tab to the button.
2018-11-27 22:39:02 +01:00