Commit graph

8882 commits

Author SHA1 Message Date
aignatov-bio d6b5034db9
Merge pull request #4634 from aignatov-bio/ai-sci-7472-fix-tooltip-on-new-button-in-inventory
Fix tooltip on new button in inventory [SCI-7472]
2022-11-23 12:05:24 +01:00
aignatov-bio 176f3c48e1
Merge pull request #4637 from aignatov-bio/ai-sci-7233-fix-show-password-for-edit-settings
Fix show password for edit settings [SCI-7233]
2022-11-22 16:23:36 +01:00
Anton 7079072eb8 Fix show password for edit settings [SCI-7233] 2022-11-22 16:06:47 +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
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
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
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
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
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
Giga Chubinidze e9d9f613fb updated old code version in empty_index 2022-11-11 14:22:26 +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 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
Miha Mencin c8bd5513cf
Merge pull request #4604 from okriuchykhin/ok_SCI_7434
Fix team export/import [SCI-7434]
2022-11-08 16:02:11 +01:00
Oleksii Kriuchykhin be7ef8fdc0 Fix team export/import [SCI-7434] 2022-11-08 14:50:16 +01:00
Oleksii Kriuchykhin 82d4b03cf6 Fix global activities user selection dropdown [SCI-7402] 2022-11-07 21:58:06 +01:00
Andrej aa99c2d7c8 Enable checboxes for experiment table/card view for all roles [SCI-7376] 2022-11-07 15:51:39 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton 22c682c58b fix protocol import error [SCI-7389] 2022-11-04 11:49:05 +01:00
Anton 5b08ee1cc8 Hide active reminders, if stock management disabled [SCI-7428] 2022-11-03 15:48:32 +01:00
Anton eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02:00
Oleksii Kriuchykhin c16d0cb7a6 Fix update of shared inventories user assignments [SCI-7360] 2022-10-25 23:26:20 +02:00
Alex Kriuchykhin d0f604f21e
Merge pull request #4576 from okriuchykhin/ok_SCI_7375
Fix displaying of user access for E/T [SCI-7375]
2022-10-25 16:14:51 +02:00
Oleksii Kriuchykhin 232f58dd30 Fix displaying of user access for E/T [SCI-7375] 2022-10-25 16:07:55 +02:00
artoscinote 938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377
Add ENV setting for max step text length [SCI-7377]
2022-10-25 16:04:36 +02:00
artoscinote 78b3975759
Merge pull request #4575 from artoscinote/ma_SCI_7396
Fix label preview double refresh and unit issues [SCI-7396]
2022-10-25 15:55:57 +02:00
Martin Artnik 31b075ea8c Fix label preview double refresh and unit issues [SCI-7396] 2022-10-25 15:54:05 +02:00
Martin Artnik ebe0ffa286 Add ENV setting for max step text length [SCI-7377] 2022-10-25 13:08:33 +02:00
ajugo ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] (#4574) 2022-10-25 13:07:45 +02:00
artoscinote eec5fd9ab3
Merge pull request #4570 from artoscinote/ma_SCI_7357
Only render last label in ZPL [SCI-7357]
2022-10-25 11:53:52 +02:00
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00
Martin Artnik 7f384f1964 Only render last label in ZPL [SCI-7357] 2022-10-24 15:50:10 +02:00
Andrej 09a1adb194 Fix hound [SCI-7181] 2022-10-24 13:12:28 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Alex Kriuchykhin 60dc26a42b
Merge pull request #4567 from okriuchykhin/ok_SCI_7375
Fix display of user access for experiments and tasks [SCI-7375]
2022-10-24 13:05:02 +02:00
Oleksii Kriuchykhin 09440d4f83 Fix display of user access for experiments and tasks [SCI-7375] 2022-10-24 12:57:08 +02:00