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

7678 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
4617c0c24f Tidy up - remove obsoleted classes 2018-12-02 18:17:20 +00:00
James Coxhead
2dfcb8ed4e Completed delete action 2018-12-02 18:10:03 +00:00
James Coxhead
a6ab471505 Added delete endpoint. Updated tree controller to use Angular delete view 2018-11-30 14:09:48 +00: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
Shannon
6103832b8a Gets index rebuilding working 2018-11-30 12:22:23 +11:00
James Coxhead
c3a3f4cf22 Create new relation type 2018-11-29 23:11:03 +00:00
James Coxhead
12d11b7c88 Render create view 
Load object types from API
 2018-11-29 22:07:17 +00:00