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 |
|
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 |
|
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 |
|
Giga Chubinidze
|
85873213b8
|
Fix underline in docx report generator [SCI-7161]
|
2022-09-02 16:44:51 +04:00 |
|
Martin Artnik
|
ef9cd21ecf
|
Make project action dropdowns async [SCI-7159]
|
2022-09-02 13:47:45 +02:00 |
|
aignatov-bio
|
491ff286f6
|
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout
Fix bell flyout in assigned repository [SCI-7113]
|
2022-09-02 11:21:17 +02:00 |
|
aignatov-bio
|
2e190510c4
|
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position
Fix rte toolbar position [SCI-7136]
|
2022-09-02 11:20:32 +02:00 |
|
aignatov-bio
|
e605471269
|
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal
Invite user modal fixes [SCI-7100]
|
2022-09-02 11:20:18 +02:00 |
|
Anton
|
5f21c06b26
|
Fix error handling for tinymce [SCI-7127]
|
2022-09-02 11:19:54 +02:00 |
|
Alex Kriuchykhin
|
a5fc66a6f3
|
Merge pull request #4388 from okriuchykhin/ok_SCI_7047
Add syncing service and schedule for Fluics templates sync [SCI-7047]
|
2022-09-01 14:13:18 +02:00 |
|
Alex Kriuchykhin
|
284bfe106d
|
Merge pull request #4398 from okriuchykhin/ok_SCI_7133
Optimise PE cards loading [SCI-7133]
|
2022-09-01 12:05:05 +02:00 |
|
Oleksii Kriuchykhin
|
e276054a80
|
Optimize PE cards loading [SCI-7133]
|
2022-09-01 11:59:39 +02:00 |
|
artoscinote
|
87e944c9c4
|
Merge pull request #4400 from G-Chubinidze/gc_SCI_7141
Fix superscript and subscript in docx report generator [SCI-7141]
|
2022-09-01 11:34:08 +02:00 |
|
Giga Chubinidze
|
57c5947d91
|
Fix superscript and subscript in docx report generator [SCI-7141]
|
2022-09-01 10:49:17 +04:00 |
|
Giga Chubinidze
|
922652417a
|
Fix superscript and subscript in docx report generator [SCI-7141]
|
2022-09-01 10:15:31 +04:00 |
|
Oleksii Kriuchykhin
|
ba54f42d2f
|
Wrap unsaring actions in transaction [SCI-6918]
|
2022-08-31 17:21:01 +02:00 |
|
Oleksii Kriuchykhin
|
bf8f838214
|
Update repository sharing actions [SCI-6918]
|
2022-08-31 17:21:01 +02:00 |
|
Oleksii Kriuchykhin
|
f586c73dc8
|
Convert team_repository to polymorphic relation [SCI-6917]
|
2022-08-31 16:42:08 +02:00 |
|
Oleksii Kriuchykhin
|
eb04bc974d
|
Update tests with new team user assignments [SCI-6843]
|
2022-08-31 16:37:00 +02:00 |
|
Anton
|
312f2a1357
|
Fix rte toolbar position [SCI-7136]
|
2022-08-31 13:15:08 +02:00 |
|
Anton
|
d555227652
|
Add acitvities and flash messages for component duplication [SCI-7108]
|
2022-08-31 11:09:38 +02:00 |
|
aignatov-bio
|
57282069e9
|
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template
Add sorting by default label template [SCI-7084]
|
2022-08-31 10:36:02 +02:00 |
|
Anton
|
bcc681b14d
|
Add labels template to team import/export [SCI-7089]
|
2022-08-31 10:28:29 +02:00 |
|
aignatov-bio
|
91f1310338
|
Merge pull request #4364 from aignatov-bio/ai-sci-7060-update-promo-text
Update label template promo text [SCI-7060]
|
2022-08-31 10:13:42 +02:00 |
|
aignatov-bio
|
17d69131f3
|
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables
Fix overflow issue on step text [SCI-7124]
|
2022-08-31 10:13:27 +02:00 |
|
aignatov-bio
|
042e0330a7
|
Merge pull request #4386 from aignatov-bio/ai-sci-7117-fix-project-scroll-issue
Fix project/experiment scroll issue [SCI-7117]
|
2022-08-31 10:13:10 +02:00 |
|
artoscinote
|
ceb3d95e0f
|
Merge pull request #4394 from artoscinote/ma_SCI_7135
Fix smart annotations for locked tasks [SCI-7135]
|
2022-08-31 09:58:48 +02:00 |
|
Martin Artnik
|
d3665a940e
|
Fix smart annotations for locked tasks [SCI-7135]
|
2022-08-31 09:49:47 +02:00 |
|
artoscinote
|
04245c8244
|
Merge pull request #4393 from artoscinote/ma_SCI_7118
Fix sorting of results by newest/oldest (by updated_at) [SCI-7118]
|
2022-08-31 09:10:26 +02:00 |
|
Martin Artnik
|
6b25759715
|
Fix import issues with date formatting [SCI-7111]
|
2022-08-31 09:06:16 +02:00 |
|
Martin Artnik
|
bd1e30d19b
|
Add default measurments to label templates [SCI-7129]
|
2022-08-30 16:16:02 +02:00 |
|
Martin Artnik
|
194963a94e
|
Fix sorting of results by newest/oldest (by updated_at) [SCI-7118]
|
2022-08-30 11:48:09 +02:00 |
|
Anton
|
0862221345
|
Invite user modal fixes [SCI-7100]
|
2022-08-29 14:01:31 +02:00 |
|
Anton
|
d2639d4633
|
Fix bell flyout in assigned repository [SCI-7113]
|
2022-08-29 11:30:39 +02:00 |
|
Oleksii Kriuchykhin
|
b2b059b7e1
|
Add syncing service and schedule for Fluics templates sync [SCI-7047]
|
2022-08-29 09:59:13 +02:00 |
|
Anton
|
a1117fbc0e
|
Fix project/experiment scroll issue [SCI-7117]
|
2022-08-26 16:29:53 +02:00 |
|