Commit graph

8908 commits

Author SHA1 Message Date
Alex Kriuchykhin
fcd235b654
Merge pull request #4457 from okriuchykhin/ok_SCI_7241
Improve error handling in label template preview generation [SCI-7241]
2022-09-26 10:33:30 +02:00
aignatov-bio
e96b15b241
Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen
Update fluics view and permissions for label templates [SCI-7222]
2022-09-26 10:22:01 +02:00
ajugo
8c2f7da87f
Escape underscores when sending ZPL to render service [SCI-7223] (#4456) 2022-09-26 10:21:12 +02:00
Anton
d3886c9bf7 Small fixes [SCI-7193] 2022-09-26 10:02:41 +02:00
Anton
40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
aignatov-bio
bc1683dc40
Merge pull request #4459 from rekonder/aj_SCI_7250
Fix archived task button [SCI-7250]
2022-09-23 13:50:09 +02:00
aignatov-bio
94044d020d
Merge pull request #4458 from aignatov-bio/ai-sci-7239-fix-checkboxes-safari
Fix checkbox in safari [SCI-7239]
2022-09-23 12:50:39 +02:00
Andrej
c60ca19c62 Fix archived task button [SCI-7250] 2022-09-23 12:42:17 +02:00
Anton
4e32707245 Fix dupicate protocols in activities search [SCI-7171] 2022-09-23 12:38:44 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] (#4455) 2022-09-23 12:34:43 +02:00
Oleksii Kriuchykhin
1d7bca0664 Improve error handling in label template preview generation [SCI-7241] 2022-09-22 15:24:30 +02:00
ajugo
a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448)
* Add validation to print modal [SCI-7052]

* Fix dropdown on label modal print [SCI-7052]

* Fix hound [SCI-7052]

* Rename validation endpoint [SCI-7052]

* Add zpl label printing and fix fluics printing [SCI-7221]

* Fix hound [SCI-7221]
2022-09-22 15:06:36 +02:00
Anton
9bc4610cae Fix checkbox in safari [SCI-7239] 2022-09-22 11:24:02 +02:00
artoscinote
e0e592338c
Merge pull request #4440 from artoscinote/ma_SCI_7219
Migration fixes [SCI-7219]
2022-09-21 13:45:29 +02:00
artoscinote
e3ca916c2a
Merge pull request #4447 from scinote-eln/ma_SCI_7184
Add y-scroll to step tables [SCI-7184]
2022-09-21 10:29:19 +02:00
artoscinote
50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
Anton
07f0142789 Fix links in locked step texts elements [SCI-7224] 2022-09-20 15:44:52 +02:00
ajugo
6f3a32f09f
Add label template dropdown to print dialog [SCI-7104] (#4387)
* Add label template dropdown to print dialog [SCI-7051]

* Add zebra printers in printing progress and modal [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Clean code for zebra printer [SCI-7104]
2022-09-20 14:10:34 +02:00
Anton
fed1228adc Update fluics and permissions for label templates [SCI-7222] 2022-09-20 12:59:58 +02:00
aignatov-bio
e524355207
Merge pull request #4441 from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates
Add validation to label template code [SCI-7210]
2022-09-20 11:59:59 +02:00
artoscinote
6faa59581e
Merge pull request #4427 from artoscinote/ma_SCI_7163
Skip previews for non-supported images in team zip export [SCI-7163]
2022-09-19 13:59:35 +02:00
artoscinote
cf3a233f4e
Merge branch 'develop' into ma_SCI_7177 2022-09-19 13:58:33 +02:00
artoscinote
dddbc16a50
Merge pull request #4438 from scinote-eln/ma_SCI_7184
Add y-scroll to step tables [SCI-7184]
2022-09-19 13:56:17 +02:00
Anton
17bf490fef Add validation to label template code [SCI-7210] 2022-09-19 11:59:36 +02:00
Martin Artnik
e99e021479 Fix user smart annotations [SCI-7219] 2022-09-16 16:08:36 +02:00
Martin Artnik
c67213db41 Add y-scroll to step tables [SCI-7184] 2022-09-16 11:16:39 +02:00
Andrej
ec77c2a076 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027 2022-09-16 10:44:07 +02:00
Andrej
231dd40602 Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:41:51 +02:00
Andrej
4fb3f7ff3d Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:39:39 +02:00
Andrej
ac7c873385 Session end implementation [SCI-7027] 2022-09-16 09:57:40 +02:00
artoscinote
500adb346e
Merge pull request #4426 from G-Chubinidze/gc_SCI_7115
added scrollbar to task paper dropdown [SCI-7115]
2022-09-15 15:29:25 +02:00
Giga Chubinidze
7c0407af7a refactored scrollbar to fit style guides 2022-09-15 16:44:40 +04:00
aignatov-bio
e1ce81280e
Merge pull request #4430 from aignatov-bio/ai-sci-7171-duplicate-protocols-in-activities
Fix duplicate protocols in activities search [SCI-7171]
2022-09-15 14:07:23 +02:00
aignatov-bio
c0339b17be
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps 2022-09-15 11:25:25 +02:00
aignatov-bio
7d23f3c8a6
Merge branch 'develop' into ai-sci-7089-include-label-templates-to-team-import-export 2022-09-15 11:20:20 +02:00
Anton
0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton
d7990cb058 Add new permissions for label templates [SCI-7088] 2022-09-14 15:13:13 +02:00
aignatov-bio
4182194b31
Merge branch 'features/label-templates' into features/team-permissions 2022-09-14 14:34:02 +02:00
aignatov-bio
33f210638a
Merge branch 'features/team-permissions' into ok_SCI_6947 2022-09-14 14:31:45 +02:00
aignatov-bio
9e63dcab22
Merge pull request #4207 from okriuchykhin/ok_SCI_6918
Update repository sharing actions [SCI-6918]
2022-09-14 14:23:52 +02:00
Anton
75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Martin Artnik
3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Martin Artnik
b836b9a12b Add task IDs to canvas view [SCI-7177] 2022-09-13 12:42:12 +02:00
Anton
d68bb6ddf4 Fix dupicate protocols in activities search [SCI-7171] 2022-09-13 12:38:26 +02:00
aignatov-bio
06548c247f
Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable
Add ability to disable zebra printers [SCI-7148]
2022-09-12 13:54:52 +02:00
Martin Artnik
2e3956aaf9 Skip previews for non-supported images in team zip export [SCI-7163] 2022-09-12 12:31:17 +02:00
Giga Chubinidze
271867710f added scrollbar to task paper dropdown [SCI-7115] 2022-09-09 23:28:37 +04:00
Alex Kriuchykhin
f62e4e8509
Merge pull request #4423 from okriuchykhin/ok_SCI_7180
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
2022-09-09 15:58:44 +02:00
Oleksii Kriuchykhin
b8dc0617b2 Improve speed of group unassignment job as it is executed in foreground [SCI-7180] 2022-09-09 13:31:16 +02:00
artoscinote
fa7e39c6a9
Fix experiment page infinite scroll [SCI-7160] (#4422) 2022-09-09 11:42:37 +02:00