Commit graph

15944 commits

Author SHA1 Message Date
ajugo
9d371c50ba
Merge pull request #7135 from aignatov-bio/ai-sci-10248-quick-search-flyout
Add quick filter flyout [SCI-10248]
2024-02-26 13:15:24 +01:00
Anton
57c5140267 Add quick filter flyout [SCI-10248] 2024-02-23 14:16:03 +01: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
bf8a689251
Fix version to 1.31.0.1 2024-02-21 14:04:20 +01:00
Martin Artnik
a49f118baa
Bump version to 1.31.1 2024-02-21 14:02:06 +01:00
Martin Artnik
ec723babbd
Merge pull request #7123 from artoscinote/ma_SCI_10260
Fix MarvinJS initiaization [SCI-10260]
2024-02-21 13:30:47 +01:00
Martin Artnik
35ce14a929 Fix MarvinJS initiaization [SCI-10260] 2024-02-21 13:29:29 +01: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
aignatov-bio
022789a54d
Merge pull request #7122 from aignatov-bio/ai-sci-10242-fix-access-modal-protocol-template
Fix protocol access template [SCI-10242]
2024-02-21 12:44:14 +01:00
Anton
fdee40ba97 Fix protocol access template [SCI-10242] 2024-02-21 12:33:30 +01:00
Martin Artnik
a00648a80e
Bump version to 1.31.0 2024-02-21 11:51:24 +01:00
Martin Artnik
5d2db5fded
Merge pull request #7120 from artoscinote/ma_SCI_10260
Fix loading of MarvinJS object (when MarvinJS is disabled) [SCI-10260]
2024-02-21 11:00:18 +01:00
Martin Artnik
d4f35f51bd Fix loading of MarvinJS object (when MarvinJS is disabled) [SCI-10260] 2024-02-21 10:58:49 +01:00
aignatov-bio
11ab9964f0
Merge pull request #7115 from aignatov-bio/ai-sci-10241-fix-unused-filter
Hide empty filters at tables [SCI-10241]
2024-02-21 10:14:10 +01: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
35087f202e
Merge pull request #7109 from G-Chubinidze/gc_SCI_10189
To add "Archived on"column to Projects table (archived state) & rename column titles of "archived on" [SCI-10189]
2024-02-20 13:51:31 +04: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
ajugo
230f283aec
Merge pull request #7111 from rekonder/aj_SCI_10171
Improve query for assigned task counter on protocol template [SCI-10171]
2024-02-20 10:33:50 +01:00
aignatov-bio
96bc3b98b5
Merge pull request #7106 from aignatov-bio/ai-sci-10211-small-table-fixes
Small table fixes [SCI-10211]
2024-02-20 10:16:51 +01: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
b0f5f0353d
Merge pull request #7104 from artoscinote/ma_SCI_10232
Fixed typos in clone experiment action [SCI-10232]
2024-02-19 10:50:06 +01:00
Martin Artnik
fc441bbfaa Fixed typos in clone experiment action [SCI-10232] 2024-02-19 10:46:47 +01: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
aignatov-bio
596582d4fe
Merge pull request #7102 from aignatov-bio/ai-sci-10207-update-routes-for-expiments
Fix routes for experiments my modules [SCI-10207]
2024-02-16 13:20:32 +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
Martin Artnik
da8f2ff217
Merge pull request #7099 from ivanscinote/SCI-10103-ik2
Fix asset sync update to account for WOPI and post process [SCI-10103]
2024-02-16 10:46:00 +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
8f96ef6eb7
Merge pull request #7096 from artoscinote/ma_SCI_10087
Block header links of smart annotation on long loads [SCI-10087]
2024-02-15 15:29:12 +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