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

10494 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin dd5f8c2793 Add stock management columns to snapshots [SCI-6448] 2022-01-28 13:19:37 +01:00
aignatov-bio 2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798) 
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-28 11:10:56 +01:00
Alex Kriuchykhin 4546227eb3
Merge pull request #3804 from okriuchykhin/ok_SCI_6457 
Fix repository users list and filtering by row name [SCI-6457]
 2022-01-28 09:42:38 +01:00
Oleksii Kriuchykhin 6d877e6bf7 Fix repository users list and filtering by row name [SCI-6457] 2022-01-27 22:50:04 +01:00
aignatov-bio 60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] (#3802) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-27 14:01:09 +01:00
artoscinote 7de6d3d566
Merge pull request #3800 from artoscinote/ma_SCI_6474 
Fix loading of saved filters [SCI-6474]
 2022-01-27 13:43:35 +01:00
artoscinote 8a803bdb0d
Merge pull request #3799 from artoscinote/ma_SCI_6456 
Fix list of assigned tasks in assigned dropdown [SCI-6456]
 2022-01-27 13:43:14 +01:00
Martin Artnik 5a1329f1df Fix loading of saved filters [SCI-6474] 2022-01-27 13:33:43 +01:00
Martin Artnik 8a9be0cc3c Fix list of assigned tasks in assigned dropdown [SCI-6456] 2022-01-27 12:59:52 +01:00
Martin Artnik 8c8d26011d Fix bad merge of additionalDataFilter.vue 2022-01-26 11:05:09 +01:00
artoscinote d779f352a7
Merge pull request #3796 from biosistemika/features/repository-filters 
Features/repository filters
 2022-01-26 10:36:30 +01:00
aignatov-bio 371d5f0636
Add current/new amount section to stock [SCI-6416] (#3791) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-26 10:28:43 +01:00
Alex Kriuchykhin 4342831dab
Merge pull request #3756 from okriuchykhin/ok_SCI_6396 
Finalyze repository filter elements management backend [SCI-6396]
 2022-01-26 10:22:04 +01:00
Oleksii Kriuchykhin 9f3b77ed15 Finalyze repository filter elements management backend [SCI-6396] 2022-01-26 10:12:46 +01:00
Alex Kriuchykhin e55c9ec1cc
Merge pull request #3785 from okriuchykhin/ok_SCI_6423 
Fix filtering for repository snapshots [SCI-6423]
 2022-01-25 12:59:46 +01:00
Alex Kriuchykhin 4a86a0ee45
Merge pull request #3771 from aignatov-bio/ai-sci-6325-user-sorting-in-assign-modals 
Add A-Z sort for assignment modals [SCI-6325]
 2022-01-25 12:59:15 +01:00
Alex Kriuchykhin b3c262bf2a
Merge pull request #3766 from okriuchykhin/ok_SCI_6400 
Fix experiment caching issue [SCI-6400]
 2022-01-25 12:58:56 +01:00
Alex Kriuchykhin a03e3e350b
Merge pull request #3763 from okriuchykhin/ok_SCI_6263 
Fix user invitation with emails surrounded by spaces [SCI-6263]
 2022-01-25 12:57:55 +01:00
Alex Kriuchykhin b0c3a33500
Merge pull request #3762 from okriuchykhin/ok_SCI_5584 
Add handling of archiving/restoring inventory items to API [SCI-5584]
 2022-01-25 12:57:22 +01:00
Alex Kriuchykhin c8ded68b8a
Merge pull request #3759 from okriuchykhin/ok_SCI_6189 
Fix handling of Ctrl+S in TinyMCE editor [SCI-6189]
 2022-01-25 12:57:10 +01:00
artoscinote 42a537390e
Group public users in experiments and tasks [SCI-6332] (#3769) 
* Group public users in experiments and tasks [SCI-6332]

* Add list of users to the public users group elements [SCI-6404]
 2022-01-25 12:41:36 +01:00
artoscinote 4ede001cf1
Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) 
* Fix invalid return in reports jobs [SCI-6409] (#3777)

* Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418]
 2022-01-25 12:41:16 +01:00
artoscinote 790451c96f
Various fixes for BMT search [SCI-6077] (#3673) 
* Various fixes for BMT search [SCI-6077]

* Add vue linter support [SCI-6077]
 2022-01-25 12:28:38 +01:00
aignatov-bio 82aa26c282
Fix docx file preview [SCI-6299] (#3709) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-25 12:28:14 +01:00
aignatov-bio 2e4f687d31
Add experiment move error handling to project show [SCI-6398] (#3776) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-25 12:27:23 +01:00
Alex Kriuchykhin d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] (#3793) 2022-01-25 12:12:55 +01:00
aignatov-bio 86b26cfade
CSS fixes for bmt filters [SCI-6084] (#3764) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-25 10:22:11 +01:00
Anton cbcba90a8e Fix markup [SCI-6325] 2022-01-25 10:10:57 +01:00
artoscinote 354bf4b808
Fix for Safari artefacts in TinyMCE [SCI-6154] (#3794) 2022-01-25 10:10:47 +01:00
Alex Kriuchykhin 5b335139e5
Merge pull request #3761 from artoscinote/ma_SCI_6388 
Fix added_on filter, add specs [SCI-6388]
 2022-01-24 16:47:03 +01:00
Martin Artnik 5fcf2cd080 Fix rendering of bmt/repository filters [SCI-6447] 2022-01-21 13:14:04 +01:00
Miha Mencin 41e1c5cf32
Bump version to 1.23.8 2022-01-20 15:31:03 +01:00
Martin Artnik 711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +01:00
Martin Artnik abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
artoscinote 95a36b6870
Implemented stock management modal [SCI-6417] (#3788) 
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
 2022-01-20 12:44:57 +01:00
Alex Kriuchykhin 1fc6950e9e
Merge pull request #3789 from okriuchykhin/ok_SCI_6431 
Fix representation of experiment workflow images [SCI-6431]
 2022-01-20 09:00:46 +01:00
Oleksii Kriuchykhin 5dd7ca2218 Fix representation of experiment workflow images [SCI-6431] 2022-01-19 18:07:55 +01:00
aignatov-bio 05547da457
Add stock table renders [SCI-6412] (#3787) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-19 13:19:56 +01:00
Oleksii Kriuchykhin 732e49d302 Bump version to 1.23.7 2022-01-19 10:44:58 +01:00
aignatov-bio 01f1b5bd10
Add stock column type (#3786) 
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-18 13:17:05 +01:00
aignatov-bio 7425225520
Fix permission check for experiment moving (#3783) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-18 10:15:59 +01:00
Oleksii Kriuchykhin 34554e57e3 Fix filtering for repository snapshots [SCI-6423] 2022-01-17 21:53:13 +01:00
Alex Kriuchykhin 10556ea960
Merge pull request #3780 from biosistemika/dependabot/npm_and_yarn/follow-redirects-1.14.7 
Bump follow-redirects from 1.14.3 to 1.14.7
 2022-01-17 15:33:23 +01:00
Alex Kriuchykhin 79739371b7
Merge pull request #3784 from artoscinote/ma_SCI_6409 
Fix discarding a job due to non-existant report [SCI-6409]
 2022-01-17 11:42:47 +01:00
Martin Artnik caabb6ff00 Fix discarding a job due to non-existant report [SCI-6409] 2022-01-17 11:40:37 +01:00
Alex Kriuchykhin 3e714a4871
Merge pull request #3778 from okriuchykhin/ok_SCI_6402 
Add initial implementation of inventory stock management [SCI-6402]
 2022-01-17 11:21:08 +01:00
aignatov-bio 8fcf4e9aa2
Add styling for repository filters [SCI-6232] (#3779) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-17 10:24:57 +01:00
ajugo c570cef06c
Style corrections for printed protocol [SCI-6326] (#3782) 
* Printed protocol display improvements [SCI-6326]

* Fix new line

* Fix hound [SCI-6326]

* Using image_tag helper [SCI-6326]

* Move pictures to asset folder [SCI-6326]
 2022-01-14 15:02:04 +01:00
artoscinote 78b89733ab
Fix invalid return in reports jobs [SCI-6409] (#3777) 2022-01-13 14:36:09 +01:00
dependabot[bot] f10f8ac6a7
Bump follow-redirects from 1.14.3 to 1.14.7 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.3 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.3...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 12:45:46 +00:00