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
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
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
Anton
0862221345
Invite user modal fixes [SCI-7100]
2022-08-29 14:01:31 +02:00
Oleksii Kriuchykhin
b2b059b7e1
Add syncing service and schedule for Fluics templates sync [SCI-7047]
2022-08-29 09:59:13 +02:00
ajugo
185bf0b197
Add label template dropdown to print dialog [SCI-7051] ( #4369 )
2022-08-26 10:53:55 +02:00
aignatov-bio
6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor
2022-08-24 17:48:48 +02:00
Martin Artnik
0aa4ff11d4
Add missing route [SCI-7053]
2022-08-24 14:10:51 +02:00
artoscinote
7a7df03396
Implement label preview component [SCI-7050] ( #4370 )
2022-08-24 13:55:54 +02:00
Anton
e22af8830a
Add activties to step duplication [SCI-7109]
2022-08-24 13:45:39 +02:00
Anton
bc112dd6af
Add step duplication [SCI-7109]
2022-08-23 17:54:33 +02:00
Anton
1bac9aeb4c
Add duplication to components [SCI-7108]
2022-08-22 15:03:49 +02:00
Anton
45bbbfffe4
Update label template promo text [SCI-7060]
2022-08-18 15:33:19 +02:00
Anton
4f312bf329
Finalize insert field dropdown [SCI-7054]
2022-08-17 12:58:27 +02:00
ajugo
39fbb2a9a0
Fix office modal and protocol status [SCI-7064] ( #4352 )
2022-08-12 14:57:56 +02:00
artoscinote
e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] ( #4348 )
...
* Add name prompt for tables with empty names [SCI-7082]
* Move to separate component [SCI-7082]
2022-08-12 10:17:45 +02:00
ajugo
83c78d660f
Added activity for update protocol name [SCI-7095] ( #4346 )
...
* Added activity for update protocol name [SCI-7095]
* Fix activity log for updated protocol name [SCI-7095]
* Fix activity log for updated protocol name [SCI-7095]
2022-08-11 14:09:01 +02:00
artoscinote
4e768bec04
Add endpoint for fetching label template tags [SCI-7053] ( #4319 )
2022-08-10 11:35:38 +02:00
ajugo
b6f273410b
Fix protocol repository CSS [SCI-7064] ( #4335 )
...
* Fix protocol repository CSS [SCI-7064]
* Fix protocol repository CSS [SCI-7064]
* Fix hound [SCI-7064]
2022-08-10 10:27:15 +02:00
artoscinote
c106c2d997
Add active reminders filter [SCI-7004] ( #4280 )
2022-08-09 10:23:40 +02:00
ajugo
1ee091aa53
Fix selected default step title and step name placeholder [SCI-7067] ( #4326 )
...
* Fix selected default step title in edit mode and step name placeholder [SCI-7067]
* Add new placeholder label [SCI-7067]
2022-08-08 16:50:34 +02:00
Anton
51cb951e06
Update labels index page [SCI-7048]
2022-08-08 11:15:46 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] ( #4316 )
...
* Implement typed label templates [SCI-7046]
* Add structure.sql, fix migration [SCI-7046]
* Fix method name [SCI-7046]
* Add dependent option to team - label_template relation [SCI-7046]
* Migration code style, add input sanitization [SCI-7046]
* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
aignatov-bio
e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen
...
Add general layout for template view screen [SCI-7030]
2022-08-04 14:13:25 +02:00
Anton
a38aa80fb5
Add main functionality to view/edit screen [SCI-7041]
2022-08-04 13:37:21 +02:00
ajugo
b58e3cd4d8
Add zebra settings screen [SCI-7016] ( #4310 )
...
* Add zebra settings screen [SCI-7016]
* Fix hound [SCI-7016]
2022-08-04 11:14:35 +02:00
Anton
31202922af
Add general layout for template [SCI-7030]
2022-08-04 10:51:30 +02:00
Anton
8c080ea04c
Add promo page for label templates [SCI-7029]
2022-08-02 14:51:18 +02:00
Alex Kriuchykhin
baa565db8d
Merge pull request #4297 from okriuchykhin/ok_SCI_7028
...
Make devise session timeout configurable through env variable [SCI-7028]
2022-08-01 16:37:53 +02:00
Anton
bf50c42549
Fix error handling for step attachments [SCI-7032]
2022-08-01 13:57:17 +02:00
artoscinote
a527edd07d
Attachment management fixes [SCI-7022] ( #4296 )
...
* Attachment management fixes [SCI-7022]
* Linter fixes [SCI-7022]
2022-08-01 13:14:04 +02:00
