Giga Chubinidze
ba0ebfbe29
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-26 01:18:54 +04:00
Alex Kriuchykhin
b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1
...
Release/1.26.2.1
2022-11-22 11:07:20 +01:00
Giga Chubinidze
43f8370a08
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 13:55:41 +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
42af732073
Fix zebra printer switch and optimize zebra library loading [SCI-7430] ( #4612 )
...
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]
* Fix zebra enabled [SCI-7430]
2022-11-14 10:43:09 +01:00
G-Chubinidze
8e63bfb7c2
Update my_module.rb
2022-11-09 14:46:36 +04:00
G-Chubinidze
996cb68fdd
Update my_module.rb
2022-11-09 14:45:18 +04:00
G-Chubinidze
62b48ee59a
updated my_module rb, added searchable id attribute
2022-11-09 13:36:55 +04:00
Giga Chubinidze
18fe2cd207
update display of the current tasks with IDs [SCI-7205]
2022-11-08 16:06:48 +04:00
Oleksii Kriuchykhin
82d4b03cf6
Fix global activities user selection dropdown [SCI-7402]
2022-11-07 21:58:06 +01:00
G-Chubinidze
81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172
2022-10-28 15:05:38 +04:00
artoscinote
938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377
...
Add ENV setting for max step text length [SCI-7377]
2022-10-25 16:04:36 +02:00
Martin Artnik
ebe0ffa286
Add ENV setting for max step text length [SCI-7377]
2022-10-25 13:08:33 +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
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Oleksii Kriuchykhin
7d3f48199a
Fix shared repositories migration, update sharing logic and permissions [SCI-7360]
2022-10-21 11:00:52 +02:00
Oleksii Kriuchykhin
94978ea2ea
Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]
2022-10-20 16:19:02 +02:00
Oleksii Kriuchykhin
5ba6fe08d6
Fix protocol permission propagation [SCI-7348]
2022-10-19 17:26:13 +02:00
Andrej
538f141aaf
Change default density for label templates [SCI-7346]
2022-10-18 09:41:25 +02:00
Alex Kriuchykhin
63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2
...
Unify tags loading order [SCI-6943]
2022-10-17 10:21:13 +02:00
Alex Kriuchykhin
51da8edacc
Merge pull request #4533 from okriuchykhin/ok_SCI_7336
...
Fix project users assignment to newly created experiments [SCI-7336]
2022-10-17 10:15:44 +02:00
Alex Kriuchykhin
c725e1f100
Merge pull request #4521 from okriuchykhin/ok_SCI_7325
...
Fix protocol import in templates [SCI-7325]
2022-10-14 11:19:29 +02:00
Oleksii Kriuchykhin
a3b8f98b24
Fix project users assignment to newly created experiments [SCI-7336]
2022-10-14 10:23:57 +02:00
Oleksii Kriuchykhin
e43aa30193
Unify tags loading order [SCI-6943]
2022-10-13 13:55:36 +02:00
Oleksii Kriuchykhin
1bd3a7e783
Fix protocol import in templates [SCI-7325]
2022-10-12 14:27:21 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4
Add option to disable local password log in [SCI-7298]
2022-10-12 10:30:09 +02:00
ajugo
0493d6f31d
Fix label template preview issues [SCI-7313] ( #4514 )
...
* Add preview label at open modal [SCI-7313]
* Add density and unit to the label template [SCI-7313]
2022-10-11 10:58:37 +02:00
Oleksii Kriuchykhin
9322052f9d
Add logic for user role updates for team child objects [SCI-7292]
2022-10-10 15:27:42 +02:00
Alex Kriuchykhin
5158b3e155
Merge pull request #4505 from okriuchykhin/ok_SCI_7308
...
Fix user invitation modal [SCI-7308]
2022-10-07 14:53:34 +02:00
Alex Kriuchykhin
4d529cfcb5
Merge pull request #4499 from okriuchykhin/ok_SCI_7291
...
Update teams table with new user assignments system [SCI-7291]
2022-10-07 14:53:19 +02:00
Oleksii Kriuchykhin
173e3b09cd
Fix user invitation modal [SCI-7308]
2022-10-06 17:55:51 +02:00
Alex Kriuchykhin
9152cee31f
Merge pull request #4496 from okriuchykhin/ok_SCI_7290
...
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-06 15:45:48 +02:00
Alex Kriuchykhin
d648492bad
Merge pull request #4500 from okriuchykhin/ok_SCI_7293
...
Fix project visibility for team admins [SCI-7293]
2022-10-06 15:45:29 +02:00
Alex Kriuchykhin
5ab361123e
Merge pull request #4501 from okriuchykhin/ok_SCI_7295
...
Assign user to public projects after adding to a team [SCI-7295]
2022-10-06 15:45:17 +02:00
ajugo
f87b42d042
Remove icon from the status repository column at label print time [SCI-7267] ( #4471 )
...
* Remove icon from the status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
2022-10-06 11:53:12 +02:00
Oleksii Kriuchykhin
9a05bf04bd
Assign user to public projects after adding to a team [SCI-7295]
2022-10-05 22:40:46 +02:00
Oleksii Kriuchykhin
b87ed7db8e
Fix project visibility for team admins [SCI-7293]
2022-10-05 19:40:45 +02:00
Oleksii Kriuchykhin
0a8ebef095
Update teams table with new user assignments system [SCI-7291]
2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin
cf34ddcbd1
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-04 13:53:45 +02:00
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +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
artoscinote
50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"
2022-09-21 10:07:44 +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
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
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
Giga Chubinidze
22aa04a5ac
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:57:17 +04:00
Giga Chubinidze
133302964c
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:53:41 +04:00
Giga Chubinidze
0a1b879c3d
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:49:12 +04:00
Martin Artnik
b836b9a12b
Add task IDs to canvas view [SCI-7177]
2022-09-13 12:42:12 +02:00
Giga Chubinidze
2c393a1bef
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:31:04 +04:00
Giga Chubinidze
fbbe394029
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:24:06 +04:00
Anton
7d02b9f26d
Fix repository selection in reports [SCI-7167]
2022-09-13 09:59:11 +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
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
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
e27d063b61
Make permission checks for card selection async [SCI-7157]
2022-09-02 18:10:16 +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
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
d555227652
Add acitvities and flash messages for component duplication [SCI-7108]
2022-08-31 11:09:38 +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
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
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
artoscinote
610ee6bdaa
Don't adjust step position in bulk deletion [SCI-7079] ( #4339 )
2022-08-10 12:05:24 +02:00
aignatov-bio
6334b481ef
Merge pull request #4337 from aignatov-bio/ai-sci-7080-fix-step-element-deletetion
...
Fix step element delete callback [SCI-7080]
2022-08-10 11:03:17 +02:00
Anton
5cd887831c
Fix step element delete callback [SCI-7080]
2022-08-10 10:50:18 +02:00
Oleksii Kriuchykhin
d1a46b3fc2
Fix protocol linked protocol changes tracking [SCI-6986]
2022-08-09 14:15:49 +02:00
artoscinote
464f9935a4
Migration fixes [SCI-7046] ( #4321 )
2022-08-08 11:21:38 +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
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
Oleksii Kriuchykhin
cb71bb4a99
Fix copying of TinyMCE images when loading protocol from repository [SCI-7043]
2022-08-02 13:43:50 +02:00
Anton
67df01711f
Add edit actions to label templates [SCI-7019]
2022-07-28 14:42:13 +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
Anton
a8ccc18b8b
Fix protocol save to repository [SCI-6965]
2022-07-25 12:53:27 +02:00
Alex Kriuchykhin
7874a3e1c5
Fix updating protocol from repository [SCI-6993] ( #4266 )
2022-07-20 10:14:48 +02:00
ajugo
1cd5a35b32
Fix refresh task name from linked protocol [SCI-6992] ( #4256 )
2022-07-15 10:14:49 +02:00
Anton
e320571876
Update protocol name on save with link [SCI-6989]
2022-07-14 12:59:12 +02:00
artoscinote
ee792b89df
Fix loading repositories that contain tables [SCI-6951] ( #4200 )
2022-07-11 10:58:20 +02:00
Oleksii Kriuchykhin
d0d528aeac
Update inventory global sharing logic to use new user assignments [SCI-6947]
2022-07-07 22:31:07 +02:00
Alex Kriuchykhin
26820b9abb
Fix subject references for repository row activities [SCI-6906] ( #4203 )
2022-07-07 12:00:35 +02:00
Alex Kriuchykhin
a7e88e59bd
Update global search to use new step text elements [SCI-6873] ( #4165 )
2022-07-06 14:20:55 +02:00
Alex Kriuchykhin
9aeb107635
Fix saving protocol to repository [SCI-6935] ( #4190 )
2022-07-06 11:45:04 +02:00
Alex Kriuchykhin
7af1684db0
Fix import of repository checklist items [SCI-6962] ( #4198 )
2022-07-06 11:44:41 +02:00
aignatov-bio
5b37a96e79
Merge pull request #4174 from aignatov-bio/ai-sci-6759-load-save-protocol-from-repository
...
Fix load/save protocol to repository [SCI-6759]
2022-07-05 12:57:59 +02:00
Martin Artnik
910c36af08
Merge branch 'features/step-editing-improvements' into develop
2022-07-05 10:12:10 +02:00