yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,641 Commits 4 Branches 7 Tags
115b0cd2aa6868e6d3ca3676c32e8f90381fb637
Commit Graph

7705 Commits

Author SHA1 Message Date
Stephan
115b0cd2aa Merge branch temp8 into temp8-di2690 2018-12-18 15:42:45 +01:00
Shannon Deminick
2377d3ac11 Merge pull request #3891 from kjac/v8-fix-publish-on-preview 
V8: Don't publish on preview
 2018-12-18 17:24:14 +11:00
Mads Rasmussen
ebc689032d fix dictionary pickers in code editors 2018-12-17 10:48:33 +01:00
Kenn Jacobsen
33b9870aec Only perform save when previewing - not a publish 2018-12-16 21:52:45 +01:00
Stephan
fc620af9d0 Merge branch 'temp8' into temp8-3675-variant-tags 2018-12-12 08:58:25 +01:00
Mads Rasmussen
b19f9c8114 update styling on forms install dashboard 2018-12-11 13:39:12 +01:00
Mads Rasmussen
d06ccebf7c update docs for infinite editing 2018-12-11 13:03:18 +01:00
Mads Rasmussen
27f9490837 fix docs build 2018-12-11 10:14:18 +01:00
Stephan
b6f55d12da Merge branch 'temp8' into temp8-3675-variant-tags 2018-12-11 10:11:27 +01:00
Stephan
046f6f3cd9 Merge branch origin/temp8 into temp8-di2690 2018-12-10 17:49:11 +01:00
Claus
5fb3ccd758 Merge branch 'temp8-3436-relationtypes' into temp8 2018-12-10 14:24:00 +01:00
Mads Rasmussen
c61ac406bb fix fade animation when closing the last infinite editor 2018-12-10 14:20:57 +01:00
Claus
ca0cd8711e minor fixes. 2018-12-10 14:11:02 +01:00
Claus
cfd6a08366 Merge branch '3436-relations-editor' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-3436-relations-editor 2018-12-10 13:27:34 +01:00
Mads Rasmussen
98cc48c0d3 remove infinite editing backdrop when discarding changes 2018-12-10 11:38:43 +01:00
Shannon
86b0ab7dab Fixes the typeahead (mostly) 2018-12-10 17:32:10 +11:00
Shannon
c80a9b1402 Fixes the typeahead (mostly) 2018-12-10 17:26:15 +11:00
Shannon
5d028eea04 Merge branch 'temp8' into temp8-3675-variant-tags 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
 2018-12-10 14:07:20 +11:00
Kenn Jacobsen
939b320971 Fix the OK button for move and close success messages 2018-12-09 17:28:21 +01:00
Kenn Jacobsen
8ff697ad98 Fix the flickering source name and the close button when moving items in the media tree. 2018-12-09 17:26:24 +01:00
Kenn Jacobsen
c00b3e283d Add dirty tracking for slider and datetime 2018-12-09 17:19:40 +01:00
Kenn Jacobsen
e3e3e06458 Markdown editor: Fix the redo button + remove the button hover flicker 2018-12-09 14:29:39 +01:00
Kenn Jacobsen
573db0d142 V8 fix remove custom event directives (#3622) 2018-12-09 14:25:42 +01:00
Kenn Jacobsen
14fd9c835d V8: Fix the media picker folder creation and "sub folders" toggle button (#3630) 2018-12-09 14:17:57 +01:00
Kenn Jacobsen
0c9ecacca0 Undo the leftovers from another issue 2018-12-09 13:51:33 +01:00
Kenn Jacobsen
9b4a580734 Fix the changing source name when moving a node 2018-12-09 13:51:33 +01:00
Kenn Jacobsen
a072278490 Fix the changing source name when copying a node 2018-12-09 13:47:37 +01:00
Kenn Jacobsen
355f02971d Fix the mardown editor button bar in split view 2018-12-09 13:36:40 +01:00
Stephan
ed222510f0 Fixes 2018-12-07 13:24:25 +01:00
Stephan
710ec704b3 Merge branch temp8 into temp8-di2690 2018-12-07 09:52:46 +01:00
Stephan
c62d64a9b7 Merge temp8 into temp8-3675-variant-tags 2018-12-07 09:36:58 +01:00
Stephan
fb4717d31e Merge branch 'temp8-3527-indexes-via-code' into temp8 2018-12-07 09:27:38 +01:00
Sebastiaan Janssen
0095429ff0 Fix package.json after merge 2018-12-07 09:24:15 +01:00
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
Stephan
c74fc7a8f9 Misc cleanup and renaming 2018-12-05 12:57:23 +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
c6a9701e53 Merge branch temp8 into temp8-di2690 2018-12-05 09:05:47 +01:00
Shannon
d549cb8e3d Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code 2018-12-05 17:36:50 +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
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
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