scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
11371 commits 69 branches 179 tags 165 MiB
Commit graph

11371 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miha Mencin 7712690c54
Merge pull request #4468 from scinote-eln/release/1.26.0.5 
Release/1.26.0.5
 2022-09-27 09:46:16 +02:00
Miha Mencin 6cc19badfe
Bump version to 1.26.0.5 2022-09-27 09:41:53 +02:00
Oleksii Kriuchykhin 0d656f8976 Fix sorting in label templates datatable [SCI-7263] 2022-09-26 22:21:45 +02:00
Anton dbfc3b2e2a Fix column label template format [SCI-7236] 2022-09-26 21:01:31 +02:00
Oleksii Kriuchykhin b675fb14eb Fix user adding/removing from a team [SCI-7240] 2022-09-26 12:14:03 +02:00
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
aignatov-bio 5a06a685aa
Merge pull request #4460 from aignatov-bio/ai-sci-7193-add-vue-component-for-print-dialog 
Add VUE component for print dialog [SCI-7193]
 2022-09-26 10:13: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
aignatov-bio 1bb7c2227b
Merge pull request #4452 from aignatov-bio/ai-sci-7239-fix-checkboxes-safari 
Fix checkbox in safari [SCI-7239]
 2022-09-22 11:26:53 +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 50cc068750
Merge pull request #4449 from scinote-eln/revert-4431-ma_SCI_7177 
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"
 2022-09-21 10:08:17 +02:00
artoscinote 50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
aignatov-bio d4b5754727
Merge pull request #4445 from aignatov-bio/ai-sci-7224-fix-link-interactions-in-step-text 
Fix links in locked step texts elements [SCI-7224]
 2022-09-21 09:59:22 +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 d7830c7937
Merge pull request #4431 from scinote-eln/ma_SCI_7177 
Add task IDs to canvas view [SCI-7177][SCI-7178]
 2022-09-19 13:59:02 +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 37345e9225 Migration fixes [SCI-7219] 2022-09-16 15:33:19 +02:00
Martin Artnik c67213db41 Add y-scroll to step tables [SCI-7184] 2022-09-16 11:16:39 +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 cb57810370
Merge pull request #4437 from aignatov-bio/ai-sci-fix-merge-issues 
Fix merge issues for templates
 2022-09-15 14:07:09 +02:00
Anton 7ccce8a6d8 Fix merge issues for templates 2022-09-15 13:48:41 +02:00
aignatov-bio 5abffc1412
Merge pull request #4372 from aignatov-bio/ai-sci-7108-add-duplication-functionality-to-steps 
Add duplication to components [SCI-7108]
 2022-09-15 11:25:36 +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 19c20f2549
Merge pull request #4363 from aignatov-bio/ai-sci-7089-include-label-templates-to-team-import-export 
Add labels template to team import/export [SCI-7089]
 2022-09-15 11:20:28 +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
aignatov-bio 3e47391849
Merge pull request #4436 from scinote-eln/features/label-templates 
merge Features/label templates to develop
 2022-09-15 11:17:50 +02:00
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
aignatov-bio 701125573b
Merge pull request #4435 from aignatov-bio/ai-sci-7088-add-new-permissions-for-team-level 
Add new permission to label templates [SCI-7088]
 2022-09-14 15:45:15 +02:00
Anton d7990cb058 Add new permissions for label templates [SCI-7088] 2022-09-14 15:13:13 +02:00