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

10782 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin 892b5e2348
Merge pull request #4056 from okriuchykhin/ok_SCI_6769 
Fix blank stock consumption representation in reports [SCI-6769]
 2022-04-28 11:18:12 +02:00
Anton 6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
Alex Kriuchykhin a7fca67b82
Merge pull request #4058 from okriuchykhin/rails_6_1_5_update 
Upgrade Rails to 6.1.5.1
 2022-04-28 11:03:24 +02:00
Oleksii Kriuchykhin 5aa986e8c7 Upgrade Rails to 6.1.5.1 2022-04-28 11:00:27 +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
Oleksii Kriuchykhin b6501fcf36 Fix blank stock consumption representation in reports [SCI-6769] 2022-04-25 17:10:44 +02:00
Alex Kriuchykhin 29bf85de44
Merge pull request #4053 from okriuchykhin/ok_SCI_6776 
Fix duplicated inventories on tasks for export all [SCI-6776]
 2022-04-25 15:56:01 +02:00
artoscinote da8250dba8
Stock / stock consumption display fixes [SCI-6771] (#4054) 2022-04-25 15:23:12 +02:00
Oleksii Kriuchykhin 9f5ebee4e2 Fix duplicated inventories on tasks for export all [SCI-6776] 2022-04-25 13:45:58 +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
Alex Kriuchykhin 49bc361dee
Fix formatting of stock consumption on tasks [SCI-6737] (#4050) 2022-04-25 13:08:33 +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
aignatov-bio 957e79f46a
Merge pull request #4051 from aignatov-bio/ai-sci-6743-add-newgative-validation-for-treshold 
Add negative validation for threshold [SCI-6743]
 2022-04-25 12:46:20 +02:00
Anton ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
aignatov-bio 95060cecf9
Merge pull request #4052 from aignatov-bio/ai-sci-6770-add-bell-icon-for-negative-stock 
Add bell icon for negative stock [SCI-6770]
 2022-04-25 12:31:40 +02:00
Anton c9d114e71e Add bell icon for negative stock [SCI-6770] 2022-04-25 12:29:10 +02:00
artoscinote e4b5389acf
Copy fix [SCI-6762] (#4048) 2022-04-25 12:18:50 +02:00
Anton b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +02:00
artoscinote d863618846
Enable team normal user to edit repository files [SCI-6765] (#4049) 2022-04-25 12:18:01 +02:00
Oleksii Kriuchykhin b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +02:00
ajugo 2b2888e6f7
Allow tag creation on task level if you have permission [SCI-6573] (#4031) 2022-04-22 11:50:32 +02:00
aignatov-bio e6cd26118c
Merge pull request #4040 from aignatov-bio/ai-sci-6743-add-negative-validation-for-stock-modal-and-consumption-modal 
Add negative validation for stock [SCI-6743]
 2022-04-22 11:15:11 +02:00
aignatov-bio 4d429b28a8
Merge branch 'develop' into ai-sci-6743-add-negative-validation-for-stock-modal-and-consumption-modal 2022-04-22 11:15:04 +02:00
aignatov-bio bc80122df0
Merge pull request #4042 from aignatov-bio/ai-sci-6741-stock-consumption-modal-highlight-negative-with-red 
Highlight negative value in consumption modal [SCI-6741]
 2022-04-22 11:13:34 +02:00
artoscinote f9357611a0
Update stock value without reloading the table [SCI-6745] (#4041) 2022-04-22 11:13:00 +02:00
Alex Kriuchykhin 42f79255df
Merge pull request #4045 from artoscinote/ma_SCI_6762 
Fix snapshot creation with stock consumption [SCI-6762]
 2022-04-22 10:58:01 +02:00
Martin Artnik 4bd5df4e0e Fix snapshot creation with stock consumption [SCI-6762] 2022-04-22 10:49:42 +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
Anton fc3d47d220 Highlight negative value in consumption modal [SCI-6741] 2022-04-21 12:11:38 +02:00
Anton f8f5791c62 Add negative validation for stock [SCI-6743] 2022-04-20 15:11:05 +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