Commit graph

9862 commits

Author SHA1 Message Date
artoscinote 12bb44147c
Merge pull request #3482 from artoscinote/ma_SCI_5984
Optimize how printing jobs and statuses work [SCI-5984]
2021-08-13 09:25:42 +02:00
Martin Artnik 1d3e0db904 Optimize how printing jobs and statuses work [SCI-5984] 2021-08-12 16:57:25 +02:00
aignatov-bio 87416470f1
Fix empty state for bioEddie [SCI-5987] (#3481) 2021-08-12 15:20:21 +02:00
artoscinote f818649fab
Merge pull request #3479 from artoscinote/ma_SCI_5996
Fixed for assets that belong to protocol step [SCI-5996]
2021-08-12 13:56:10 +02:00
Martin Artnik 1db06b46f7 Fixed for assets that belong to protocol step [SCI-5996] 2021-08-12 13:45:38 +02:00
artoscinote a65d8ad365
Merge pull request #3477 from artoscinote/ma_SCI_5985
Fixed handling deletion for asset activity display [SCI-5985]
2021-08-12 12:23:23 +02:00
Martin Artnik c3fef50d3e Fixed handling deletion for asset activity display [SCI-5985] 2021-08-12 12:18:12 +02:00
Alex Kriuchykhin ae809c2233
Merge pull request #3473 from biosistemika/dependabot/npm_and_yarn/path-parse-1.0.7
Bump path-parse from 1.0.6 to 1.0.7
2021-08-11 15:54:03 +02:00
Alex Kriuchykhin d4cfd35edc
Merge pull request #3474 from biosistemika/dependabot/npm_and_yarn/url-parse-1.5.3
Bump url-parse from 1.5.1 to 1.5.3
2021-08-11 15:52:32 +02:00
artoscinote ad179298fc
Merge pull request #3476 from artoscinote/ma_SCI_5985
Fixed registering bioeddie molecule on step [SCI-5985]
2021-08-11 14:12:38 +02:00
Martin Artnik 143e491016 Fixed registering bioeddie molecule on step [SCI-5985] 2021-08-11 14:10:05 +02:00
artoscinote 67330ab27f
Merge pull request #3475 from artoscinote/ma_SCI_5979
Fix disabled refresh printers button [SCI-5979]
2021-08-11 13:22:51 +02:00
Martin Artnik 5d5f406e9a Downcase all user emails, downcase when finding user [SCI-5963] 2021-08-11 13:18:58 +02:00
Martin Artnik 9a8a9c7b34 Fix disabled refresh printers button [SCI-5979] 2021-08-11 12:23:18 +02:00
dependabot[bot] 2a0751098e
Bump url-parse from 1.5.1 to 1.5.3
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-11 10:22:16 +00:00
artoscinote 1fc9027d1a
Merge pull request #3466 from aignatov-bio/ai-sci-5964-cancel-changes-after-exit-webhook-edit-mode
Cancel changes after exit webhook edit mode [SCI-5964]
2021-08-11 12:14:12 +02:00
aignatov-bio 5eb2c4a28b
Fix image extension in empty printers modal [SCI-5971] (#3470) 2021-08-11 11:43:16 +02:00
artoscinote 5acc106b1a
Merge pull request #3472 from artoscinote/ma_SCI_5982
Fix issues with BioEddie integration [SCI-5982]
2021-08-11 10:22:30 +02:00
Martin Artnik 861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
dependabot[bot] ee10b93964
Bump path-parse from 1.0.6 to 1.0.7
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-11 00:40:34 +00:00
Alex Kriuchykhin 4326965444
Merge pull request #3471 from artoscinote/ma_SCI_5975
Fix label template to work properly with FLUICS [SCI-5975]
2021-08-10 16:20:52 +02:00
Martin Artnik 9db1078b42 Fix label template to work properly with FLUICS [ma_SCI_5975] 2021-08-10 14:54:33 +02:00
artoscinote d0f8544075
Merge pull request #3468 from artoscinote/ma_SCI_5973
Fixed handling of activity subject parents when matching activity filters [SCI-5973]
2021-08-06 13:58:07 +02:00
Martin Artnik 8f3f39f7c7 Fixed handling of activity subject parents when matching activity filters [SCI-5973] 2021-08-06 13:43:30 +02:00
aignatov-bio 04e58740d8
Add VUE with webpack (#3467) 2021-08-05 13:15:49 +02:00
aignatov-bio cfa7937f88 Cancel changes after exit webhook edit mode [SCI-5964] 2021-08-05 12:44:01 +02:00
aignatov-bio 1565b4bbfb
Fix permission migration (#3465) 2021-08-05 10:10:35 +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
Martin Artnik 67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00