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 |
|
ajugo
|
1e01d1f2b7
|
Fix missing translation for field codes [SCI-7765] (#4826)
|
2023-01-16 10:21:10 +01:00 |
|
artoscinote
|
0747f414eb
|
Merge pull request #4824 from sboursen-scinote/sb_SCI-7736
Position of Experiment and View buttons update [SCI-7736]
|
2023-01-16 10:17:59 +01:00 |
|
artoscinote
|
3ae7da91e0
|
Merge pull request #4822 from sboursen-scinote/sb_SCI_7732
Archiving task from experiment table - connections are lost [SCI-7732]
|
2023-01-16 10:17:43 +01:00 |
|
Giga Chubinidze
|
39280d35b0
|
Filter modal on task table view - placeholder text [SCI-7749]
|
2023-01-16 11:23:54 +04:00 |
|
sboursen-scinote
|
6c52ba70fc
|
Make the state of the my-module-selector checkbox to unchecked for all renaming methods [SCI-7745]
|
2023-01-14 17:17:41 +01:00 |
|
sboursen-scinote
|
9f65073b0d
|
Fix: pressing enter results in error in rename task modal [SCI-7745]
|
2023-01-14 10:52:31 +01:00 |
|
sboursen-scinote
|
622e937ca3
|
Remove redundant activerecord query methodes and rename the reconnnect function [SCI-7732]
|
2023-01-13 17:14:00 +01:00 |
|
ajugo
|
78b4e71d3e
|
Remove double tooltip on task with cloning in progress [SCI-7762] (#4821)
|
2023-01-13 15:34:58 +01:00 |
|
artoscinote
|
12ec63c576
|
Merge pull request #4825 from artoscinote/ma_SCI_7697
Fix merging tables in TinyMCE [SCI-7697]
|
2023-01-13 15:32:39 +01:00 |
|
Martin Artnik
|
14c6c67a1a
|
Fix merging tables in TinyMCE [SCI-7697]
|
2023-01-13 15:29:16 +01:00 |
|
sboursen-scinote
|
6f7e280620
|
Switch the position of the View dropdown and the Experiment dropdown [SCI_7736]
|
2023-01-13 13:54:53 +01:00 |
|
artoscinote
|
80eb1639bc
|
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
Features/tiny mce 6
|
2023-01-13 13:53:03 +01:00 |
|
sboursen-scinote
|
b55ca5b8cf
|
Update Experiment edit button text from 'Edit Workflow' to 'Edit workflow' in Canvas view [SCI_7736]
|
2023-01-13 13:39:49 +01:00 |
|
sboursen-scinote
|
d55e7d256a
|
Fix ruby style issues
|
2023-01-13 12:57:35 +01:00 |
|
sboursen-scinote
|
5d6905564e
|
Merge branch 'develop' into sb_SCI_7732
|
2023-01-13 12:49:47 +01:00 |
|