Commit graph

11482 commits

Author SHA1 Message Date
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
Alex Kriuchykhin
d4cb8de300
Merge pull request #4556 from scinote-eln/dependabot/bundler/nokogiri-1.13.9
Bump nokogiri from 1.13.7 to 1.13.9
2022-10-21 15:44:03 +02:00
Alex Kriuchykhin
224bbe9afd
Merge pull request #4564 from okriuchykhin/ok_SCI_7360_v3
Fix repository permissions helper [SCI-7360]
2022-10-21 14:58:34 +02:00
Oleksii Kriuchykhin
d38556e3fa Fix repository permissions helper [SCI-7360] 2022-10-21 14:51:16 +02:00
Alex Kriuchykhin
3bc3036b58
Merge pull request #4563 from okriuchykhin/ok_SCI_7360_v2
Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]
2022-10-21 14:36:52 +02:00
Alex Kriuchykhin
23a8f8fc07
Merge pull request #4561 from okriuchykhin/ok_SCI_7363
Fix task access display modal [SCI-7363]
2022-10-21 14:29:28 +02:00
Oleksii Kriuchykhin
a9e7e81e51 Fix typo in update team assignments service, improve shared inventories migration [SCI-7360] 2022-10-21 14:04:33 +02:00
Alex Kriuchykhin
2ddb6d8685
Merge pull request #4558 from rekonder/aj_SCI_7373
Fix permission on experiment open for org admins [SCI-7373]
2022-10-21 13:48:28 +02:00
Alex Kriuchykhin
207b8311af
Merge pull request #4559 from aignatov-bio/ai-sci-7374-fix-protocol-creation-from-dashboard
Fix protocol creation from dashboard [SCI-7374]
2022-10-21 13:47:33 +02:00
Oleksii Kriuchykhin
8dfedfe165 Fix task access display modal [SCI-7363] 2022-10-21 13:33:22 +02:00
Anton
05902d485b Fix protocol creation from dashboard [SCI-7374] 2022-10-21 11:40:50 +02:00
Andrej
140dc8c768 Fix permission on experiment open for org admins [SCI-7373] 2022-10-21 11:25:54 +02:00
Alex Kriuchykhin
6e2b40aef3
Merge pull request #4557 from okriuchykhin/ok_SCI_7360
Fix shared repositories migration, update sharing logic and permissions [SCI-7360]
2022-10-21 11:08:58 +02:00
Oleksii Kriuchykhin
7d3f48199a Fix shared repositories migration, update sharing logic and permissions [SCI-7360] 2022-10-21 11:00:52 +02:00
Alex Kriuchykhin
1799361944
Merge pull request #4555 from okriuchykhin/ok_SCI_7366
Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]
2022-10-21 10:35:10 +02:00
dependabot[bot]
311f3d0baf
Bump nokogiri from 1.13.7 to 1.13.9
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.7 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.7...v1.13.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-21 03:54:44 +00:00
Oleksii Kriuchykhin
94978ea2ea Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366] 2022-10-20 16:19:02 +02:00
aignatov-bio
c7ee068893
Merge pull request #4554 from aignatov-bio/ai-sci-7367-fix-label-preview-in-print-modal
Fix label preview in print modal [SCI-7367]
2022-10-20 11:02:46 +02:00
Anton
ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
Alex Kriuchykhin
a55390898a
Merge pull request #4553 from okriuchykhin/ok_SCI_7348_v2
Fix protocol permission propagation [SCI-7348]
2022-10-20 09:24:44 +02:00
ajugo
3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +02:00
Oleksii Kriuchykhin
5ba6fe08d6 Fix protocol permission propagation [SCI-7348] 2022-10-19 17:26:13 +02:00
ajugo
0a56d772b7
Move print button for shared repository in view mode [SCI-7277] (#4550) 2022-10-19 14:10:04 +02:00
ajugo
9639e30c72
Generate correct format for create at at print time [SCI-7351] (#4547) 2022-10-19 13:18:52 +02:00
ajugo
98c32fda78
Fix label preview for custom repository columns [SCI-7358] (#4549) 2022-10-19 13:18:33 +02:00
aignatov-bio
822a4f87c7
Merge pull request #4548 from aignatov-bio/ai-sci-7350-replace-label-template-promo-logo
Replace label template promo logo [SCI-7350]
2022-10-19 11:44:06 +02:00
Anton
1062fbc2fd Replace label template promo logo [SCI-7350] 2022-10-19 11:25:49 +02:00
aignatov-bio
d0312c6348
Merge pull request #4546 from aignatov-bio/ai-sci-7356-fix-delete-file-modal
Fix the file name in the attachment delete modal [SCI-7356]
2022-10-19 11:15:25 +02:00
Anton
c6e5fba21c Fix file name in attachment delete modal [SCI-7356] 2022-10-19 11:12:27 +02:00
Alex Kriuchykhin
482044a448
Merge pull request #4542 from rekonder/aj_SCI_7346
Update default density for label templates [SCI-7346]
2022-10-19 10:04:53 +02:00
Alex Kriuchykhin
51edd48c7b
Merge pull request #4543 from okriuchykhin/ok_SCI_7348
Fix team level permissions migration for protocols [SCI-7348]
2022-10-19 09:53:38 +02:00
Anton
689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +02:00
Oleksii Kriuchykhin
27fc496858 Fix team level permissions migration for protocols [SCI-7348] 2022-10-18 11:43:31 +02:00
aignatov-bio
83c3699493
Merge pull request #4539 from aignatov-bio/ai-sci-7340-save-label-dimenssions-on-preview-button
Save dimensions on refresh label template preview [SCI-7340]
2022-10-18 11:26:36 +02:00
ajugo
fab625d819
Set correct permission for repository on team role change [SCI-7341] (#4540) 2022-10-18 10:43:51 +02:00
ajugo
64975effc6
Close print label modal at print click [SCI-7327] (#4526) 2022-10-18 10:42:50 +02:00
Andrej
538f141aaf Change default density for label templates [SCI-7346] 2022-10-18 09:41:25 +02:00
Alex Kriuchykhin
0c81907ece
Merge pull request #4538 from aignatov-bio/ai-sci-7345-fix-copy-experiment-only-to-active-projects
Fix copy experiment only to active projects [SCI-7345]
2022-10-17 15:56:42 +02:00
Anton
bb354f2dbc Save dimensions on refresh label template preview [SCI-7340] 2022-10-17 12:25:08 +02:00
Anton
91c46e2005 Fix copy experiment only to active projects [SCI-7345] 2022-10-17 11:08:59 +02:00
Alex Kriuchykhin
6abfc8d293
Merge pull request #4527 from rekonder/aj_SCI_7326
Move loading label print modal for task [SCI-7326]
2022-10-17 10:21:51 +02:00
Alex Kriuchykhin
4cee224180
Merge pull request #4534 from okriuchykhin/ok_SCI_7338
Fix user role selection when inviting new users [SCI-7338]
2022-10-17 10:21:37 +02:00
Alex Kriuchykhin
63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2
Unify tags loading order [SCI-6943]
2022-10-17 10:21:13 +02:00
Alex Kriuchykhin
d12cdb8a9a
Merge pull request #4530 from okriuchykhin/ok_SCI_7297_v2
Fix display of a creator in the reports table [SCI-7297]
2022-10-17 10:18:09 +02:00