Commit graph

9276 commits

Author SHA1 Message Date
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
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
Anton
e48657768d Hide assigned users for user without permissions [SCI-7758] 2023-01-16 11:28:47 +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
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
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
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
sboursen-scinote
b37a8d1c18 Fix connection is lost after a connected task is archived [SCI-7732] 2023-01-13 12:48:36 +01:00
ajugo
1dae0f90ae
Add copy activitiy for experiment table view [SCI-7754] (#4820) 2023-01-13 12:48:35 +01:00
artoscinote
aceedd0a14
Merge pull request #4818 from G-Chubinidze/gc_SCI_7651
no results state updates [SCI-7651]
2023-01-13 11:58:26 +01:00
Alex Kriuchykhin
d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo
Features/label template logo
2023-01-13 11:58:01 +01:00
ajugo
4b3b88fad8
Fix task access modal for user role [SCI-7712] (#4817) 2023-01-13 11:50:42 +01:00
Giga Chubinidze
f7fe30fdae no results state updates 2023-01-13 14:49:58 +04:00
artoscinote
f5abf0d6b6
Merge pull request #4814 from artoscinote/ma_SCI_7584
Fix touching of protocol when changes happen [SCI-7584]
2023-01-13 10:37:11 +01:00
ajugo
35b5041846
Add wopi net zone environment variable [SCI-7753] (#4815) 2023-01-13 10:19:14 +01:00
ajugo
d8adbb1d3d
Implement completed and due date changes [SCI-7725] (#4816) 2023-01-13 10:18:35 +01:00
ajugo
8303265361
Fix switching between experiment views [SCI-7756] (#4813) 2023-01-13 10:15:48 +01:00
aignatov-bio
35d46e6cd4
Merge pull request #4812 from aignatov-bio/ai-sci-7755-remove-warning-icon-for-completed-tasks
Experiment table - remove warning icon from due date for completed tasks [SCI-7755]
2023-01-13 10:13:33 +01:00
aignatov-bio
9216ca2809
Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments
Experiment table - add new task modal improvements [SCI-7722]
2023-01-13 10:13:22 +01:00
artoscinote
c75d50c2de
Merge pull request #4807 from G-Chubinidze/gc_SCI_7724
Manage tags modal improvements [SCI-7724]
2023-01-13 09:28:27 +01:00
artoscinote
f6be79d070
Merge pull request #4796 from G-Chubinidze/gc_SCI_7651
Missing experiment table empty state [SCI-7651]
2023-01-13 09:28:18 +01:00
Martin Artnik
4df203bd13 Fix touching of protocol when changes happen [SCI-7584] 2023-01-12 16:18:31 +01:00
Anton
81191dff1f Experiment table - remove warning icon from due date for completed tasks [SCI-7755] 2023-01-12 13:56:34 +01:00
Anton
7930091abb Experiment table - add new task modal improvments [SCI-7722] 2023-01-12 13:48:49 +01:00
ajugo
b8e5c98210
Canvas updates - actions and Create task modal [SCI-7723] (#4809) 2023-01-12 13:30:55 +01:00
aignatov-bio
d93268f920
Merge pull request #4808 from aignatov-bio/ai-sci-7744-experiment-table-fix-results-counter
Experiment table fix results counter [SCI-7744]
2023-01-12 13:30:25 +01:00
ajugo
7f64b22a3a
Fix task duplication for experiment table view for User role [SCI-7731] (#4803)
* Fix task duplication for experiment table view for User role [SCI-7731]

* Move created_by for clone batch [SCI-7731]
2023-01-12 13:29:44 +01:00
Martin Artnik
662b9174fa Extract pasted base64 images from RTE texts [SCI-5098] 2023-01-12 13:24:31 +01:00
Anton
2f6312de11 Experiment table fix results counter [SCI-7744] 2023-01-12 13:19:32 +01:00
Giga Chubinidze
1dc636a49c Manage tags modal improvements [SCI-7724] 2023-01-12 16:01:39 +04:00
aignatov-bio
abaf8d9e07
Merge pull request #4806 from aignatov-bio/ai-sci-7746-fix-due-date-ordering
Experiment table improve due date sorting [SCI-7746][SCI-7704]
2023-01-12 12:58:18 +01:00
ajugo
769b5bc815
Fix task access modal for viewer role [SCI-7712] (#4789) 2023-01-12 12:15:29 +01:00
ajugo
224fb5b742
Fix moving of experiment [SCI-7734] (#4802) 2023-01-12 12:10:06 +01:00
Martin Artnik
3e65ae921c Fix TinyMCE blocking turbolinks [SCI-7729] 2023-01-12 12:09:44 +01:00
ajugo
c0554009d7
Fix redirection path for experiment duplication [SCI-7682] (#4800) 2023-01-12 12:08:37 +01:00
aignatov-bio
826aa614e3
Fix task duplication on experiment table [SCI-7730] (#4794) 2023-01-12 12:07:12 +01:00
aignatov-bio
65624fa6ed
Merge pull request #4801 from aignatov-bio/ai-sci-7740-remove-task-access-button-from-action-toolbar
Remove task access button from action toolbar [SCI-7740]
2023-01-12 11:59:48 +01:00
aignatov-bio
aa02945bc7
Merge pull request #4799 from aignatov-bio/ai-sci-7708-fix-long-task-names-in-experiment-table
Fix long task names in experiment table [SCI-7708]
2023-01-12 11:58:11 +01:00
Anton
3dff1b8a8c Experiment table improve due date sorting [SCI-7746][SCI-7704] 2023-01-12 11:57:48 +01:00
ajugo
b7077b53b7
Fix double loading of the experiment table view [SCI-7706] (#4804) 2023-01-12 11:33:57 +01:00
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
Martin Artnik
33dca201ba Remove placeholder plugin [SCI-7729] 2023-01-11 15:49:18 +01:00
Martin Artnik
b559352128 Remove TinyMCE draft auto init functionality [SCI-7729] 2023-01-11 15:31:14 +01:00
Martin Artnik
2ffec1cf49 Fix TinyMCE style loading [SCI-7729] 2023-01-11 15:28:09 +01:00
Anton
2fd90a4e5f Remove task access button from action toolbar [SCI-7740] 2023-01-11 14:04:03 +01:00
Anton
a88adbf020 Fix long task names in experiment table [SCI-7708] 2023-01-11 13:37:24 +01:00
artoscinote
0352a2e1d2
Merge pull request #4795 from sboursen-scinote/sb_SCI_7710
Fix: Cannot clear task due date on experiment table view [SCI_7710]
2023-01-11 10:03:54 +01:00
Giga Chubinidze
5ed3a22539 timing issue fixes 2023-01-11 12:15:25 +04:00
sboursen-scinote
a7f17524d2 Fix scss style issues 2023-01-10 20:33:25 +01:00
sboursen-scinote
83378e4ade Fix clear due date x button not working
- Reduce the width of the datetime-picker-container to prevent it from hiding the clear-date (x button).
2023-01-10 19:45:02 +01:00
aignatov-bio
7503bd7af8
Merge pull request #4793 from aignatov-bio/ai-sci-7704-experiment-update-navigation-panel-along-with-table
Update sidebar along with experiment table [SCI-7704]
2023-01-10 14:56:04 +01:00
Anton
e38c45314b Update sidebar along with experiment table [SCI-7704] 2023-01-10 13:45:15 +01:00
Martin Artnik
edfc1c4e08 Fix editor close when clicking restore notification [SCI-7729] 2023-01-10 13:24:58 +01:00
Anton
ba442babe2 Update tag creation option design [SCI-7698] 2023-01-10 13:07:10 +01:00
aignatov-bio
d5bd26a31b
Merge pull request #4787 from aignatov-bio/ai-sci-7540-micro-interactions-fixes
Micro interactions fixes [SCI-7540]
2023-01-10 12:12:44 +01:00
Anton
b710d15831 Micro interactions fixes [SCI-7540] 2023-01-10 12:08:26 +01:00
artoscinote
288c255c44
Merge pull request #4776 from artoscinote/ma_SCI_7653
Fix display of archived tasks [SCI-7653]
2023-01-10 11:56:48 +01:00
artoscinote
3ce601dfa7
Merge pull request #4778 from artoscinote/ma_SCI_7382
Add duplicating tooltips [SCI-7382]
2023-01-10 11:56:33 +01:00
artoscinote
4ecf208243
Merge pull request #4780 from artoscinote/ma_SCI_7683
Fix task access modal for archived experiments [SCI-7683]
2023-01-10 11:51:47 +01:00
ajugo
06cdeb2d61
Prevent double click on button new experiment [SCI-7707] (#4783) 2023-01-10 11:46:32 +01:00
ajugo
99d190f0d6
Fix tiny_mce image duplication [SCI-7727] (#4788) 2023-01-10 11:18:56 +01:00
Martin Artnik
19b282cba2 Merge branch 'develop' into features/tiny_mce_6 2023-01-10 11:13:23 +01:00
ajugo
1fe39a216c
Fix tag display in experiment table for viewer role [SCI-7696] (#4781) 2023-01-10 11:09:23 +01:00
ajugo
ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
ajugo
dd0ede1c87
Remove selected rows after task renaming in experiment table view [SCI-7647] (#4775) 2023-01-10 11:08:30 +01:00
aignatov-bio
1feaa5fb71
Merge pull request #4777 from aignatov-bio/ai-sci-7699-experiment-table-css-fixes
Fix small css issues [SCI-7699][SCI-7694][SCI-7678]
2023-01-10 10:39:22 +01:00
Alex Kriuchykhin
6c313f86ac
Merge pull request #4680 from okriuchykhin/ok_SCI_7455
Add API endpoint for retrieving a list of users [SCI-7455]
2023-01-10 10:21:23 +01:00
ajugo
9f6887ddcc
Fix step element reordering at importing protocol [SCI-7529] (#4677) 2023-01-09 16:08:27 +01:00
Martin Artnik
da5324d2a1 Fix task access modal for archived experiments [SCI-7683] 2023-01-09 16:04:57 +01:00
Martin Artnik
d4326c08db Add duplicating tooltips [SCI-7382] 2023-01-09 12:40:00 +01:00
Anton
85eaf7c246 Fix small css issues [SCI-7699][SCI-7694][SCI-7678] 2023-01-09 12:33:59 +01:00
Martin Artnik
2edbd2fb74 Fix display of archived tasks [SCI-7653] 2023-01-09 11:40:45 +01:00
ajugo
83ba9d40dc
Refresh canvas navigator after moved tasks [SCI-7661] (#4774) 2023-01-09 09:53:03 +01:00
ajugo
92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
aignatov-bio
feb596179f
Merge pull request #4772 from aignatov-bio/ai-sci-7691-fix-new-task-modal-styling
Experiment table - fix new task modal CSS [SCI-7691]
2023-01-06 20:28:24 +01:00
Oleksii Kriuchykhin
b29aeab67a Add API endpoint for retrieving a list of users [SCI-7455] 2023-01-06 16:33:00 +01:00
aignatov-bio
329ac41bb7
Merge pull request #4770 from aignatov-bio/ai-sci-7689-fix-canvas-page-responsivness
Fix canvas page responsiveness [SCI-7689]
2023-01-06 13:10:52 +01:00
aignatov-bio
29c13d8578
Merge pull request #4769 from aignatov-bio/ai-sci-7695-fix-comments-view-mode-experiment-table
Experiment table - fix comments view mode [SCI-7695]
2023-01-06 13:10:42 +01:00