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
3458 commits 70 branches 179 tags 165 MiB
Commit graph

3458 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mlorb 4d69636dbe
Merge pull request #1002 from mlorb/ml-sci-2031_v2 
Fix bug with load older activities button not working [SCI-2031]
 2018-02-20 13:19:20 +01:00
Zanz2 9c2a2956e3 Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818 
Merging Biosis master with branch that resizes small tables to atleast 5x5
 2018-02-19 17:40:13 +01:00
Matej Zrimšek b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
Zanz2 9d87d31a7e
Merge pull request #1001 from Zanz2/scroll_bar_table_fix_sci2044 
Protocols io tables now have fixed 200 px height in preview [SCI-2044]
 2018-02-16 20:20:48 +01:00
mlorb d2dcb765b4 fix bug with load older activities button not working 2018-02-16 15:42:10 +01:00
Zanz2 5c93bd9676 Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom 2018-02-16 14:14:51 +01:00
Zanz2 673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
 2018-02-16 12:52:51 +01:00
Matej Zrimšek 7b07e7b347 Fixed protocol in repository permissions, and refactored it a bit. 2018-02-16 12:04:11 +01:00
Matej Zrimšek 6ba226d514 Added missing '?' to the canaid permission calls that were missing it. 2018-02-16 11:12:30 +01:00
Matej Zrimšek 5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
Matej Zrimšek 4fe669ca9a Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions. 2018-02-16 10:53:22 +01:00
Zanz2 b9db39f87d removing last commit 2018-02-16 00:00:53 +01:00
Zanz2 fab9180b7b fixed small oversight 2018-02-15 23:40:09 +01:00
Zanz2 c963c948a1 Fixed main issue, bad step structure now gets fixed to empty template 2018-02-15 23:28:20 +01:00
Zanz2 95501eb046 saving work for later 2018-02-15 20:01:36 +01:00
Zanz2 ad8f93b57f
Merge pull request #991 from Zanz2/missplaced_authors_sci1808 
protocols io authors are now real authors, not user that added the protocol [SCI-1808]
 2018-02-15 16:53:39 +01:00
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
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