Commit graph

12599 commits

Author SHA1 Message Date
Anton 588f69efd7 Fix protocol sorting [SCI-10287] 2024-02-28 10:54:28 +01:00
aignatov-bio dda7e039b0
Merge pull request #7151 from wandji20/wb-SCI-10290
Fix operation & unit fields in stock modal missing [SCI-10290]
2024-02-28 10:31:10 +01:00
aignatov-bio 73e9e16586
Merge pull request #7150 from wandji20/wb-SCI-10265
Fix double request for create task modal [SCI-10265]
2024-02-28 10:30:33 +01:00
aignatov-bio c3ac951fd1
Merge pull request #7148 from sboursen-scinote/sb_SCI-10286
Show repositories that don't contain any items in the list [SCI-10286]
2024-02-28 10:30:13 +01:00
aignatov-bio 75cce6698d
Merge pull request #7144 from aignatov-bio/ai-sci-10279-fix-table-comments-bugs
Fix table and comments bugs [SCI-10279][SCI-10285]
2024-02-28 10:21:20 +01:00
wandji20 47750d5e4f Fix operation & unit fields in stock modal missing [SCI-10290] 2024-02-28 03:57:40 +01:00
wandji20 1f155100cd Fix double requestfor create task modal [SCI-10265] 2024-02-28 03:05:32 +01:00
sboursen-scinote 47daae5b26 Show repositories that don't contain any items in the list [SCI-10286] 2024-02-27 21:05:30 +01:00
Martin Artnik 9666dd994f
Merge pull request #7069 from G-Chubinidze/gc_SCI_101000
Implement sorting on all columns of tables revamped in v.1 [SCI-10100]
2024-02-27 16:03:03 +01:00
aignatov-bio f9aceeb78d
Merge pull request #7145 from wandji20/wb-SCI-10265
Add micro-interactions on the revamped modals [SCI-10265]
2024-02-27 14:11:29 +01:00
aignatov-bio 5d3bbe7703
Merge pull request #7138 from wandji20/wb-SCI-10210
Default table to try and fit all columns to screen [SCI-10210]
2024-02-27 14:09:24 +01:00
Giga Chubinidze 4488243fad hound fix [SCI-10100] 2024-02-27 16:41:20 +04:00
G-Chubinidze f75d3b3952
Merge branch 'develop' into gc_SCI_101000 2024-02-27 16:38:04 +04:00
Giga Chubinidze 980468cb41 Added back backend code for table column sorting [SCI-10100] 2024-02-27 16:34:55 +04:00
wandji20 0070db5e78 Add micro-interactions on the revamped modals [SCI-10265] 2024-02-27 13:03:41 +01:00
aignatov-bio fb734b1b3e
Merge pull request #7137 from aignatov-bio/ai-sci-10267-replace-old-access-modal
Replace old access modal [SCI-10267]
2024-02-27 11:26:32 +01:00
aignatov-bio f48969f76d
Merge pull request #7139 from sboursen-scinote/sb_SCI-10264
Remove custom cursor icons [SCI-10264]
2024-02-27 11:25:35 +01:00
Anton 33cbfd4435 Fix table and comments bugs [SCI-10279][SCI-10285] 2024-02-27 11:23:23 +01:00
sboursen-scinote 0c8db98700 Style the unseen comments in the task table [SCI-10262] 2024-02-26 17:43:07 +01:00
sboursen-scinote e9242b1ab3 Remove custom cursor icons [SCI-10264] 2024-02-26 15:56:12 +01:00
wandji20 5985f866b9 Default table try and fit all columns to screen [SCI-10210] 2024-02-26 15:24:19 +01:00
Anton 5902161cb9 Replace old access modal [SCI-10267] 2024-02-26 15:22:09 +01:00
aignatov-bio aa68e18b34
Merge pull request #7132 from sboursen-scinote/sb_SCI-10273
Add missing (you) mark for current user in Grant Access modal [SCI-10273]
2024-02-26 10:31:36 +01:00
aignatov-bio e4ccf2e377
Merge pull request #7133 from sboursen-scinote/sb_SCI-10270
Missing filtering by signatures on task table [SCI-10270]
2024-02-26 10:31:09 +01:00
sboursen-scinote 5aae4e0db6 Add missing filtering by signatures on task table [SCI-10270] 2024-02-23 12:30:35 +01:00
sboursen-scinote 7a88eaacbc Add missing (you) mark for current user in Grant Access modal [SCI-10273] 2024-02-23 10:41:48 +01:00
aignatov-bio 8bb080094a
Merge pull request #7130 from wandji20/wb-SCI-10266
Add team to task list serializer and service [SCI-10266]
2024-02-23 09:58:05 +01:00
wandji20 703259bb1f Add team to task list serializer and service [SCI-10266] 2024-02-22 13:38:24 +01:00
G-Chubinidze a62acd44b5
Merge branch 'develop' into gc_SCI_10177 2024-02-22 14:49:31 +04:00
aignatov-bio 968b34d74c
Merge pull request #7128 from aignatov-bio/ai-sci-10245-fix-multiple-resize-column
Fix multiple resize [SCI-10245]
2024-02-22 11:12:05 +01:00
aignatov-bio a873b97c97
Merge pull request #7129 from scinote-eln/features/new-datatable
Features/new datatable
2024-02-22 11:06:40 +01:00
Anton 41e92dd1e2 Fix multiple resize [SCI-10245] 2024-02-21 19:44:22 +01:00
Martin Artnik 35ce14a929 Fix MarvinJS initiaization [SCI-10260] 2024-02-21 13:29:29 +01:00
Giga Chubinidze 50eefaf38b remove update flag from new dropdowns [SCI-10177] 2024-02-21 15:59:05 +04:00
Anton 52fdc53508 Fix merge 2024-02-21 12:54:00 +01:00
Anton ed0db94089 Merge branch 'develop' into features/new-datatable 2024-02-21 12:51:17 +01:00
Anton fdee40ba97 Fix protocol access template [SCI-10242] 2024-02-21 12:33:30 +01:00
Martin Artnik d4f35f51bd Fix loading of MarvinJS object (when MarvinJS is disabled) [SCI-10260] 2024-02-21 10:58:49 +01:00
Giga Chubinidze caab8fbc38 removed repository id query [SCI-10100] 2024-02-21 04:31:49 +04:00
Anton a41278c0f8 Hide empty filters at tables [SCI-10241] 2024-02-20 12:52:09 +01:00
aignatov-bio b8babaa429
Merge pull request #7107 from ivanscinote/SCI-10163-ik
Refactor fetching/applying table state [SCI-10163]
2024-02-20 11:06:11 +01:00
Martin Artnik 425b189742
Merge pull request #7114 from artoscinote/ma_SCI_10240
Disable button and add loader when importing inventory items [SCI-10240]
2024-02-20 11:01:15 +01:00
aignatov-bio 286430ea51
Merge pull request #7113 from aignatov-bio/ai-sci-10208-fix-flyouts-in-main-navigation
Fix flyouts in main navigation [SCI-10208]
2024-02-20 11:00:56 +01:00
aignatov-bio b1f8c26adb
Merge pull request #7105 from lasniscinote/gl_SCI_10223_core
(fix) Dropdown for addons microinteractions [SCI-10223-core]
2024-02-20 11:00:19 +01:00
Martin Artnik 102caffe01 Disable button and add loader when importing inventory items [SCI-10240] 2024-02-20 10:58:09 +01:00
Anton bcad0145a3 Fix flyouts in main navigation [SCI-10208] 2024-02-20 10:55:03 +01:00
G-Chubinidze 1dccae57e2
Merge branch 'features/new-datatable' into gc_SCI_10189 2024-02-20 13:38:40 +04:00
Giga Chubinidze d4661fc2c7 fix hound [SCI-10189] 2024-02-20 13:37:17 +04:00
Andrej a6774772a4 Improve query for assigned task counter on protocol template [SCI-10171] 2024-02-20 09:55:45 +01:00
Giga Chubinidze 3f5b0dd30c To add "Archived on"column to Projects table (archived state) & rename column titles of "archived on" [SCI-10189] 2024-02-20 03:35:38 +04:00
Ivan Kljun 2827dd3de3 Refactor fetching/applying table state [SCI-10163] 2024-02-19 15:26:51 +01:00
Gregor Lasnibat a5043a0528 (fix) Quartzy microinteractions [SCI-10223-core] 2024-02-19 14:14:05 +01:00
Anton c893ee19f9 Small table fixes [SCI-10211] 2024-02-19 13:01:37 +01:00
Martin Artnik fc441bbfaa Fixed typos in clone experiment action [SCI-10232] 2024-02-19 10:46:47 +01:00
Giga Chubinidze 26881eccdb Fixed repository id column [SCI-10100] 2024-02-19 02:55:18 +04:00
Giga Chubinidze 8a0171eefa Replace legacy vue components in Item Card [SCI-10177] 2024-02-19 02:39:02 +04:00
Martin Artnik 41df10a2ee
Merge pull request #7103 from artoscinote/ma_SCI_10228
Fix making backup copy of conflicting files [SCI-10228]
2024-02-16 13:26:40 +01:00
Anton 54428ff4f1 Fix routes for experiments my modules [SCI-10207] 2024-02-16 13:15:47 +01:00
Martin Artnik 7ac00c5007 Fix making backup copy of conflicting files [SCI-10228] 2024-02-16 13:06:17 +01:00
Alex Kriuchykhin 156f9bda9c
Fix text extraction for cloned files [SCI-10227] (#7101) 2024-02-16 12:51:47 +01:00
Ivan Kljun aae8d4d227 Remove team arg from post_process_file [SCI-10103] 2024-02-16 10:39:19 +01:00
Ivan Kljun c8b910ebc4 Merge remote-tracking branch 'upstream/develop' into SCI-10103-ik2 2024-02-16 10:06:27 +01:00
Ivan Kljun c043a9375a Fix asset sync update to account for WOPI and post process [SCI-10103] 2024-02-16 09:53:26 +01:00
wandji f48bb35c67
Only call inventory table restoreColumnSize in save state callbback on initial load [SCI-10195] (#7097) 2024-02-16 09:45:06 +01:00
Martin Artnik c273219a00 Block header links of smart annotation on long loads [SCI-10087] 2024-02-15 14:49:22 +01:00
Martin Artnik 916b310459
Merge pull request #7095 from ivanscinote/SCI-10033-ik
Fix saving last_modified_by for WOPI audit trails [SCI-10033]
2024-02-15 14:21:20 +01:00
Ivan Kljun e35878a9b8 Fix saving last_modified_by for WOPI audit trails [SCI-10033] 2024-02-15 14:14:38 +01:00
Martin Artnik 090f42c36b
Merge pull request #7094 from artoscinote/ma_SCI_10224
Modal code cleanup [SCI-10224]
2024-02-15 14:11:58 +01:00
Martin Artnik 35dc70048e Modal code cleanup [SCI-10224] 2024-02-15 14:10:24 +01:00
Gregor Lasnibat 82d9996f22
(fix) CSS for Quartzy [SCI-10159-core] (#7090) 2024-02-15 14:05:31 +01:00
Anton d1251f7440 Save selection between pages [SCI-10095] 2024-02-15 13:59:55 +01:00
Martin Artnik 87eeaab08d Fix WOPI editing not opening in new tab [SCI-10224] 2024-02-15 13:15:05 +01:00
ajugo e026f2b135
Add check for showing consumption column [SCI-10185] (#7085) 2024-02-15 13:00:09 +01:00
ajugo b14912e70e
Fix assigned repository export in project export [SCI-10193] (#7087) 2024-02-15 11:33:23 +01:00
Anton b5f08d2542 Add new render for task tags [SCI-10106] 2024-02-15 10:10:15 +01:00
ajugo 7fe6aae843
Fix consumption check for full view repository [SCI-10184] (#7082) 2024-02-13 15:05:34 +01:00
Soufiane daa5280521
Update the navigator tree on state change and owner assignement permission change [SCI-10123] (#7081) 2024-02-13 15:04:57 +01:00
ajugo 230b580ba2
Improve loading speed of protocol template [SCI-10171] (#7077) 2024-02-13 15:04:30 +01:00
Martin Artnik bf6e990435
Merge pull request #7080 from artoscinote/ma_SCI_10087
Show loader when loading smart annotations [SCI-10087]
2024-02-12 15:54:35 +01:00
Martin Artnik baa2201622
Merge pull request #7070 from ivanscinote/SCI-10122-ik
Add polling for asset changes for SciNote Edit [SCI-10122]
2024-02-12 14:15:48 +01:00
Soufiane ef16651cf3
Fix Docx preview marking as ready [SCI-10037] (#7074) 2024-02-12 13:44:02 +01:00
Martin Artnik f2d06a9636 Show loader when loading smart annotations [SCI-10087] 2024-02-12 12:58:57 +01:00
aignatov-bio b624eab0a5
Merge pull request #7079 from aignatov-bio/ai-sci-8328-all-users-have-same-avatar
Small fixes for table [SCI-8328]
2024-02-12 12:31:51 +01:00
Anton d57b056831 Small fixes for table [SCI-8328] 2024-02-12 12:29:50 +01:00
Anton afc256ae15 Replace legacy tags modal [SCI-10125] 2024-02-12 12:22:20 +01:00
Martin Artnik 86ab489da3 SciNote version modal fixes [SCI-10183] 2024-02-12 11:25:34 +01:00
Giga Chubinidze a164eec850 Implement sorting on all columns of tables revamped in v.1 [SCI-10100] 2024-02-09 03:32:43 +04:00
Ivan Kljun 5276faa74b Fix applying last_modified_by at asset update [SCI-10033] 2024-02-07 15:31:13 +01:00
Anton 29fd71c76a Fix sanity checks issues [SCI-10095] 2024-02-07 12:23:21 +01:00
Ivan Kljun aec115f669 Add polling for asset changes for SciNote Edit [SCI-10122] 2024-02-07 11:26:40 +01:00
Anton 25defa9e43 Update tags modal [SCI-10105] 2024-02-06 15:28:00 +01:00
Alex Kriuchykhin 8fa1c21e73
Fix snapshoting for LinkedRepository caused by external_id uniqueness constraint [SCI-9817] (#7066) 2024-02-06 14:23:01 +01:00
Alex Kriuchykhin 8abc39d4f6
Fix cloning for LinkedRepository coused by external_id uniqueness constraint [SCI-9879] (#7063) 2024-02-06 12:59:21 +01:00
Anton 51d9dbcd63 Fix experiment menu [SCI-10149] 2024-02-06 11:17:39 +01:00
Alex Kriuchykhin 342e9dbb19
Switch to asset text extraction with ActiveStorage analyzer [SCI-9954] (#6956) 2024-02-05 16:24:06 +01:00
Alex Kriuchykhin 7155d7862a
Add missing dependent option to many-to-many relations [SCI-10036] (#7024) 2024-02-05 13:36:12 +01:00
Martin Artnik 6d10159fce
Merge pull request #7049 from lasniscinote/gl_SCI_10099
(fix) Create new SciNote-apps section and place SciNote Edit in [SCI-10099]
2024-02-05 13:26:05 +01:00
Martin Artnik 9c51e15898
Merge pull request #7053 from artoscinote/ma_SCI_9757
Open locally button fixes on preview [SCI-9757]
2024-02-05 13:19:05 +01:00
Martin Artnik 3a700bae13 Add create activity in case of asset sync file conflict [SCI-10021] 2024-02-05 13:12:21 +01:00
Martin Artnik b5b29f66fc Open locally button fixes on preview [SCI-9757] 2024-02-05 12:45:15 +01:00