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

11905 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Artnik fb4cbad4e8 Add tinymce image permission checks [SCI-7788] 2023-01-20 10:45:56 +01:00
Alex Kriuchykhin 58be66a06c
Merge pull request #4855 from okriuchykhin/ok_SCI_7779 
Fix icons in custom tinyMCE menu [SCI-7779]
 2023-01-19 13:21:35 +01:00
ajugo 6110068026
Fix protocols.io import [SCI-7791] (#4861) 2023-01-19 13:09:48 +01:00
artoscinote c1c8425a93
Merge pull request #4857 from artoscinote/ma_SCI_7778 
Fix text result creation [SCI-7778]
 2023-01-19 13:02:12 +01:00
artoscinote 20dee016ab
Merge pull request #4860 from artoscinote/ma_SCI_7780 
Initialize task provisioning polling on table page load [SCI-7780]
 2023-01-19 13:01:31 +01:00
aignatov-bio d6bbdac2bb
Merge pull request #4862 from aignatov-bio/ai-sci-7782-fix-excel-tables-in-tinymce 
Fix table overflow for TinyMCE [SCI-7782]
 2023-01-19 12:59:20 +01:00
Anton a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
Martin Artnik 8f97b8ad93 Initialize task provisioning polling on table page load [SCI-7780] 2023-01-19 12:35:24 +01:00
ajugo d64ccb441e
Fix bullet points and blocks in tinyMCE fields [SCI-7777][SCI-7785] (#4859) 2023-01-19 11:39:14 +01:00
Martin Artnik 6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
Oleksii Kriuchykhin a6abc9d7e5 Fix icons in custom tinyMCE menu [SCI-7779] 2023-01-18 16:43:50 +01:00
Alex Kriuchykhin 1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638 
Improve loading speed of inventory table [SCI-7638]
 2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
Alex Kriuchykhin f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703 
Improve handling of db locks [SCI-7703]
 2023-01-18 10:24:52 +01:00
Alex Kriuchykhin 3466a67de1
Merge pull request #4838 from okriuchykhin/ok_SCI_7743 
Fix tags editing for archived tags [SCI-7743]
 2023-01-17 17:31:02 +01:00
Oleksii Kriuchykhin 3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
artoscinote 27ec967f11
Merge pull request #4849 from artoscinote/ma_SCI_7737 
Always use e.currentTarget [SCI-7737]
 2023-01-17 16:24:18 +01:00
Martin Artnik e0fff38d49 Always use e.currentTarget [SCI-7737] 2023-01-17 16:13:19 +01:00
aignatov-bio 42bf090eb3
Merge pull request #4846 from aignatov-bio/ai-sci-7540-improve-microinteracitons-experiment-table 
Improve microinteractions in experiment table [SCI-7540]
 2023-01-17 15:13:00 +01:00
aignatov-bio 5cbaf83067
Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation 
Fix user designation on task creation [SCI-7758]
 2023-01-17 15:12:46 +01:00
artoscinote c7dc9efe10
Merge pull request #4847 from artoscinote/ma_SCI_7774 
Fix copying and pasting TinyMCE images [SCI-7774]
 2023-01-17 14:48:50 +01:00
Martin Artnik 5f7976ce0e Fix copying and pasting TinyMCE images [SCI-7774] 2023-01-17 14:32:25 +01:00
Anton f6fe827326 Improve microinteractions in experiment table [SCI-7540] 2023-01-17 13:40:30 +01:00
aignatov-bio 8a4599bed1
Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling 
Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]
 2023-01-17 13:34:13 +01:00
Anton 3b6590b8c7 Fix user designation on task creation [SCI-7758] 2023-01-17 13:33:04 +01:00
artoscinote 7c0e3865cf
Merge pull request #4829 from G-Chubinidze/gc_SCI_7749 
Filter modal on task table view - placeholder text [SCI-7749]
 2023-01-17 13:25:37 +01:00
Alex Kriuchykhin 91d5e9a72c
Merge pull request #4839 from okriuchykhin/team_deletion_fix 
Fix team data deletion, add user assignments deletion for PET
 2023-01-17 13:24:50 +01:00
Alex Kriuchykhin b05b781496
Merge pull request #4835 from okriuchykhin/rails_6_1_7 
Update Rails to 6.1.7
 2023-01-17 13:24:38 +01:00
ajugo bf5e0da17a
Fix field codes dropdown for label templates [SCI-7770] (#4837) 2023-01-17 12:50:17 +01:00
artoscinote 7eff083bb7
Merge pull request #4844 from artoscinote/ma_SCI_5098 
Properly assign team to tinymce asset when extracting base64 images [SCI-5098]
 2023-01-17 10:50:43 +01:00
Martin Artnik 76025a4883 Properly assign team to tinymce asset when extracting base64 images [SCI-5098] 2023-01-17 10:49:08 +01:00
artoscinote cc4a8bf8be
Merge pull request #4841 from sboursen-scinote/sb_SCI-7737 
Fix: Incorrect icons & double scrollbar displayed when resizing the window [SCI-7737]
 2023-01-17 09:44:12 +01:00
sboursen-scinote 3a185ae416 Remove trailing whitespace from scss file [SCI-7737] 2023-01-16 20:08:18 +01:00
artoscinote fd4fb6852a
Merge pull request #4842 from artoscinote/ma_SCI_5098 
Fix extraction of TinyMCE images [SCI-5098]
 2023-01-16 16:40:12 +01:00
Martin Artnik db76272602 Fix extraction of TinyMCE images [SCI-5098] 2023-01-16 16:35:36 +01:00
sboursen-scinote 7b489dd59e Display only icons for action buttons in small screens less than 1000px [SCI-7737] 2023-01-16 16:26:37 +01:00
artoscinote dcd603458d
Merge pull request #4840 from artoscinote/ma_SCI_5098 
Fix parsing of RTE images [SCI-5098]
 2023-01-16 16:22:16 +01:00
Martin Artnik 7cb639524b Fix parsing of RTE images [SCI-5098] 2023-01-16 16:07:14 +01:00
Oleksii Kriuchykhin 2d8392f6c0 Fix team data deletion, add user assignments deletion for PET 2023-01-16 15:10:15 +01:00
Oleksii Kriuchykhin e20001dddb Fix tags editing for archived tags [SCI-7743] 2023-01-16 15:03:33 +01:00
Anton 3eb18a7cf4 Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730] 2023-01-16 13:03:25 +01:00
aignatov-bio 8dca8e858f
Merge pull request #4836 from aignatov-bio/ai-sci-7742-update-canvas-comments 
Update comments in canvas [SCI-7742]
 2023-01-16 12:57:31 +01:00
Anton e41238a590 Update comments in canvas [SCI-7742] 2023-01-16 12:40:44 +01:00
Martin Artnik a043bf2cd3 Fix tinymce images for blank texts [SCI-5098] 2023-01-16 12:00:00 +01:00
aignatov-bio 4f952e69b6
Merge pull request #4834 from aignatov-bio/ai-sci-7758-hide-assigned-users-for-users-without-permissions 
Hide assigned users for user without permissions [SCI-7758]
 2023-01-16 11:34:50 +01:00
Oleksii Kriuchykhin 575ed23530 Update Rails to 6.1.7 2023-01-16 11:31:18 +01:00
Anton e48657768d Hide assigned users for user without permissions [SCI-7758] 2023-01-16 11:28:47 +01:00
artoscinote e492c5df85
Merge pull request #4833 from artoscinote/ma_SCI_5098 
Fix legacy tinymce step issues [SCI-5098]
 2023-01-16 11:15:08 +01:00
Martin Artnik a513951a7c Fix legacy tinymce step issues [SCI-5098] 2023-01-16 10:58:37 +01:00
ajugo 56fb8a4efa
Fix hoover tooltip for company logo [SCI-7766] (#4827) 2023-01-16 10:23:34 +01:00