Commit graph

16010 commits

Author SHA1 Message Date
wandji
690e0d421f
Add advance filter for relationships to inventory items table [SCI-10068] (#7007) 2024-03-06 13:48:15 +01:00
Andrej
92946e33ff Merge branch 'features/inventory-import-improvements' into features/bugfixes 2024-03-06 10:18:35 +01:00
ajugo
46c9a52761
Merge pull request #7190 from lasniscinote/gl_SCI_10156
(fix) Load repository filters only when needed [SCI-10156]
2024-03-05 14:12:30 +01:00
ajugo
5d36de178d
Merge pull request #7191 from lasniscinote/gl_SCI_10096
(fix) To change text in Move to different step modal [SCI-10096]
2024-03-05 14:09:53 +01:00
ajugo
6660e716c5
Merge pull request #7192 from lasniscinote/gl_SCI_10076
(fix )locked view fix [SCI-10076]
2024-03-05 14:02:00 +01:00
Gregor Lasnibat
cea1a0d7fb locked view fix 2024-03-04 13:05:49 +01:00
Gregor Lasnibat
c9ecf359a9 (fix) To change text in Move to different step modal [SCI-10096] 2024-03-04 11:49:08 +01:00
Gregor Lasnibat
c9f475290a (fix) Load repository filters only when needed [SCI-10156] 2024-03-04 11:37:14 +01:00
ajugo
9299cb7a52
Merge pull request #7140 from lasniscinote/gl_SCI_10004
(fix) Add warning for unsaved changes when leaving Task workflow editmode (Canvas view) [SCI-10004]
2024-03-04 10:45:18 +01:00
ajugo
512bf155c3
Merge pull request #7141 from lasniscinote/gl_SCI_10220
(fix) Add shortcut to add new step (+) after the last step [SCI-10220]
2024-02-26 17:03:07 +01:00
Gregor Lasnibat
01253da5af (fix) Add shortcut to add new step (+) after the last step [SCI-10220] 2024-02-26 16:45:13 +01:00
Gregor Lasnibat
79910d3141 (fix) Add warning for unsaved changes when leaving Task workflow edit mode (Canvas view) [SCI-10004] 2024-02-26 15:57:36 +01:00
Anton
b0504bc2a0 Fix conflicts 2024-02-26 10:47:47 +01:00
Anton
d72e63a0f2 Merge branch 'develop' into features/inventory-import-improvements 2024-02-26 10:46:49 +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
9e652809aa
Merge pull request #7131 from wandji20/wb-SCI-10230
Change name column header names for exp, inventories, protocol and label templates tables [SCI-10230]
2024-02-23 10:06:44 +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
98e45a4c87 Change name column header names for exp, inventories, protocol and label templates tables [SCI-10230] 2024-02-22 14:01:17 +01:00
wandji20
703259bb1f Add team to task list serializer and service [SCI-10266] 2024-02-22 13:38:24 +01:00
ajugo
0843391010
Merge pull request #7119 from scinote-eln/dependabot/npm_and_yarn/ip-1.1.9
Bump ip from 1.1.8 to 1.1.9
2024-02-22 12:01:15 +01:00
ajugo
58b4584db2
Merge pull request #7118 from scinote-eln/dependabot/bundler/devise_invitable-2.0.9
Bump devise_invitable from 2.0.8 to 2.0.9
2024-02-22 12:00:35 +01:00
Martin Artnik
8a6782eb10
Merge pull request #7127 from lasniscinote/gl_SCI_10096
(fix) To change text in Move to different step modal [SCI-10096]
2024-02-22 11:50:42 +01:00
Martin Artnik
75b5019536
Merge pull request #7098 from G-Chubinidze/gc_SCI_10177
Replace legacy vue components in Item Card [SCI-10177]
2024-02-22 11:50:14 +01:00
G-Chubinidze
a62acd44b5
Merge branch 'develop' into gc_SCI_10177 2024-02-22 14:49:31 +04:00
Martin Artnik
5eee7fefef
Merge pull request #7084 from G-Chubinidze/gc_SCI_10150
Unification of column titles in tables and text in "Reset to defaults" modal (column management) [SCI-10150]"
2024-02-22 11:37:42 +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
ajugo
c1161ce9eb
Merge pull request #7126 from wandji20/wb-SCI-10198
Replace task flow buttons partial after successful change of task status [SCI-10198]
2024-02-22 09:53:43 +01:00
Anton
41e92dd1e2 Fix multiple resize [SCI-10245] 2024-02-21 19:44:22 +01:00
Gregor Lasnibat
ba6c7de529 (fix) To change text in Move to different step modal [SCI-10096] 2024-02-21 16:29:55 +01:00
wandji20
8221466666 Replace task flow buttons partial after successful change of task status [SCI-10198] 2024-02-21 15:25:04 +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
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
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
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