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

9773 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
aignatov-bio 546b108bd2
Fix webhooks page for user without teams [SCI-6016] (#3498) 2021-08-20 13:14:24 +02:00
artoscinote 5856778e69
Merge pull request #3494 from aignatov-bio/ai-sci-6018-fix-edit-icon-for-bioeddie 
Add edit bio eddie button to asset card [SCI-6018]
 2021-08-20 11:06:17 +02:00
artoscinote c89384cf3c
Merge pull request #3495 from aignatov-bio/ai-sci-6015-clear-errors-on-new-webhook 
Clear errors on cancel new webhook form [SCI-6015]
 2021-08-20 11:05:44 +02:00
artoscinote c977decd8a
Merge pull request #3496 from aignatov-bio/ai-sci-5950-fix-webhook-position-in-menu 
Fix webhook sidebar position and fix texting in inventory [SCI-5950]
 2021-08-20 11:05:15 +02:00
aignatov-bio dc192ddbfb Fix webhook sidebar position and fix texting in invnetory [SCI-5950] 2021-08-19 14:23:53 +02:00
aignatov-bio 1b44d49983 Clear errors on cancel new webhook form [SCI-6015] 2021-08-19 13:42:42 +02:00
aignatov-bio 5ed4d9e65e Add edit bio eddie button to asset card [SCI-6018] 2021-08-19 13:28:35 +02:00
aignatov-bio bbb6cd226b
Add permission check for webhooks sidebar button [SCI-6016] (#3493) 2021-08-19 12:04:52 +02:00
aignatov-bio a61446acf5
Add close button to label printer modal [SCI-6000] (#3492) 2021-08-19 12:04:41 +02:00
Alex Kriuchykhin 5fa3fa4601
Merge pull request #3491 from okriuchykhin/ok_SCI_5983 
Add timestamps to API serializers, allow inclusion of comments [SCI-5983]
 2021-08-19 10:43:02 +02:00
artoscinote 80dfb04976
Merge pull request #3485 from okriuchykhin/ok_SCI_6002 
Fix permission checks in reports controller [SCI-6002]
 2021-08-18 15:27:49 +02:00
Alex Kriuchykhin 7f122e56f2
Merge pull request #3490 from artoscinote/ma_SCI_5938 
Fixed creating notifications when users are inactive [SCI-5938]
 2021-08-18 10:56:53 +02:00
Martin Artnik 403bce6f5f Fixed creating notifications when users are inactive [SCI-5938] 2021-08-18 10:45:29 +02:00
artoscinote 07a458bab6
Merge pull request #3489 from artoscinote/ma_SCI_5999 
Move molecule edited on step activity to Task protocol group [SCI-5999]
 2021-08-18 10:16:24 +02:00
Oleksii Kriuchykhin 33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
Martin Artnik 308e565d58 Move molecule edited on step activity to Task protocol group [SCI-5999] 2021-08-18 09:54:05 +02:00
aignatov-bio 6e1d51e2f3
Fix bioeddie errors in console [SCI-5989] (#3487) 2021-08-16 18:29:55 +02:00
artoscinote 6f0a65f02f
Merge pull request #3484 from artoscinote/ma_SCI_5999 
Rework molecule registration activities [SCI-5999]
 2021-08-16 14:33:24 +02:00
Martin Artnik 5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +02:00
aignatov-bio 852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486) 
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
 2021-08-16 10:51:46 +02:00
artoscinote b89acc9a7b
Merge pull request #3483 from artoscinote/ma_SCI_5998 
Fix printer template [SCI-5998]
 2021-08-16 09:28:45 +02:00
Oleksii Kriuchykhin 2daacdf62c Fix permission checks in reports controller [SCI-6002] 2021-08-13 16:32:02 +02:00
Martin Artnik 56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +02:00
Martin Artnik e0761f742e Fix printer template [SCI-5998] 2021-08-13 11:16:17 +02:00
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 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