Commit graph

11799 commits

Author SHA1 Message Date
Andrej
50d6429b4c Fix jira url for github template 2022-11-22 11:13:08 +01:00
Alex Kriuchykhin
b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1
Release/1.26.2.1
2022-11-22 11:07:20 +01:00
Anton
961b39159e Fix tooltip on new button in inventory [SCI-7472] 2022-11-22 11:05:57 +01:00
Alex Kriuchykhin
dd54a30e13
Merge pull request #4601 from rekonder/aj_SCI_7376
Enable checkboxes for experiment table/card view for all roles  [SCI-7376]
2022-11-22 10:57:34 +01:00
Alex Kriuchykhin
d6728ef9d3
Merge pull request #4597 from rekonder/aj_SCI_7361
Fixed external protocol icon out of body [SCI-7361]
2022-11-22 10:56:55 +01:00
Alex Kriuchykhin
b487894c9d
Merge pull request #4596 from aignatov-bio/ai-sci-7389-fix-protocol-import-error
fix protocol import error [SCI-7389]
2022-11-22 10:56:10 +01:00
Giga Chubinidze
43f8370a08 add IDs to the protocol templates tables [SCI-7179] 2022-11-22 13:55:41 +04:00
Alex Kriuchykhin
dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181
Remove old step code [SCI-7181]
2022-11-22 10:52:06 +01:00
ajugo
f2a680d826
Fix zebra printer print status [SCI-7474] (#4625) 2022-11-21 16:55:03 +01:00
Alex Kriuchykhin
6907d0ff66
Merge pull request #4480 from okriuchykhin/ok_SCI_7197
Add basic modal for direct task creation [SCI-7197]
2022-11-21 13:08:33 +01:00
artoscinote
92d446b43d
Merge pull request #4628 from artoscinote/ma_SCI_7473
Fix inventory multiline file uploads [SCI-7473]
2022-11-21 12:59:40 +01:00
artoscinote
974e4d0bf9
Merge pull request #4629 from artoscinote/ma_SCI_7460
Disable instead of hide edit button when selected items not on page [SCI-7460]
2022-11-21 12:59:24 +01:00
Martin Artnik
5d41ea5fa7 Disable instead of hide edit button when selected items not on page [SCI-7460] 2022-11-21 11:58:15 +01:00
Martin Artnik
95348b82e8 Fix inventory multiline file uploads [SCI-7473] 2022-11-21 11:47:46 +01:00
Alex Kriuchykhin
d9897d6e7c
Merge pull request #4624 from okriuchykhin/ok_SCI_7457
Fix protocol owner re-assignment when removing a user from a team [SCI-7457]
2022-11-21 11:03:50 +01:00
Alex Kriuchykhin
2314405f60
Merge pull request #4623 from okriuchykhin/ok_SCI_7447
Implement current team switch when navigating to tasks and experiments from another team [SCI-7447]
2022-11-21 11:03:35 +01:00
Oleksii Kriuchykhin
49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01:00
Oleksii Kriuchykhin
69812786ba Fix protocol owner re-assignment when removing a user from a team [SCI-7457] 2022-11-18 12:52:30 +01:00
Oleksii Kriuchykhin
66f9f13508 Implement current team switch when navigating to tasks and experiments from another team [SCI-7447] 2022-11-18 11:48:49 +01:00
Giga Chubinidze
44d74b5797 refactoring projects scss 2022-11-17 22:29:15 +04:00
Giga Chubinidze
7f09fb8997 Archived projects cards and table updates [SCI-7201] 2022-11-17 22:25:54 +04:00
aignatov-bio
f905aca576
Merge pull request #4620 from aignatov-bio/ai-sci-7441-experiment-table-display-columns-flyout
Add table columns display modal to experiment table [SCI-7441]
2022-11-16 10:15:14 +01:00
Anton
85c00c61e0 Add table columns display modal to experiment table [SCI-7441] 2022-11-16 09:54:12 +01:00
aignatov-bio
9a60f04591
Merge pull request #4618 from aignatov-bio/ai-sci-7384-add-archive-action-to-experiment-table
Add archive action to experiment table [SCI-7384]
2022-11-15 12:00:16 +01:00
Anton
7523535e24 Add archive action to experiment table [SCI-7384] 2022-11-14 11:31:53 +01:00
ajugo
42af732073
Fix zebra printer switch and optimize zebra library loading [SCI-7430] (#4612)
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]

* Fix zebra enabled [SCI-7430]
2022-11-14 10:43:09 +01:00
ajugo
4e77174e52
Fix vue print modal component initialization [SCI-7469] (#4616) 2022-11-14 10:42:51 +01:00
aignatov-bio
efc7f53385
Merge pull request #4615 from aignatov-bio/ai-sci-7385-add-experiment-access-managment
Add experiment table manage access [SCI-7385]
2022-11-14 09:51:13 +01:00
Anton
51446b130f Add experiment table manage access [SCI-7385] 2022-11-13 22:33:41 +01:00
aignatov-bio
6331885042
Merge pull request #4611 from aignatov-bio/ai-sci-7383-add-rename-modal-to-experiment-view
Add edit modal to experiment table [SCI-7383]
2022-11-13 22:30:51 +01:00
artoscinote
41a7609c3e
Merge pull request #4608 from G-Chubinidze/gc_SCI_7162
empty repository view archived button logic fix [SCI-7162]
2022-11-11 11:26:47 +01:00
Anton
0a87513458 Add edit modal to experiment table [SCI-7383] 2022-11-11 11:24:23 +01:00
Giga Chubinidze
e9d9f613fb updated old code version in empty_index 2022-11-11 14:22:26 +04:00
G-Chubinidze
0dcc3e3c7f
Merge pull request #4610 from G-Chubinidze/gc_SCI_7203
archived tasks updates [SCI-7203]
2022-11-11 14:02:56 +04:00
G-Chubinidze
e3b9314646
Update my_modules.scss 2022-11-11 12:48:22 +04:00
Giga Chubinidze
5a429549da archived tasks updates [SCI-7203] 2022-11-11 12:45:07 +04:00
aignatov-bio
c5466771ff
Merge pull request #4609 from aignatov-bio/ai-sci-7471-fix-merge-issue
Fix merge issue [SCI-7471]
2022-11-10 11:47:54 +01:00
Anton
c0141137eb Fix merge issue [SCI-7471] 2022-11-10 11:46:14 +01:00
aignatov-bio
4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms
Fix css issues for login and signup forms [SCI-7233]
2022-11-10 11:15:03 +01:00
aignatov-bio
de7f2e4294
Merge pull request #4607 from aignatov-bio/ai-sci-7215-add-filters-to-experiment-view
Add basic filters for experiment table [SCI-7215]
2022-11-10 11:13:34 +01:00
aignatov-bio
a72795ec98
Merge pull request #4586 from aignatov-bio/ai-sci-7387-fix-options-dropdown-position-on-step
Fix options dropdown position on step [SCI-7387]
2022-11-10 11:12:28 +01:00
aignatov-bio
2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982
Implement multiline editing in repositories [SCI-6982][SCI-6983]
2022-11-10 11:07:30 +01:00
artoscinote
0994c4a25b
Merge branch 'develop' into ma_SCI_6982 2022-11-10 11:04:57 +01:00
aignatov-bio
0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027
Session end implementation [SCI-7027]
2022-11-10 11:03:02 +01:00
Anton
63ce422367 Add basic filters for experiment table [SCI-7215] 2022-11-09 15:27:39 +01:00
G-Chubinidze
f65c207e75
Merge pull request #4603 from G-Chubinidze/gc_SCI_7205
update display of the current tasks with IDs [SCI-7205]
2022-11-09 15:49:57 +04:00
G-Chubinidze
8e63bfb7c2
Update my_module.rb 2022-11-09 14:46:36 +04:00
G-Chubinidze
996cb68fdd
Update my_module.rb 2022-11-09 14:45:18 +04:00
aignatov-bio
f39f799e7e
Merge pull request #4605 from aignatov-bio/ai-sci-7386-add-view-switcher
Add view dropdown to experiment screen
2022-11-09 10:54:50 +01:00
artoscinote
e4673f67ba
Merge pull request #4606 from scinote-eln/develop
November 2022 cleanup release
2022-11-09 10:49:27 +01:00