Commit graph

9724 commits

Author SHA1 Message Date
aignatov-bio
cfa7937f88 Cancel changes after exit webhook edit mode [SCI-5964] 2021-08-05 12:44:01 +02:00
Martin Artnik
024f9117e6 fix failing specs 2021-08-03 14:16:22 +02:00
artoscinote
d4697f5f7e
Merge pull request #3462 from biosistemika/features/barcodes
Features/barcodes
2021-08-03 13:37:05 +02:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote
f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration
Features/bioeddie integration
2021-08-03 13:32:53 +02:00
artoscinote
f24207588c
Merge pull request #3463 from biosistemika/features/webhooks
Features/webhooks
2021-08-03 13:32:12 +02:00
artoscinote
c41247a5fd
Merge pull request #3439 from artoscinote/ma_SCI_5879
Implement Save & Register molecule [SCI-5879]
2021-08-03 12:15:46 +02:00
Martin Artnik
13ddff89a8 Fixed Asset relation handling in activities [ma_SCI_5789] 2021-08-03 09:59:06 +02:00
Martin Artnik
a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
artoscinote
fe43017ba4
Merge pull request #3445 from artoscinote/ma_SCI_5898
Fixed UX issues in user invites modal [SCI-5898]
2021-08-02 15:58:16 +02:00
artoscinote
919e583aa6
Merge pull request #3460 from artoscinote/ma_SCI_5942
Integrated backend and frontend [SCI-5942]
2021-08-02 15:55:03 +02:00
Martin Artnik
a19f109e65 Add printer description [SCI-5942] 2021-08-02 15:50:26 +02:00
Martin Artnik
ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
Martin Artnik
123e415a4f Print status backend + FE integration [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio
43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00
aignatov-bio
a782ce50d1
Add bio eddie files to export all [SCI-5877] (#3426) 2021-08-02 13:27:02 +02:00
Martin Artnik
e63a665140 Merge branch 'develop' into features/barcodes 2021-08-02 11:15:48 +02:00
Martin Artnik
0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
artoscinote
3649e2fbe0
Merge pull request #3457 from artoscinote/ma_SCI_5903
Added print job queue system, job status endpoint [SCI-5903]
2021-07-29 13:06:34 +02:00
aignatov-bio
02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
artoscinote
21d780e4ca
Merge pull request #3446 from artoscinote/ma_SCI_5893
Fix style of experiment id in dropdown [SCI-5893]
2021-07-29 11:44:52 +02:00
artoscinote
e337fda414
Merge pull request #3459 from artoscinote/ma_SCI_5662
Corrected type for 'assignment' activities [SCI-5662]
2021-07-29 10:54:16 +02:00
Martin Artnik
5c4f923854 Corrected type for 'assignment' activities [SCI-5662] 2021-07-29 10:13:28 +02:00
artoscinote
4e2363fc64
Merge pull request #3458 from artoscinote/ma_SCI_5938
Added overridable send permission method to notifications [SCI-5938]
2021-07-28 13:18:06 +02:00
Martin Artnik
b41ee028ca Added overridable send permission method to notifications [SCI-5938] 2021-07-28 13:14:07 +02:00
aignatov-bio
a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
aignatov-bio
8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
Martin Artnik
3f2a294cdc Added wait for printer ready state in print job [SCI-5903] 2021-07-27 16:09:23 +02:00
Martin Artnik
e57132dbd0 Added print job queue system, job status endpoint [SCI-5903] 2021-07-27 15:26:18 +02:00
artoscinote
46a9388d8d
Merge pull request #3451 from artoscinote/ma_SCI_5911
Implemented printer management [SCI-5911]
2021-07-27 13:19:13 +02:00
aignatov-bio
d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
Martin Artnik
53e072f79e Added error handling to API wrapper [SCI-5939] 2021-07-27 10:36:06 +02:00
Martin Artnik
61919e81b6 Remove FLUICS API client hack [SCI-5939] 2021-07-27 09:41:51 +02:00
Martin Artnik
110ddd872e Added placeholder FLUICS printer setup 2021-07-23 14:56:21 +02:00
Martin Artnik
b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Alex Kriuchykhin
a688cbc9e5
Merge pull request #3396 from artoscinote/ma_SCI_5800
Add webhooks backend [SCI-5800]
2021-07-22 14:06:19 +02:00
Martin Artnik
662370d2bd Removed auto-disable, fixed ActiveJob + DelayedJob retry handling [SCI-5800] 2021-07-22 13:43:36 +02:00
Martin Artnik
4bb080c25b Merge migrations, code fixes [SCI-5800] 2021-07-22 10:51:03 +02:00
Martin Artnik
04b94d504d Moved activity logging to controller [SCI-5879] 2021-07-22 09:52:04 +02:00
Martin Artnik
d54a743e64 Fixed handling of dropdown-selector max height [SCI-5898] 2021-07-22 09:37:25 +02:00
aignatov-bio
d4f974ac64
Add inline editing for folder name [SCI-5896] (#3430) 2021-07-21 21:33:13 +02:00
aignatov-bio
7b0ea6f701
Show experiment id for users with read only permission [SCI-5895] (#3434) 2021-07-21 21:33:00 +02:00
aignatov-bio
be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447)
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
2021-07-21 21:32:42 +02:00
artoscinote
7551432687
Merge pull request #3443 from artoscinote/ma_SCI_5902
Implement label templates with default ZPL template [SCI-5902]
2021-07-21 14:53:27 +02:00
aignatov-bio
f2e5dc8b2f
Add printers to addon page [SCI-5904][SCI-5931] (#3450)
* Add printers to addon page [SCI-5904]

* Fix markup
2021-07-21 13:48:38 +02:00
Alex Kriuchykhin
dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847
Fix repository cell joining and preloading [SCI-5847]
2021-07-21 13:18:21 +02:00
Alex Kriuchykhin
0459602327
Merge pull request #3415 from okriuchykhin/ok_SCI_5844
Add biomolecular toolkit license endpoint [SCI-5844]
2021-07-21 13:17:56 +02:00
Oleksii Kriuchykhin
b69ed98e13 Add biomolecular toolkit license endpoint [SCI-5844] 2021-07-21 13:16:27 +02:00
Alex Kriuchykhin
e881bf32ae
Merge pull request #3414 from okriuchykhin/ok_SCI_5843
Add biomolecular toolkit API proxying endpoint [SCI-5843]
2021-07-21 13:14:04 +02:00
Alex Kriuchykhin
dbc54278b2
Merge pull request #3211 from okriuchykhin/ok_SCI_5531
Add basic API client for BMT [SCI-5531]
2021-07-21 13:13:52 +02:00