sboursen-scinote
217561e809
Set the default sotring of inventory items datatable to asc on name [SCI-7562]
2023-01-25 16:11:33 +01:00
Martin Artnik
4e779e70a4
Merge branch 'develop' into features/tiny_mce_6
2023-01-04 14:21:02 +01:00
Alex Kriuchykhin
2ea5000ea5
Merge pull request #4737 from okriuchykhin/ok_SCI_7643
...
Add missing permissions for inventories and protocols [SCI-7643]
2023-01-04 13:22:33 +01:00
Oleksii Kriuchykhin
06f3c34e3a
Add missing permissions for inventories and protocols [SCI-7643]
2022-12-22 16:46:26 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views
2022-12-22 13:33:25 +01:00
Martin Artnik
c828d02b99
Merge branch 'develop' into features/tiny_mce_6
2022-12-07 14:07:43 +01:00
Oleksii Kriuchykhin
49fbc2c561
Add basic modal for direct task creation [SCI-7197]
2022-11-18 17:00:11 +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
bacd3524e8
Add tags manager to experiment table view [SCI-7368]
2022-11-02 15:17:10 +01:00
ajugo
58bca40632
Change zebra label instructions [SCI-7390] ( #4572 )
2022-10-25 11:44:50 +02:00
Anton
bc86f11404
Add experiment table view [SCI-7174]
2022-10-21 12:22:38 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4
Add option to disable local password log in [SCI-7298]
2022-10-12 10:30:09 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] ( #4455 )
2022-09-23 12:34:43 +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
Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +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
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
f586c73dc8
Convert team_repository to polymorphic relation [SCI-6917]
2022-08-31 16:42:08 +02:00
Anton
d555227652
Add acitvities and flash messages for component duplication [SCI-7108]
2022-08-31 11:09:38 +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
e22af8830a
Add activties to step duplication [SCI-7109]
2022-08-24 13:45:39 +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
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
Oleksii Kriuchykhin
da9ad5797c
Make devise session timeout configurable through env variable [SCI-7028]
2022-07-28 17:15:47 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] ( #4292 )
...
* Initial label template datatable [SCI-7018]
* Add new columns to LabelTemplate and update datatable view [SCI-7018]
* Fix after rebase [SCI-7018]
* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02:00
artoscinote
3d2e835268
DOCX layout improvements [SCI-6857] ( #4160 )
2022-07-13 12:52:56 +02:00
Alex Kriuchykhin
26820b9abb
Fix subject references for repository row activities [SCI-6906] ( #4203 )
2022-07-07 12:00:35 +02:00
Oleksii Kriuchykhin
3fbc5af9a1
Convert team_repository to polymorphic relation [SCI-6917]
2022-06-29 15:22:22 +02:00
artoscinote
ab5cb19d6e
Add step activities, fix checklists [SCI-6852] ( #4136 )
...
* Add step activities, fix checklists [SCI-6852]
* Linter fix [SCI-6852]
2022-06-02 11:15:32 +02:00
artoscinote
98d66a3276
Implement reordering activities [SCI-6851] ( #4129 )
...
* Implement reordering activities [SCI-6851]
* Added asset activity types [SCI-SCI-6853]
2022-06-01 12:30:09 +02:00
Oleksii Kriuchykhin
c120a357cd
Add permissions for Report model [SCI-6834]
2022-05-24 10:59:21 +02:00
Oleksii Kriuchykhin
39cfcd5522
Add migration for user team roles, including protocols and inventories [SCI-6820]
2022-05-23 16:28:53 +02:00
Oleksii Kriuchykhin
c397616106
Add teams, protocols and inventories specific permission definitions [SCI-6819]
2022-05-16 11:10:19 +02:00
Anton
24d68da455
Fix tinymce assets for steps [SCI-6809]
2022-05-11 13:01:23 +02:00
ajugo
54474b2bba
API GET repository stock column output fix [SCI-6550] ( #4030 )
...
* Add include stock unit items to Stock column get [SCI-6550]
* Fix stock column test [SCI-6550]
* Fix hound [SCI-6550]
2022-04-19 16:05:17 +02:00
aignatov-bio
4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination
...
Features/projects experiments pagination
2022-04-14 10:45:27 +02:00
Anton
d091c56e9f
Add pagination for experiments [SCI-6656]
2022-04-12 15:16:02 +02:00
ajugo
0a5e93a018
API: add endpoint for creating stock column [SCI-6550] ( #3956 )
...
* Add test for repositoty stock column api [SCI-6550]
* Create and update stock column [SCI-6550]
* Change stock unit [SCI-6550]
* Fix hound [SCI-6550]
* Fix on delete [SCI-6550]
* Fix houd [SCI-6550]
2022-04-08 14:09:00 +02:00
artoscinote
5effe34221
Add reminder preset to date(time) reminders [SCI-6693] ( #3996 )
2022-04-07 12:27:21 +02:00
