Commit graph

11343 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
5ba6fe08d6 Fix protocol permission propagation [SCI-7348] 2022-10-19 17:26:13 +02:00
aignatov-bio
d0312c6348
Merge pull request #4546 from aignatov-bio/ai-sci-7356-fix-delete-file-modal
Fix the file name in the attachment delete modal [SCI-7356]
2022-10-19 11:15:25 +02:00
Anton
c6e5fba21c Fix file name in attachment delete modal [SCI-7356] 2022-10-19 11:12:27 +02:00
Alex Kriuchykhin
482044a448
Merge pull request #4542 from rekonder/aj_SCI_7346
Update default density for label templates [SCI-7346]
2022-10-19 10:04:53 +02:00
Alex Kriuchykhin
51edd48c7b
Merge pull request #4543 from okriuchykhin/ok_SCI_7348
Fix team level permissions migration for protocols [SCI-7348]
2022-10-19 09:53:38 +02:00
Oleksii Kriuchykhin
27fc496858 Fix team level permissions migration for protocols [SCI-7348] 2022-10-18 11:43:31 +02:00
aignatov-bio
83c3699493
Merge pull request #4539 from aignatov-bio/ai-sci-7340-save-label-dimenssions-on-preview-button
Save dimensions on refresh label template preview [SCI-7340]
2022-10-18 11:26:36 +02:00
ajugo
fab625d819
Set correct permission for repository on team role change [SCI-7341] (#4540) 2022-10-18 10:43:51 +02:00
ajugo
64975effc6
Close print label modal at print click [SCI-7327] (#4526) 2022-10-18 10:42:50 +02:00
Andrej
538f141aaf Change default density for label templates [SCI-7346] 2022-10-18 09:41:25 +02:00
Alex Kriuchykhin
0c81907ece
Merge pull request #4538 from aignatov-bio/ai-sci-7345-fix-copy-experiment-only-to-active-projects
Fix copy experiment only to active projects [SCI-7345]
2022-10-17 15:56:42 +02:00
Anton
bb354f2dbc Save dimensions on refresh label template preview [SCI-7340] 2022-10-17 12:25:08 +02:00
Anton
91c46e2005 Fix copy experiment only to active projects [SCI-7345] 2022-10-17 11:08:59 +02:00
Alex Kriuchykhin
6abfc8d293
Merge pull request #4527 from rekonder/aj_SCI_7326
Move loading label print modal for task [SCI-7326]
2022-10-17 10:21:51 +02:00
Alex Kriuchykhin
4cee224180
Merge pull request #4534 from okriuchykhin/ok_SCI_7338
Fix user role selection when inviting new users [SCI-7338]
2022-10-17 10:21:37 +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
d12cdb8a9a
Merge pull request #4530 from okriuchykhin/ok_SCI_7297_v2
Fix display of a creator in the reports table [SCI-7297]
2022-10-17 10:18:09 +02:00
Alex Kriuchykhin
7fa38be70f
Merge pull request #4532 from okriuchykhin/ok_SCI_7329
Fix team assignments migration in order to preserve timestamps [SCI-7329]
2022-10-17 10:17:09 +02:00
Alex Kriuchykhin
15813166fe
Merge pull request #4537 from okriuchykhin/ok_SCI_7343
Allow team owners to manage project users [SCI-7343]
2022-10-17 10:16:50 +02:00
Alex Kriuchykhin
eba3fc574b
Merge pull request #4536 from okriuchykhin/ok_SCI_7330
Fix permission checking in reports controller [SCI-7330][SCI-7331]
2022-10-17 10:16:15 +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
15af00934b
Merge pull request #4535 from rekonder/aj_SCI_7322
Implemented label preview options for the Viewer role [SCI-7322]
2022-10-17 09:35:47 +02:00
Oleksii Kriuchykhin
bded75ac2c Allow team owners to manage project users [SCI-7343] 2022-10-14 15:51:37 +02:00
Alex Kriuchykhin
ec81234ec5
Merge pull request #4531 from rekonder/aj_SCI_7305
Remove old label printer modal code [SCI-7305]
2022-10-14 14:44:02 +02:00
Oleksii Kriuchykhin
8e838fe09f Fix permission checking in reports controller [SCI-7330][SCI-7331] 2022-10-14 14:26:02 +02:00
Andrej
16b4a89fb8 Disable label preview options for Viewer role [SCI-7322] 2022-10-14 11:49:31 +02:00
Oleksii Kriuchykhin
a5336608f8 Fix user role selection when inviting new users [SCI-7338] 2022-10-14 11:35:35 +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
ee38de6740 Fix team assignments migration in order to preserve timestamps [SCI-7329] 2022-10-13 17:09:27 +02:00
Andrej
f3fdcc1204 Remove old label printer modal code [SCI-7305] 2022-10-13 16:49:06 +02:00
Oleksii Kriuchykhin
68fab55328 Fix display of a creator in the reports table [SCI-7297] 2022-10-13 14:55:24 +02:00
Oleksii Kriuchykhin
e43aa30193 Unify tags loading order [SCI-6943] 2022-10-13 13:55:36 +02:00
Andrej
5752401a29 Move loading label print modal on task [SCI-7326] 2022-10-13 13:16:18 +02:00
ajugo
58acb94977
Remove status from print label modal [SCI-7328] (#4524) 2022-10-12 16:56:58 +02:00
ajugo
36e061e3bb
Label template migration fix (#4523)
* Fix migration for label template

* Fix label template migration

* Fix migration

* Fix migration

* Add default to label template migration
2022-10-12 15:47:10 +02:00
ajugo
89614b75d5
Fix migration for label template (#4520)
* Fix migration for label template

* Fix label template migration

* Fix migration

* Fix migration
2022-10-12 15:03:55 +02:00
Oleksii Kriuchykhin
1bd3a7e783 Fix protocol import in templates [SCI-7325] 2022-10-12 14:27:21 +02:00
Alex Kriuchykhin
1e6c6da964
Merge pull request #4517 from okriuchykhin/ok_SCI_7298
Add option to disable local password log in [SCI-7298]
2022-10-12 12:54:34 +02:00
Alex Kriuchykhin
827567c167
Merge pull request #4515 from rekonder/aj_SCI_7314
Fixed the existing templates  [SCI-7314]
2022-10-12 11:49:09 +02:00
Alex Kriuchykhin
0831d4599c
Merge pull request #4518 from artoscinote/ma_SCI_7323
Remove legacy protocol links [SCI-7323]
2022-10-12 11:48:04 +02:00
Martin Artnik
b67bea81b8 Remove legacy protocol links [SCI-7323] 2022-10-12 11:01:16 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4 Add option to disable local password log in [SCI-7298] 2022-10-12 10:30:09 +02:00
Andrej
230aea15fc Update experiment templates [SCI-7314] 2022-10-11 15:55:56 +02:00
ajugo
e96ccdb1d5
Fix start date on locked task and correct format of number [SCI-7098] (#4366) 2022-10-11 11:31:53 +02:00
Alex Kriuchykhin
99ffbf47ab
Merge pull request #4512 from okriuchykhin/ok_SCI_7297
Fix report creation permission check [SCI-7297]
2022-10-11 11:01:31 +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
Alex Kriuchykhin
4c9f96f7f7
Merge pull request #4510 from okriuchykhin/ok_SCI_7292
Add logic for user role updates for team child objects [SCI-7292]
2022-10-11 10:49:08 +02:00
Oleksii Kriuchykhin
f68e85532c Fix report creation permission check [SCI-7297] 2022-10-10 16:16:54 +02:00
Alex Kriuchykhin
3592faea78
Merge pull request #4511 from okriuchykhin/ok_SCI_7230
Fix filtering by user role for teams table [SCI-7320]
2022-10-10 16:07:34 +02:00