scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +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
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 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
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 a6bef3e98b
Merge pull request #4810 from artoscinote/ma_SCI_5098 
Extract pasted base64 images from RTE texts [SCI-5098]
 2023-01-13 10:38:17 +01: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
artoscinote 99b1bd5b68
Merge pull request #4790 from artoscinote/ma_SCI_7729 
Fix editor close when clicking restore notification [SCI-7729]
 2023-01-12 13:16:48 +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 3a72e5eb7b
Fix double loading of the experiment table view [SCI-7706] (#4805) 2023-01-12 12:12:11 +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