scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
10614 commits 69 branches 179 tags 165 MiB
Commit graph

10614 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin c5c3afa906 Update team users table with new user assignments [SCI-6842] 2022-06-01 15:06:19 +02:00
Alex Kriuchykhin 04eaf07c5e
Merge pull request #4114 from okriuchykhin/ok_SCI_6834 
Add permissions for Report model [SCI-6834]
 2022-06-01 12:47:28 +02:00
Oleksii Kriuchykhin c120a357cd Add permissions for Report model [SCI-6834] 2022-05-24 10:59:21 +02:00
Alex Kriuchykhin 4436809115
Merge pull request #4107 from okriuchykhin/ok_SCI_6821 
Update the exiting permissions helpers so they will check new permissions [SCI-6821]
 2022-05-24 10:51:12 +02:00
Oleksii Kriuchykhin 6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
Alex Kriuchykhin 679b29b32d
Merge pull request #4099 from okriuchykhin/ok_SCI_6820 
Add migration for user team roles, including protocols and inventories [SCI-6820]
 2022-05-24 10:33:35 +02:00
Alex Kriuchykhin 4977756e3a
Merge pull request #4104 from okriuchykhin/ok_SCI_6823 
Update user invitations with new user roles [SCI-6823]
 2022-05-24 10:32:11 +02:00
Oleksii Kriuchykhin 39cfcd5522 Add migration for user team roles, including protocols and inventories [SCI-6820] 2022-05-23 16:28:53 +02:00
Oleksii Kriuchykhin cac33bed25 Update user invitations with new user roles [SCI-6823] 2022-05-19 09:04:25 +02:00
Alex Kriuchykhin c109199a81
Merge pull request #4095 from okriuchykhin/ok_SCI_6818 
Setup user assignments relations for team, inventory and protocol [SCI-6818]
 2022-05-18 16:39:03 +02:00
Oleksii Kriuchykhin 03ec4cb319 Setup user assignments relations for team, inventory and protocol [SCI-6818] 2022-05-17 14:32:14 +02:00
Alex Kriuchykhin 5c3ac0b33e
Merge pull request #4097 from okriuchykhin/ok_SCI_6819 
Add teams, protocols and inventories specific permission definitions [SCI-6819]
 2022-05-16 13:47:14 +02:00
Oleksii Kriuchykhin c397616106 Add teams, protocols and inventories specific permission definitions [SCI-6819] 2022-05-16 11:10:19 +02:00
Martin Artnik a720729472 Merge branch 'master' into develop 2022-05-11 10:37:28 +02:00
artoscinote b11d022ee9
Bump version to 1.25.0 2022-05-11 10:26:24 +02:00
Alex Kriuchykhin ab665e5f43
Merge pull request #4086 from okriuchykhin/ok_SCI_6824 
Fix display of repository snapshot with stock consumption [SCI-6824]
 2022-05-10 22:26:24 +02:00
Alex Kriuchykhin 797460c126
Merge pull request #4085 from okriuchykhin/ok_SCI_6825 
Fix duplicated counters on task card [SCI-6825]
 2022-05-10 22:26:02 +02:00
Oleksii Kriuchykhin 1e9dd95716 Fix duplicated counters on task card [SCI-6825] 2022-05-10 22:23:42 +02:00
Oleksii Kriuchykhin dfc68b997c Fix display of repository snapshot with stock consumption [SCI-6824] 2022-05-10 22:21:48 +02:00
Alex Kriuchykhin b48d0710a4
Merge pull request #4084 from okriuchykhin/ok_SCI_6822 
Fix archived tasks view [SCI-6822]
 2022-05-10 15:42:03 +02:00
Oleksii Kriuchykhin 6fb44eb78e Fix archived tasks view [SCI-6822] 2022-05-10 15:39:59 +02:00
Alex Kriuchykhin b04c8ab29c
Merge pull request #4082 from okriuchykhin/ok_SCI_6817 
Fix task dropdown actions [SCI-6817]
 2022-05-10 13:17:47 +02:00
Alex Kriuchykhin 026826f669
Merge pull request #4081 from okriuchykhin/ok_SCI_6795 
Fix displaying of stock consumption units [SCI-6795]
 2022-05-10 11:28:44 +02:00
Oleksii Kriuchykhin a8c56891d4 Fix task dropdown actions [SCI-6817] 2022-05-10 11:27:46 +02:00
Oleksii Kriuchykhin 823e552ef6 Fix displaying of stock consumption units [SCI-6795] 2022-05-10 10:19:37 +02:00
aignatov-bio 6cbcac3a22
Merge pull request #4080 from aignatov-bio/ai-sci-6807-fix-stock-consumption-rounding 
Fix stock consumption rounding [SCI-6807]
 2022-05-09 11:55:17 +02:00
Anton 2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
Alex Kriuchykhin c4b524af4b
Merge pull request #4079 from okriuchykhin/ok_SCI_6797 
Improve loading time of canvas view/edit [SCI-6797]
 2022-05-09 11:46:04 +02:00
Oleksii Kriuchykhin e957d7d35e Improve loading time of canvas view/edit [SCI-6797] 2022-05-09 11:40:31 +02:00
artoscinote 98ac1c126f
Stock editing and reminder fixes [SCI-6803] (#4078) 
* Fix stock editing after adding new value [SCI-6803]

* Don't load reminders for snapshots [SCI-6803]
 2022-05-09 11:20:38 +02:00
Alex Kriuchykhin 297c58c0cd
Merge pull request #4075 from okriuchykhin/ok_SCI_6800 
Allow deletion of stock columns when stock management is disabled [SCI-6800]
 2022-05-09 10:26:44 +02:00
Alex Kriuchykhin 87e3a71709
Merge pull request #4071 from okriuchykhin/ok_SCI_6155 
Improve input field for adding new team [SCI-6155]
 2022-05-09 10:26:15 +02:00
artoscinote ec5574dde5
Update default label template [SCI-6763] (#4064) 2022-05-09 10:15:46 +02:00
Oleksii Kriuchykhin 2ffb4acb2f Allow deleteion of stock columns when stock management is disabled [SCI-6800] 2022-05-05 15:44:21 +02:00
Alex Kriuchykhin aef0bc1669
Merge pull request #4067 from okriuchykhin/ruby_2_7_6 
Upgrade Ruby to 2.7.6
 2022-05-05 11:46:56 +02:00
Oleksii Kriuchykhin 3d26da9e5e Improve input field for adding new team [SCI-6155] 2022-05-04 14:30:26 +02:00
Alex Kriuchykhin 685032cafb
Fix saving of new date time columns with reminders [SCI-6774] (#4068) 2022-05-04 11:50:57 +02:00
ajugo 2bda271615
Open repository on print view [SCI-6566] (#4055) 2022-05-03 09:30:33 +02:00
Oleksii Kriuchykhin 3943c8e413 Upgrade Ruby to 2.7.6 2022-04-29 13:49:28 +02:00
artoscinote ac45edb14c
Added validations for date(time) column reminder [SCI-6775] (#4063) 2022-04-28 15:30:20 +02:00
aignatov-bio 0ae5006a10
Merge pull request #4062 from aignatov-bio/ai-sci-6767-repository-css-fixes 
Small CSS fixes for repository [SCI-6767]
 2022-04-28 14:36:46 +02:00
Anton 98efcc04b5 Small CSS fixes for repository [SCI-6767] 2022-04-28 14:32:34 +02:00
aignatov-bio 870a037508
Merge pull request #4061 from aignatov-bio/ai-sci-6761-pagination-show-last-page-message-after-second-page 
Show last page message only after second page [SCI-6761]
 2022-04-28 14:14:16 +02:00
Anton 36ae58872f Show last page message only after second page [SCI-6761] 2022-04-28 14:11:11 +02:00
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
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
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