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

8686 commits

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 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 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
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
artoscinote 6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
Oleksii Kriuchykhin bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00
G-Chubinidze e179182d21
fix archived repositories show button not showing [SCI-7162] (#4408) 
* fix archived repositories show button not showing [SCI-7162]

* fix archived repositories show button not showing [SCI-7162]

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2022-09-08 11:51:47 +02:00
Oleksii Kriuchykhin 3d3fa6e871 Do not change team if inventory is shared with current one [SCI-7164] 2022-09-07 11:01:53 +02:00
artoscinote 95105b86af
Fix ininite scroll [SCI-7160] (#4414) 2022-09-07 10:01:00 +02:00
aignatov-bio 2407b95e37
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave 
Remove scroll before page leave [SCI-7169]
 2022-09-06 12:44:20 +02:00
artoscinote d2b022a17d
Remove obsolete code [SCI-7160] (#4412) 2022-09-06 12:10:20 +02:00
artoscinote 21f91089e9
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410) 2022-09-06 11:57:34 +02:00
Anton 90e962ccbf Remove scroll before page leave [SCI-7169] 2022-09-06 11:15:28 +02:00
artoscinote 9126b7fca4
Add missing protocol description activity [SCI-7140] (#4401) 2022-09-06 11:03:13 +02:00
Alex Kriuchykhin 8a0656ce21
Merge pull request #4147 from okriuchykhin/ok_SCI_6834 
Update tests with new team user assignments [SCI-6843]
 2022-09-05 14:34:16 +02:00
Anton 47e20d1b27 Add ability to disable zebra printers [SCI-7148] 2022-09-05 12:37:03 +02:00
aignatov-bio b585219be2
Merge pull request #4402 from aignatov-bio/ai-sci-7127-fix-error-handling-for-tinymce 
Fix error handling for tinymce [SCI-7127]
 2022-09-05 12:36:36 +02:00
Oleksii Kriuchykhin f85a6b5a2e Make experiment card dropdown menu async [SCI-7158] 2022-09-02 18:15:01 +02:00
Oleksii Kriuchykhin e27d063b61 Make permission checks for card selection async [SCI-7157] 2022-09-02 18:10:16 +02:00
Alex Kriuchykhin 0fcedc32ba
Merge pull request #4403 from artoscinote/ma_SCI_7159 
Make project action dropdowns async [SCI-7159]
 2022-09-02 17:05:35 +02:00
Martin Artnik a2a5e8c4c8 Add caching and improve dynamic reload [SCI-7159] 2022-09-02 16:54:41 +02:00
artoscinote 27b4f398a4
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161 
Fix underline in docx report generator [SCI-7161]
 2022-09-02 15:13:13 +02:00
Giga Chubinidze f8842cd066 Fix underline in docx report generator [SCI-7161] 2022-09-02 17:11:36 +04:00
Anton 34b87ae92f Fix files loading during copy [SCI-7149] 2022-09-02 15:09:56 +02:00