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

10556 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artoscinote 2515ed5a32
Add collapsing task status buttons [SCI-6721] (#4060) 2022-04-28 14:12:08 +02:00
aignatov-bio 6eaa8506e8
Merge pull request #4059 from aignatov-bio/ai-sci-6755-add-step-layout 
Add main layout for step [SCI-6755]
 2022-04-28 11:39:59 +02:00
Anton 189f4335ea Add main layout for step [SCI-6755] 2022-04-28 11:38:33 +02:00
Anton 6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
Martin Artnik ebdd22a892 Fix inline editing for blank values [SCI-6749] 2022-04-26 14:30:07 +02:00
artoscinote 8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Alex Kriuchykhin 5d0fb932e7
Merge pull request #4046 from okriuchykhin/ok_SCI_6722 
Add results counter to second navigation [SCI-6722]
 2022-04-25 13:16:18 +02:00
aignatov-bio 3d78559559
Merge pull request #4047 from aignatov-bio/ai-sci-6754-add-creation-step-functionality 
Add step creation/deletion functionality [SCI-6754]
 2022-04-25 12:46:33 +02:00
Anton ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
Oleksii Kriuchykhin b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +02:00
Alex Kriuchykhin e15a382e37
Merge pull request #4032 from okriuchykhin/ok_SCI_6712 
Add models for step orderable elements, migrate step descriptions [SCI-6712]
 2022-04-22 09:33:41 +02:00
artoscinote 6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
Anton df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
Oleksii Kriuchykhin 989503febe Migrate tiny MCE images to step texts [SCI-6712] 2022-04-21 13:59:15 +02:00
aignatov-bio 159180d8b9
Merge pull request #4039 from aignatov-bio/ai-sci-6744-fix-default-units 
Fix default stock column default units selection [SCI-6744]
 2022-04-20 14:56:19 +02:00
Anton e28095f781 Fix default stock column default units selection [SCI-6744] 2022-04-20 14:52:34 +02:00
aignatov-bio d96a43506a
Merge pull request #4038 from aignatov-bio/ai-sci-6746-add-comment-to-stock-activity 
Add comment to repository stock activities [SCI-6746]
 2022-04-20 11:48:53 +02:00
Anton fd736f99c1 Add comment to repository stock activities [SCI-6746] 2022-04-20 11:29:16 +02:00
aignatov-bio 918a11a0b0
Fix decimal render function [SCI-6742] (#4037) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-20 11:07:37 +02:00
artoscinote 4daf01feee
Fix snapshot consumption display [SCI-6734] (#4035) 2022-04-20 11:07:26 +02:00
artoscinote e3cbf5903a
Move list-type column includes to param, unify naming [SCI-6738] (#4036) 
* Add default includes for inventory columns with lists [SCI-6738]

* Move list-type column includes to param, unify naming [SCI-6738]
 2022-04-20 11:07:15 +02:00
ajugo 54474b2bba
API GET repository stock column output fix [SCI-6550] (#4030) 
* Add include stock unit items to Stock column get [SCI-6550]

* Fix stock column test [SCI-6550]

* Fix hound [SCI-6550]
 2022-04-19 16:05:17 +02:00
aignatov-bio 1a2a58ff5f
Merge pull request #4033 from aignatov-bio/ai-sci-6740-fix-stock-modal-add-remove-value 
Fix stock modal add/remove value preset value [SCI-6740]
 2022-04-19 13:46:24 +02:00
Anton 1be5ba9dd0 Fix stock modal add/remove value preset value [SCI-6740] 2022-04-19 13:44:53 +02:00
Alex Kriuchykhin 42ae32f81a
Merge pull request #4025 from okriuchykhin/ok_SCI_6419 
Improve stock ledger records creation [SCI-6419]
 2022-04-19 13:32:58 +02:00
Oleksii Kriuchykhin 5a17ad6be9 Add models for step orderable elements, migrate step descriptions [SCI-6712] 2022-04-19 13:26:13 +02:00
Oleksii Kriuchykhin e50d52e8ef Improve stock ledger records creation [SCI-6419] 2022-04-18 16:24:27 +02:00
artoscinote 42605e1a8a
Fix inviting users to team [SCI-6725] (#4026) 2022-04-15 15:31:08 +02:00
aignatov-bio a1570de3da
Merge pull request #4028 from aignatov-bio/ai-sci-6731-fix-edit-title-for-stock-consumption-modal 
Add edit title for stock consumption modal [SCI-6731]
 2022-04-15 14:43:58 +02:00
aignatov-bio 31f4b35186
Merge branch 'develop' into ai-sci-6731-fix-edit-title-for-stock-consumption-modal 2022-04-15 14:43:51 +02:00
aignatov-bio 85a54cbcdf
Merge pull request #4029 from aignatov-bio/ai-sci-6729-highlight-negative-stock-in-modal-with-red 
Highlight negative stock in modal with red [SCI-6729]
 2022-04-15 14:43:07 +02:00
aignatov-bio 5a172eb474
Merge pull request #4027 from aignatov-bio/ai-sci-6732-fix-decimal-for-stock-consumption 
Fix decimals in stock consumption modal [SCI-6732]
 2022-04-15 14:42:47 +02:00
ajugo 1c21e11510
Stock management test [SCI-6420] (#3946) 
* Initial test for stock management

* Repository stock values adding [does not work] SCI-6420

* Fix typos SCI-6420

* Fix test [SCI-6420]

* Test changes [SCI-6402]

* Remove locking test [SCI-6420]

* Remove lock [SCI-6420]

* Remove serializer [SCI-6420]

* Fix stock test and add ledger creation on consume [SCI-6420]
 2022-04-15 12:23:47 +02:00
Anton ed49e93a6a Highlight negative stock in modal with red [SCI-6729] 2022-04-15 12:08:29 +02:00
Anton 2481ba566a Add edit title for stock consumption modal [SCI-6731] 2022-04-15 11:47:49 +02:00
Anton 441f6b977d Fix decimals in stock consumption modal [SCI-6732] 2022-04-15 11:40:47 +02:00
artoscinote 6b309871a3
Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) 2022-04-15 10:55:14 +02:00
ajugo 02677aaaba
Focus authenticator code field [SCI-6716] (#4022) 2022-04-14 15:17:56 +02:00
aignatov-bio 4f2fd79f67
Merge pull request #4023 from aignatov-bio/ai-sci-6735-fix-stock-consumption-in-reports 
Fix stock consumption in reports [SCI-6735]
 2022-04-14 14:51:38 +02:00
Anton c73dc5ea2f Fix markup 2022-04-14 14:47:51 +02:00
Anton 84f91634d3 Fix stock consumption in reports [SCI-6735] 2022-04-14 14:46:09 +02:00
artoscinote 30ee6cd40c
Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) 
* Refactor and fix how stock consumption is displayed [SCI-6734]

* Refactor and fix display of stock warnings [SCI-6734]
 2022-04-14 14:27:31 +02:00
aignatov-bio 4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination 
Features/projects experiments pagination
 2022-04-14 10:45:27 +02:00
artoscinote f3ce338600
Fix error modal opening on successful snapshot [SCI-6726] (#4019) 2022-04-13 14:22:34 +02:00
artoscinote dd0661a462
Change the way setting stock works [SCI-6730] (#4018) 2022-04-13 14:22:22 +02:00
aignatov-bio ab40275243
Fix red dot for date reminders [SCI-6696] (#4016) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-13 14:20:33 +02:00
aignatov-bio 5ac9f51220
Add aibility to delete stock column [SCI-6723] (#4017) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-13 14:20:23 +02:00
Alex Kriuchykhin 857661bbed
Merge pull request #3997 from aignatov-bio/ai-sci-6655-add-pagination-to-projects-page 
Add pagination to projects list and experiment list [SCI-6655]
 2022-04-13 12:56:54 +02:00
aignatov-bio 36639727a1
Stock small ux fixes [SCI-6714] (#4015) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-13 12:15:30 +02:00
artoscinote 04ab92b8e2
Fix removing stock reminder threshold [SCI-6724] (#4010) 2022-04-13 11:35:45 +02:00