scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
11570 commits 70 branches 179 tags 165 MiB
Commit graph

8979 commits

Author SHA1 Message Date
ajugo 3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +02:00
Oleksii Kriuchykhin 5ba6fe08d6 Fix protocol permission propagation [SCI-7348] 2022-10-19 17:26:13 +02:00
ajugo 0a56d772b7
Move print button for shared repository in view mode [SCI-7277] (#4550) 2022-10-19 14:10:04 +02:00
ajugo 9639e30c72
Generate correct format for create at at print time [SCI-7351] (#4547) 2022-10-19 13:18:52 +02:00
ajugo 98c32fda78
Fix label preview for custom repository columns [SCI-7358] (#4549) 2022-10-19 13:18:33 +02:00
aignatov-bio 822a4f87c7
Merge pull request #4548 from aignatov-bio/ai-sci-7350-replace-label-template-promo-logo 
Replace label template promo logo [SCI-7350]
 2022-10-19 11:44:06 +02:00
Anton 1062fbc2fd Replace label template promo logo [SCI-7350] 2022-10-19 11:25:49 +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
Anton 689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +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
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 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
Giga Chubinidze 62febd44dd centered project code for tables 2022-10-13 20:31:37 +04:00
Giga Chubinidze 94e28ecc8d fixed switching from cards to list 2022-10-13 19:22:41 +04: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
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
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
Alex Kriuchykhin 4ac46f876a
Merge pull request #4509 from rekonder/aj_SCI_7315 
Fix selected printer for printing [SCI-7315]
 2022-10-10 15:59:29 +02:00
Alex Kriuchykhin 3a9b568358
Merge pull request #4508 from rekonder/aj_SCI_7318 
Fix view permission at label template table [SCI-7318]
 2022-10-10 15:59:02 +02:00
Oleksii Kriuchykhin a88e936693 Fix filtering by user role for teams table [SCI-7230] 2022-10-10 15:48:38 +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
Andrej 5d6b454756 Fix selected printer for printing [SCI-7315] 2022-10-10 13:33:35 +02:00
Andrej 42193bbe81 Fix view permission at label template table [SCI-7318] 2022-10-07 17:16:40 +02:00
Giga Chubinidze f7472d25b9 more styling fixes 2022-10-07 17:14:43 +04: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 0e95b7ea66 Connect update fluics template button with controller action [SCI-7261] 2022-10-07 14:52:23 +02:00
Giga Chubinidze 3f3c2a3504 project name card size change 2022-10-07 15:27:33 +04:00
G-Chubinidze 47e4244d9e
Update _manage_due_date_modal.html.erb 2022-10-07 14:38:59 +04:00
Giga Chubinidze 8b5ff3955b fixed can not set due date on task card issue [SCI-7251] 2022-10-07 14:14:29 +04:00
Oleksii Kriuchykhin 173e3b09cd Fix user invitation modal [SCI-7308] 2022-10-06 17:55:51 +02:00
Alex Kriuchykhin 07d470b2ff
Merge pull request #4479 from okriuchykhin/ok_SCI_7271 
Fix label printing status modal [SCI-7271]
 2022-10-06 15:46:36 +02:00
Alex Kriuchykhin 0f394b34ce
Merge pull request #4495 from okriuchykhin/ok_SCI_7289 
Fix search in team members table [SCI-7289]
 2022-10-06 15:46:03 +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
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
ajugo 5f38464369
Fix open label template in new tab [SCI-7302] (#4503) 2022-10-06 14:57:45 +02:00
Andrej 16a7dd261f Add name to zebra printer initialization [SCI-7312] 2022-10-06 14:52:15 +02:00
ajugo 88d9ece237
Fix zebra printer library load [SCI-7310] (#4502) 2022-10-06 13:52:49 +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
ajugo eef93c42d8
Disable print modal button for offline printer statuses [SCI-7276] (#4493) 
* Disable print modal button for offline printer statuses [SCI-7276]

* Disable print modal button for offline printer statuses [SCI-7276]
 2022-10-06 11:19:51 +02:00
aignatov-bio bd535dc9ad
Add dimension saving to label templates [SCI-7268] (#4489) 2022-10-06 11:09:10 +02:00
Alex Kriuchykhin ae8f5526be
Merge pull request #4490 from aignatov-bio/ai-sci-7287-fix-validation-on-print-modal 
Fix validation on print modal [SCI-7287]
 2022-10-06 10:42:36 +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
ajugo 7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] (#4492) 2022-10-04 09:57:47 +02:00
Andrej 884fe58525 Fix label print open issue [SCI-7296] 2022-10-03 17:33:42 +02:00
Oleksii Kriuchykhin 830248ada9 Fix search in team members table [SCI-7289] 2022-10-03 16:56:15 +02:00
Andrej e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +02:00
Oleksii Kriuchykhin b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00
aignatov-bio aba760f1a4
Merge pull request #4486 from aignatov-bio/ai-sci-7285-fix-duplicate-label-in-dropdown-component 
Fix duplicate labels in dropdown components [SCI-7285]
 2022-09-30 19:51:34 +02:00
Anton 85248a0426 Fix validation on print modal [SCI-7287] 2022-09-30 19:48:13 +02:00
artoscinote b65422b74d
Merge pull request #4488 from artoscinote/ma_SCI_7288 
Add extension to icon image path, to fix it in production [SCI-7288]
 2022-09-30 14:31:43 +02:00
Martin Artnik 846690401d Add extension to icon image path, to fix it in production [SCI-7288] 2022-09-30 14:26:32 +02:00
aignatov-bio 13f24cac08
Merge pull request #4483 from aignatov-bio/ai-sci-7262-css-fixes-label-templates 
CSS fixes for label templates [SCI-7262]
 2022-09-30 09:47:39 +02:00
Anton 0107368b67 Fix duplicate labels in dropdown components [SCI-7285] 2022-09-29 21:11:00 +02:00
aignatov-bio 096c285235
Merge pull request #4484 from aignatov-bio/ai-sci-7265-fix-css-label-templates-table-view 
Fix css label templates table view [SCI-7265]
 2022-09-29 20:58:51 +02:00
Andrej e8528e6120 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7270 2022-09-29 16:36:44 +02:00
Andrej eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +02:00
ajugo 103bdff654
Select default label template based on selected pritner type [SCI-7268][7257] (#4475) 2022-09-29 14:47:59 +02:00
ajugo 69bc48fef8
Add cancel button and fix number input [SCI-7274] (#4478) 2022-09-29 14:45:10 +02:00
Anton 9d9f6e26bb Fix css label templates table view [SCI-7265] 2022-09-29 14:29:25 +02:00
Anton 9dc667f8e1 CSS fixes for label templates [SCI-7262] 2022-09-29 14:09:16 +02:00
aignatov-bio d9dc76c0f9
Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template 
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
 2022-09-29 13:56:39 +02:00
artoscinote d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +02:00
Oleksii Kriuchykhin ac11d41359 Fix label printing status modal [SCI-7271] 2022-09-28 17:01:07 +02:00
Anton 7e06f29a75 Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260] 2022-09-28 11:34:24 +02:00
aignatov-bio 31554d0fd9
Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal 
Add label validation and preview in print modal [SCI-7255][SCI-7256]
 2022-09-28 11:32:39 +02:00
ajugo 0e8ad6abf1
Implement toggle for zebra printers searching feature [SCI-7242] (#4470) 2022-09-27 15:57:23 +02:00
Anton 3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02:00
Anton d22ec4960d Add loading label to settings printers search [SCI-7253] 2022-09-27 12:02:50 +02:00
Alex Kriuchykhin db0a5ede84
Merge pull request #4462 from okriuchykhin/ok_SCI_7240 
Fix user adding/removing from a team [SCI-7240]
 2022-09-27 10:30:35 +02:00
Alex Kriuchykhin 0c41ee9dec
Merge pull request #4466 from okriuchykhin/ok_SCI_7263 
Fix sorting in label templates datatable [SCI-7263]
 2022-09-27 10:30:08 +02:00
Giga Chubinidze 8608e61513 fixed duplicate titles in empty index repositories [SCI-7162] 2022-09-27 12:25:39 +04: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
Oleksii Kriuchykhin 0d656f8976 Fix sorting in label templates datatable [SCI-7263] 2022-09-26 22:21:45 +02:00
Anton dbfc3b2e2a Fix column label template format [SCI-7236] 2022-09-26 21:01:31 +02:00
Oleksii Kriuchykhin b675fb14eb Fix user adding/removing from a team [SCI-7240] 2022-09-26 12:14:03 +02:00
Alex Kriuchykhin fcd235b654
Merge pull request #4457 from okriuchykhin/ok_SCI_7241 
Improve error handling in label template preview generation [SCI-7241]
 2022-09-26 10:33:30 +02:00
aignatov-bio e96b15b241
Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen 
Update fluics view and permissions for label templates [SCI-7222]
 2022-09-26 10:22:01 +02:00
ajugo 8c2f7da87f
Escape underscores when sending ZPL to render service [SCI-7223] (#4456) 2022-09-26 10:21:12 +02:00
Anton d3886c9bf7 Small fixes [SCI-7193] 2022-09-26 10:02:41 +02:00
Anton 40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
aignatov-bio bc1683dc40
Merge pull request #4459 from rekonder/aj_SCI_7250 
Fix archived task button [SCI-7250]
 2022-09-23 13:50:09 +02:00
aignatov-bio 94044d020d
Merge pull request #4458 from aignatov-bio/ai-sci-7239-fix-checkboxes-safari 
Fix checkbox in safari [SCI-7239]
 2022-09-23 12:50:39 +02:00
Andrej c60ca19c62 Fix archived task button [SCI-7250] 2022-09-23 12:42:17 +02:00
Anton 4e32707245 Fix dupicate protocols in activities search [SCI-7171] 2022-09-23 12:38:44 +02:00
ajugo b7861f5fdb
Add zebra javascript print library [SCI-7245] (#4455) 2022-09-23 12:34:43 +02:00
Oleksii Kriuchykhin 1d7bca0664 Improve error handling in label template preview generation [SCI-7241] 2022-09-22 15:24:30 +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
Anton 9bc4610cae Fix checkbox in safari [SCI-7239] 2022-09-22 11:24:02 +02:00
artoscinote e0e592338c
Merge pull request #4440 from artoscinote/ma_SCI_7219 
Migration fixes [SCI-7219]
 2022-09-21 13:45:29 +02:00
artoscinote e3ca916c2a
Merge pull request #4447 from scinote-eln/ma_SCI_7184 
Add y-scroll to step tables [SCI-7184]
 2022-09-21 10:29:19 +02:00
artoscinote 50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
Anton 07f0142789 Fix links in locked step texts elements [SCI-7224] 2022-09-20 15:44:52 +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 fed1228adc Update fluics and permissions for label templates [SCI-7222] 2022-09-20 12:59:58 +02:00
aignatov-bio e524355207
Merge pull request #4441 from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates 
Add validation to label template code [SCI-7210]
 2022-09-20 11:59:59 +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
artoscinote dddbc16a50
Merge pull request #4438 from scinote-eln/ma_SCI_7184 
Add y-scroll to step tables [SCI-7184]
 2022-09-19 13:56:17 +02:00
Anton 17bf490fef Add validation to label template code [SCI-7210] 2022-09-19 11:59:36 +02:00
Martin Artnik e99e021479 Fix user smart annotations [SCI-7219] 2022-09-16 16:08:36 +02:00
Martin Artnik c67213db41 Add y-scroll to step tables [SCI-7184] 2022-09-16 11:16:39 +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 231dd40602 Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:41:51 +02:00
Andrej 4fb3f7ff3d Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:39:39 +02:00
Andrej ac7c873385 Session end implementation [SCI-7027] 2022-09-16 09:57:40 +02:00
Giga Chubinidze 102eed8241 Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:27:23 +04:00
Giga Chubinidze b31f60026a Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:20:04 +04:00
artoscinote 500adb346e
Merge pull request #4426 from G-Chubinidze/gc_SCI_7115 
added scrollbar to task paper dropdown [SCI-7115]
 2022-09-15 15:29:25 +02:00
Giga Chubinidze 7c0407af7a refactored scrollbar to fit style guides 2022-09-15 16:44:40 +04:00
aignatov-bio e1ce81280e
Merge pull request #4430 from aignatov-bio/ai-sci-7171-duplicate-protocols-in-activities 
Fix duplicate protocols in activities search [SCI-7171]
 2022-09-15 14:07:23 +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
aignatov-bio 7d23f3c8a6
Merge branch 'develop' into ai-sci-7089-include-label-templates-to-team-import-export 2022-09-15 11:20:20 +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
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 3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Martin Artnik b836b9a12b Add task IDs to canvas view [SCI-7177] 2022-09-13 12:42:12 +02:00
Anton d68bb6ddf4 Fix dupicate protocols in activities search [SCI-7171] 2022-09-13 12:38:26 +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
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
Giga Chubinidze 271867710f added scrollbar to task paper dropdown [SCI-7115] 2022-09-09 23:28:37 +04:00
Alex Kriuchykhin f62e4e8509
Merge pull request #4423 from okriuchykhin/ok_SCI_7180 
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
 2022-09-09 15:58:44 +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
artoscinote fa7e39c6a9
Fix experiment page infinite scroll [SCI-7160] (#4422) 2022-09-09 11:42:37 +02:00
artoscinote 6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
Oleksii Kriuchykhin bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00
G-Chubinidze e179182d21
fix archived repositories show button not showing [SCI-7162] (#4408) 
* fix archived repositories show button not showing [SCI-7162]

* fix archived repositories show button not showing [SCI-7162]

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2022-09-08 11:51:47 +02:00
Oleksii Kriuchykhin 3d3fa6e871 Do not change team if inventory is shared with current one [SCI-7164] 2022-09-07 11:01:53 +02:00
artoscinote 95105b86af
Fix ininite scroll [SCI-7160] (#4414) 2022-09-07 10:01:00 +02:00
aignatov-bio 2407b95e37
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave 
Remove scroll before page leave [SCI-7169]
 2022-09-06 12:44:20 +02:00
artoscinote d2b022a17d
Remove obsolete code [SCI-7160] (#4412) 2022-09-06 12:10:20 +02:00
artoscinote 21f91089e9
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410) 2022-09-06 11:57:34 +02:00
Anton 90e962ccbf Remove scroll before page leave [SCI-7169] 2022-09-06 11:15:28 +02:00
artoscinote 9126b7fca4
Add missing protocol description activity [SCI-7140] (#4401) 2022-09-06 11:03:13 +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
aignatov-bio b585219be2
Merge pull request #4402 from aignatov-bio/ai-sci-7127-fix-error-handling-for-tinymce 
Fix error handling for tinymce [SCI-7127]
 2022-09-05 12:36:36 +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
Alex Kriuchykhin 0fcedc32ba
Merge pull request #4403 from artoscinote/ma_SCI_7159 
Make project action dropdowns async [SCI-7159]
 2022-09-02 17:05:35 +02:00
Martin Artnik a2a5e8c4c8 Add caching and improve dynamic reload [SCI-7159] 2022-09-02 16:54:41 +02:00
artoscinote 27b4f398a4
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161 
Fix underline in docx report generator [SCI-7161]
 2022-09-02 15:13:13 +02:00
Giga Chubinidze f8842cd066 Fix underline in docx report generator [SCI-7161] 2022-09-02 17:11:36 +04:00
Anton 34b87ae92f Fix files loading during copy [SCI-7149] 2022-09-02 15:09:56 +02:00
Giga Chubinidze 85873213b8 Fix underline in docx report generator [SCI-7161] 2022-09-02 16:44:51 +04:00
Martin Artnik ef9cd21ecf Make project action dropdowns async [SCI-7159] 2022-09-02 13:47:45 +02:00
aignatov-bio 491ff286f6
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout 
Fix bell flyout in assigned repository [SCI-7113]
 2022-09-02 11:21:17 +02:00
aignatov-bio 2e190510c4
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position 
Fix rte toolbar position [SCI-7136]
 2022-09-02 11:20:32 +02:00
aignatov-bio e605471269
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal 
Invite user modal fixes [SCI-7100]
 2022-09-02 11:20:18 +02:00
Anton 5f21c06b26 Fix error handling for tinymce [SCI-7127] 2022-09-02 11:19:54 +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
Alex Kriuchykhin 284bfe106d
Merge pull request #4398 from okriuchykhin/ok_SCI_7133 
Optimise PE cards loading [SCI-7133]
 2022-09-01 12:05:05 +02:00
Oleksii Kriuchykhin e276054a80 Optimize PE cards loading [SCI-7133] 2022-09-01 11:59:39 +02:00