Commit graph

16014 commits

Author SHA1 Message Date
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
G-Chubinidze
c48359c402
Merge branch 'features/new-datatable' into gc_SCI_10150 2024-02-21 04:27:36 +04:00
dependabot[bot]
8ab7620057
Bump ip from 1.1.8 to 1.1.9
Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9.
- [Commits](https://github.com/indutny/node-ip/compare/v1.1.8...v1.1.9)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-20 22:33:01 +00:00
dependabot[bot]
785b17b04d
Bump devise_invitable from 2.0.8 to 2.0.9
Bumps [devise_invitable](https://github.com/scambra/devise_invitable) from 2.0.8 to 2.0.9.
- [Changelog](https://github.com/scambra/devise_invitable/blob/master/CHANGELOG.md)
- [Commits](https://github.com/scambra/devise_invitable/compare/v2.0.8...v2.0.9)

---
updated-dependencies:
- dependency-name: devise_invitable
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-20 19:33:33 +00:00
Martin Artnik
f8aae8aca6 Merge branch 'develop' into features/inventory-import-improvements 2024-02-20 15:18:07 +01:00
Gregor Lasnibat
68e9d3f400
Merge pull request #7058 from lasniscinote/gl_SCI_10076
(fix) TinyMCE issues - Code samples & Wide tables [SCI-10076]
2024-02-20 14:42:28 +01:00
Gregor Lasnibat
7c4e4a8ee7 (fix) TinyMCE issues - Code samples & Wide tables [SCI-10076] 2024-02-20 14:31:37 +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
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
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
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
aignatov-bio
c0e754d184
Merge pull request #7093 from aignatov-bio/ai-sci-10205-preserve-selection-between-pages
Save selection between pages [SCI-10095]
2024-02-15 14:11:10 +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
6fa68adbb8
Merge pull request #7092 from artoscinote/ma_SCI_10224
Fix WOPI editing not opening in new tab [SCI-10224]
2024-02-15 13:16: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
wandji
9b356a9837
Load label templates and printers only when the print modal is shown and fix double validate template request [SCI-10155] (#7083) 2024-02-15 12:42:24 +01:00