scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
11190 commits 70 branches 179 tags 165 MiB
Commit graph

11190 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artoscinote e0e592338c
Merge pull request #4440 from artoscinote/ma_SCI_7219 
Migration fixes [SCI-7219]
 2022-09-21 13:45:29 +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
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
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
Anton 6ef7fa1f12 Merge branch 'features/label-templates' of github.com:scinote-eln/scinote-web into features/label-templates 2022-09-14 14:35:25 +02:00
aignatov-bio 94ad2ce986
Merge pull request #4434 from scinote-eln/features/team-permissions 
merge features/team permissions
 2022-09-14 14:34:29 +02:00
aignatov-bio 4182194b31
Merge branch 'features/label-templates' into features/team-permissions 2022-09-14 14:34:02 +02:00
aignatov-bio 873ed9d70a
Merge pull request #4212 from okriuchykhin/ok_SCI_6947 
Update inventory global sharing logic to use new user assignments [SCI-6947]
 2022-09-14 14:31:57 +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 3e4aa9d020 Merge branch 'features/label-templates' of github.com:scinote-eln/scinote-web into features/label-templates 2022-09-13 18:47:05 +02:00
aignatov-bio 4ec4eb869e
Merge pull request #4433 from aignatov-bio/ai-sci-merge-team-permissions-to-labels 
Merge Team permissions to template labels
 2022-09-13 18:44:35 +02:00
Anton 75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Anton 0d1b4cb01a Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:20:57 +02:00
artoscinote e8add30225
Bump version to 
1.26.0.4
 2022-09-13 13:24:43 +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
artoscinote 6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
Oleksii Kriuchykhin d5205843f4 Enable Fluics sync only if env variable is present [SCI-7047] 2022-09-08 17:22:29 +02:00
Alex Kriuchykhin b5d60499d5
Merge pull request #4373 from okriuchykhin/ok_SCI_7086 
Add activities for label template actions [SCI-7086]
 2022-09-08 16:41:14 +02:00
Oleksii Kriuchykhin bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00