Martin Artnik
c828d02b99
Merge branch 'develop' into features/tiny_mce_6
2022-12-07 14:07:43 +01:00
Giga Chubinidze
47d593f0db
Missing navigate away pop up at inventory page [SCI-7492]
2022-11-23 15:38:01 +04:00
Alex Kriuchykhin
dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181
...
Remove old step code [SCI-7181]
2022-11-22 10:52:06 +01:00
ajugo
f2a680d826
Fix zebra printer print status [SCI-7474] ( #4625 )
2022-11-21 16:55:03 +01:00
aignatov-bio
4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms
...
Fix css issues for login and signup forms [SCI-7233]
2022-11-10 11:15:03 +01:00
aignatov-bio
2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982
...
Implement multiline editing in repositories [SCI-6982][SCI-6983]
2022-11-10 11:07:30 +01:00
artoscinote
0994c4a25b
Merge branch 'develop' into ma_SCI_6982
2022-11-10 11:04:57 +01:00
aignatov-bio
0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027
...
Session end implementation [SCI-7027]
2022-11-10 11:03:02 +01:00
Oleksii Kriuchykhin
c361dec0b6
Fix Fluics templates sync scheduler [SCI-7435]
2022-11-07 11:55:01 +01:00
Anton
34ffcbd8e8
Fix duplicate activities wording [SCI-7426]
2022-11-04 11:07:59 +01:00
ajugo
22fad95efd
Rename protocol repository to templates [SCI-7418] ( #4587 )
2022-10-28 11:47:54 +02:00
ajugo
ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] ( #4574 )
2022-10-25 13:07:45 +02:00
ajugo
58bca40632
Change zebra label instructions [SCI-7390] ( #4572 )
2022-10-25 11:44:50 +02:00
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Anton
689c34e54d
Fix css issues for login and signup forms [SCI-7233]
2022-10-18 11:54:10 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4
Add option to disable local password log in [SCI-7298]
2022-10-12 10:30:09 +02:00
Oleksii Kriuchykhin
0e95b7ea66
Connect update fluics template button with controller action [SCI-7261]
2022-10-07 14:52:23 +02:00
artoscinote
77b91b467a
Merge pull request #4485 from rekonder/aj_SCI_7270
...
Add label printer modal to task [SCI-7270][7296]
2022-10-06 15:01:31 +02:00
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +02:00
Andrej
eebdee5129
Add label printer modal to task [SCI-7270]
2022-09-29 16:35:51 +02:00
Anton
9dc667f8e1
CSS fixes for label templates [SCI-7262]
2022-09-29 14:09:16 +02:00
Anton
3773fff093
Add label validation and preview in print modal [SCI-7255][SCI-7256]
2022-09-27 15:46:48 +02:00
ajugo
aa10259d40
Fix loading of zebra printers to modal and some other small fixes [SCI-7244] ( #4463 )
...
* Fix loading of zebra printers to modal and some other small fixes [SCI-7244]
* Fix zebra printing [SCI-7244]
2022-09-27 09:58:22 +02:00
Anton
40022a7012
Add initial VUE container for print dialog [SCI-7193]
2022-09-23 14:07:52 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] ( #4455 )
2022-09-23 12:34:43 +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
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
17bf490fef
Add validation to label template code [SCI-7210]
2022-09-19 11:59:36 +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
ac7c873385
Session end implementation [SCI-7027]
2022-09-16 09:57:40 +02:00
Anton
7ccce8a6d8
Fix merge issues for templates
2022-09-15 13:48:41 +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
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
Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +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
Oleksii Kriuchykhin
d5205843f4
Enable Fluics sync only if env variable is present [SCI-7047]
2022-09-08 17:22:29 +02:00
Oleksii Kriuchykhin
bb6e638528
Add activities for label template actions [SCI-7086]
2022-09-08 16:35:53 +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
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] ( #4385 )
...
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]
* Cleanup and refactor [SCI-7081]
* Clean up legacy plugins [SCI-7150]
* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +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
Martin Artnik
ef9cd21ecf
Make project action dropdowns async [SCI-7159]
2022-09-02 13:47:45 +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
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
d555227652
Add acitvities and flash messages for component duplication [SCI-7108]
2022-08-31 11:09:38 +02:00