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

3406 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mlorb 64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
okriuchykhin f8fb5cca75
Merge pull request #1023 from okriuchykhin/ok_SCI_2108 
Refactor search to support repository list items [SCI-2108]
 2018-03-09 16:23:34 +01:00
Oleksii Kriuchykhin 66c1901f96 Fix migration for better search [SCI-2108] 2018-03-09 15:46:38 +01:00
Oleksii Kriuchykhin 1765d83cd1 Refactor search to support repository list items [SCI-2108] 2018-03-09 11:05:43 +01:00
Zmago Devetak 50ccec5007
Merge pull request #1009 from ZmagoD/zd_SCI_2066 
add info modal for repository items [fixes SCI-2066]
 2018-03-05 12:49:29 +01:00
zmagod 4642d049fa fix hound 2018-03-02 14:16:31 +01:00
zmagod 2b55cd7090 rename variables 2018-03-02 14:14:27 +01:00
Zmago Devetak 3c85756cf5
Merge pull request #996 from ZmagoD/zd_SCI_2020 
generate custom repository when user is created [fixes SCI-2020]
 2018-03-01 13:16:30 +01:00
zmagod 83ba412c48 remove unneeded comment 2018-03-01 11:51:39 +01:00
zmagod 29a1073a50 refactor queries 2018-02-27 16:34:51 +01:00
zmagod e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
zmagod 6908368506 refactor 2018-02-27 10:43:57 +01:00
zmagod 3aa28f6d11 assign repository row to task 2018-02-27 10:40:52 +01:00
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 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
Zanz2 b9db39f87d removing last commit 2018-02-16 00:00:53 +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 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
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