scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
14154 commits 70 branches 179 tags 165 MiB
Commit graph

14154 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 3159cfb0e2
Merge pull request #6048 from aignatov-bio/ai-fix-file-name-for-result-orderable 
Fix file name for result orderable
 2023-08-23 11:39:08 +02:00
Anton 3057ddd4cb Fix file name for result orderable 2023-08-23 11:36:53 +02:00
artoscinote 7f6e26b311
Merge pull request #5592 from artoscinote/ma_SCI_8462 
Amend TinyMCE defaults [SCI-8462]
 2023-08-23 11:21:48 +02:00
artoscinote e03920affd
Merge branch 'develop' into ma_SCI_8462 2023-08-23 11:21:32 +02:00
artoscinote b8169f5929
Merge pull request #6047 from artoscinote/ma_SCI_9084 
Fix project public role picker [SCI-9084]
 2023-08-23 11:03:14 +02:00
Martin Artnik 7abfa97224 Fix project public role picker [SCI-9084] 2023-08-23 11:00:58 +02:00
aignatov-bio 73aa04d336
Merge pull request #6042 from aignatov-bio/ai-sci-9090-update-top-navigation-breadcrumbs 
Make top navigation and breadcrumbs collapsable [SCI-9090]
 2023-08-23 10:48:48 +02:00
artoscinote e4ad77f00f
Merge pull request #6043 from G-Chubinidze/gc_SCI_7976 
Fixed gray background on tinymce crop button [SCI-7976]
 2023-08-22 16:35:59 +02:00
Giga Chubinidze 74c1691ae6 Fixed gray background on tinymce crop button 2023-08-22 18:33:09 +04:00
Anton beed1cdb9d Make top navigation and breadcrumbs collapsable [SCI-9090] 2023-08-22 16:24:34 +02:00
artoscinote f60243e424
Merge pull request #6041 from ivanscinote/SCI-9007-update-colors 
Fix 'Not started' status button at missing locations [SCI-9007]
 2023-08-22 15:19:05 +02:00
ivanscinote c8bc4bef01
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737] (#5866) 
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737]
 2023-08-22 14:59:34 +02:00
Ivan Kljun 28adb4956d Add 'Not started' btn to other views 2023-08-22 14:30:49 +02:00
ajugo 9de4d455a5
Merge pull request #6018 from wandji20/wb-SCI-9078 
Hide welcome modal after initial page load shareable links [SCI-9078]
 2023-08-22 14:10:57 +02:00
aignatov-bio c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements 
Add element movements between step and results [SCI-9024]
 2023-08-22 12:26:57 +02:00
artoscinote 8ba9b2df6a
Merge pull request #6038 from artoscinote/ma_SCI_9084 
Fix visibility checkbox for project edit modal [SCI-9084]
 2023-08-22 12:25:34 +02:00
wandji20 87f7a74e02 Use shareable link uuid for setting session storage value [SCI-9078] 2023-08-22 11:21:05 +01:00
Anton e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Martin Artnik 75bad0e8bc Fix visibility checkbox for project edit modal [SCI-9084] 2023-08-22 12:05:32 +02:00
wandji20 d46e80ba9b Hide welcome modal using sessionStorage after first page load of shared link [SCI-9078] 2023-08-22 10:59:02 +01:00
artoscinote ea3984776c
Merge pull request #6037 from artoscinote/ma_SCI_9084 
Fix edit project modal [SCI-9084]
 2023-08-22 11:06:14 +02:00
Martin Artnik 82f490b445 Fix edit project modal [SCI-9084] 2023-08-22 11:04:34 +02:00
Alex Kriuchykhin dbbc5775d4
Add unit column to ledger records, fix stock update records and their creation logic [SCI-9021] (#6034) 2023-08-22 10:47:58 +02:00
ajugo 9f3e9b1929
Merge pull request #6036 from rekonder/aj_SCI_9086 
Fix TinyMCE help plugin language inclusion [SCI-9086]
 2023-08-22 10:37:20 +02:00
Andrej 35ecd064d2 Fix tinymce help plugin language inclusion [SCI-9086] 2023-08-22 10:24:45 +02:00
G-Chubinidze 1253511020
Merge pull request #6035 from G-Chubinidze/gc_SCI_9014 
Add thumbnail asset preview to list view assets [SCI-9014]
 2023-08-22 12:22:06 +04:00
Giga Chubinidze 76479f6bf7 hound fix 2023-08-22 06:02:30 +04:00
Giga Chubinidze c699095d1a Add thumbnail asset preview to list view assets [SCI-9014] 2023-08-22 05:55:20 +04:00
Soufiane 6bce3b40df
FIX: Shared task fails to load sometimes [SCI-9052] (#6027) 2023-08-21 16:47:18 +02:00
wandji 1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031) 
* Fix css UI issues for shareable links task sharing [SCI-9080]
 2023-08-21 16:07:38 +02:00
artoscinote 2e55181510
Merge pull request #6033 from artoscinote/ma_SCI_8994 
Fix issues with repository columns [SCI-8994][SCI-8846]
 2023-08-21 16:07:00 +02:00
Martin Artnik 5312ddbff6 Fix issues with repository columns [SCI-8994][SCI-8846] 2023-08-21 15:59:17 +02:00
aignatov-bio 785a572b16
Merge pull request #6032 from aignatov-bio/ai-sci-8536-fix-long-task-names 
Fix bootstrap in report [SCI-9085]
 2023-08-21 15:36:48 +02:00
Anton 0161277380 Fix bootstrap in report [SCI-9085] 2023-08-21 15:26:58 +02:00
Oleksii Kriuchykhin 10a0ba9739 Bump version to 1.28.0.1 2023-08-21 14:09:05 +02:00
artoscinote 8f24e90ee4
Merge pull request #6030 from wandji20/wb-SCI-9074 
Fix css issue protocol template author edit [SCI-9074]
 2023-08-21 12:58:23 +02:00
artoscinote 6f5ef60ab1
Merge pull request #5733 from G-Chubinidze/gc_SCI_8727 
Project card permission with not assigned team admin [SCI-8727]
 2023-08-21 12:19:28 +02:00
G-Chubinidze afdfec5f71
Update projects_service.rb 2023-08-21 14:13:00 +04:00
Giga Chubinidze a391e6e6e1 changed loop 2023-08-21 14:08:17 +04:00
artoscinote d8da463dc2
Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal 
Move blur event to whole modal at Share task [SCI-9008]
 2023-08-21 12:04:54 +02:00
wandji20 b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01:00
artoscinote 00167e30b0
Merge pull request #6029 from artoscinote/ma_SCI_8422 
Fix filtering of template tags [SCI-8422]
 2023-08-21 11:56:28 +02:00
Ivan Kljun 5902ee28e1 Remove blur event function as it is redundant 2023-08-21 11:52:57 +02:00
Martin Artnik fc18c76efd Fix filtering of template tags [SCI-8422] 2023-08-21 11:44:01 +02:00
ajugo 95e6006c6a
Merge pull request #6026 from rekonder/aj_SCI_9077 
Fix scrolling of the shareable links layout [SCI-9077]
 2023-08-21 11:36:44 +02:00
Anton 0780ed17b0 Fix conflicts 2023-08-21 11:34:34 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
aignatov-bio 58eaaf98b9
Merge pull request #6028 from aignatov-bio/ai-sci-8536-fix-long-task-names 
Fix long task names [SCI-8536]
 2023-08-21 11:18:53 +02:00
Anton d135c86f70 Fix long task names [SCI-8536] 2023-08-21 11:17:09 +02:00
artoscinote de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559 
Fix CSS Issues[SCI-8559]
 2023-08-21 11:05:38 +02:00