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

3702 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mlorb 9797712561
Merge pull request #997 from mlorb/ml-sci-2045 
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
 2018-02-15 14:51:40 +01:00
okriuchykhin 0503aa054d
Merge pull request #999 from okriuchykhin/smtp_auth_method 
Allow setting of SMTP auth method through ENV variable
 2018-02-15 13:40:20 +01:00
Zmago Devetak e0510ab448
Merge pull request #995 from ZmagoD/zd_SCI_2040 
fixed bug with assigned repository items [fixes SCI-2040]
 2018-02-15 13:05:30 +01:00
Zmago Devetak 0583979cf9
Merge pull request #993 from ZmagoD/zd_SCI_2039 
fixes errors with form id duplicates [fixes SCI-2039]
 2018-02-15 11:10:43 +01:00
zmagod 78e902f316 fixes few Hound alerts 2018-02-15 11:06:59 +01:00
mz3944 47e217bbc4
Merge pull request #979 from mz3944/mz-SCI-1964 
Refactoring experiment permissions, pt. 1 [merge after SCI-1802]
 2018-02-15 10:47:28 +01:00
zmagod e0ac8e8f91 extract helper methods in service 2018-02-15 09:36:09 +01:00
Oleksii Kriuchykhin 00fcf5404b Allow setting of SMTP auth method through ENV variable 2018-02-14 17:02:28 +01:00
Matej Zrimšek ac5b65b121 Added some additional comments for checking if project is active in permissions. 2018-02-14 14:39:10 +01:00
Matej Zrimšek 09c5e23adf Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes. 2018-02-14 14:39:10 +01:00
Matej Zrimšek d571ab2ed8 Fixed comments permissions for experiment level. 2018-02-14 14:39:10 +01:00
Matej Zrimšek 6b1fee4d30 Added/joined repository record assignment to task with sample assignmment to task. 2018-02-14 14:39:10 +01:00
Matej Zrimšek f21c794a95 Fixed permission error when accessing samples page. 2018-02-14 14:39:09 +01:00
Matej Zrimšek 4c87fb4a55 Fixed permission error when restoring task. 2018-02-14 14:39:09 +01:00
Matej Zrimšek 946f516171 Fixed permission error when moving a freshly cloned task. 2018-02-14 14:39:09 +01:00
Matej Zrimšek 68206cb591 Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling. 2018-02-14 14:39:08 +01:00
Matej Zrimšek d55734e501 Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view. 2018-02-14 14:39:07 +01:00
Matej Zrimšek d7108f5a35 Fixed Hound warnings. 2018-02-14 14:39:07 +01:00
Matej Zrimšek 8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
Matej Zrimšek 879eda2d8f Minor experiment level permissions refactoring. 2018-02-14 14:19:22 +01:00
Matej Zrimšek 0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek 1182ce5da1 Fixed experiment level permission checks in the controllers. 2018-02-14 14:19:22 +01:00
Matej Zrimšek 7938c2e036 Minor code style changes. 2018-02-14 14:19:22 +01:00
Matej Zrimšek c5b798017e Minor Hound warning fixes. 2018-02-14 14:19:22 +01:00
Matej Zrimšek d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00
Matej Zrimšek 854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
mz3944 96d56d69a2
Merge pull request #959 from mz3944/mz-SCI-1802 
Permissions - refactor project level permissions [SCI-1802]
 2018-02-14 13:40:22 +01:00
Matej Zrimšek 70fdae567c Forgot to add check whether project is active for archive project permission. Added some additional comments for checking if project is active in permissions. 2018-02-14 13:16:32 +01:00
Matej Zrimšek c09ffa4043 Project permissions comments change. 2018-02-14 13:16:32 +01:00
Matej Zrimšek d058c371d4 Readded project archive permission. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 900446557b Fixed mistyped permission checker. 2018-02-14 13:16:32 +01:00
Matej Zrimšek e36ec69ca9 Project level permissions refactoring (mostly names). 2018-02-14 13:16:32 +01:00
Matej Zrimšek 93536afcd5 Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 13e9a2a132 Corrected some project level permissions; minor refactoring. 2018-02-14 13:16:32 +01:00
Matej Zrimšek e5799ee6dc Some permission fixes. 2018-02-14 13:16:32 +01:00
Matej Zrimšek a21343a819 Fixing and refactoring project permissions in controllers. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 279da20060 Fixed Hound warnings. 2018-02-14 13:16:32 +01:00
Matej Zrimšek d423700e84 Used permissions where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
zmagod 370852d960 set up queries for fetch samples and related objects 2018-02-13 16:52:37 +01:00
mlorb 8d0ac93c80 add check to start work on next task notification if recent changes notification is switched off 2018-02-13 11:01:45 +01:00
zmagod 18eab358c7 generate custom repository when user is created [fixes SCI-2020] 2018-02-13 10:44:50 +01:00
zmagod 5124af6cfb fixes failing cucumber specs 2018-02-12 11:42:22 +01:00
Zmago Devetak 027297d46a
Merge pull request #985 from ZmagoD/zd_SCI_2008 
fixes bug with assets upload on task result page,
 2018-02-12 11:40:44 +01:00
okriuchykhin e7fb1bc716
Merge pull request #967 from okriuchykhin/ok_SCI_1966 
Merge gilson-iot-rails4 to master [SCI-1966]
 2018-02-12 11:02:17 +01:00
okriuchykhin 5a94b40d9c
Merge pull request #978 from okriuchykhin/ok_SCI_2003 
Improve files handling in protocol cloning [SCI-2003]
 2018-02-12 11:01:59 +01:00
Zmago Devetak ccba5d3eb3
Merge pull request #992 from ZmagoD/zd_SCI_2015 
setup models for repository list column [fixes SCI-2015]
 2018-02-12 10:59:20 +01:00
zmagod 27b7aff3ea fixed bug with assigned repository items [fixes SCI-2040] 2018-02-12 10:49:35 +01:00
zmagod 36595d33f4 fix name scope 2018-02-12 09:09:56 +01:00
zmagod d12f8403e4 add reference to repository column 2018-02-12 09:05:41 +01:00