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

2730 commits

Author SHA1 Message Date
Oleksii Kriuchykhin ca66858063 Fix edit project's users modal [SCI-2130] 2018-03-06 15:49:30 +01:00
mz3944 bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011 
Wrapping up the permissions [SCI-2011]
 2018-03-06 07:10:40 +01:00
Matej Zrimšek c5b0a6525b Some additional permission calls fixes, minor refactoring. 2018-03-06 06:56:35 +01:00
Zanz2 8f5dd3df38
Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818 
Table missing scrollbar [SCI-1818]
 2018-03-05 17:13:06 +01:00
Zanz2 1e6f1acef5 fixed according to pr 2018-03-05 17:02:37 +01:00
Zanz2 451d14c2e9 Added 4 to constants too, then fixed line too long error 2018-03-05 16:48:18 +01:00
Zanz2 c5728c4018
Merge branch 'master' into null_step_crash_sci2043 2018-03-05 16:37:24 +01:00
Zanz2 e3e7514049 removed redundant return 2018-03-05 16:15:33 +01:00
Zanz2 554b31e0aa Added constants 2018-03-05 16:09:06 +01:00
Zanz2 bd19c89212
Merge pull request #1013 from Zanz2/step_reorder_fix 
quick fix for if previous guid is unknown format [Protocols.io import]
 2018-03-05 15:59:46 +01:00
mlorb 5e44859ce0
Merge pull request #1010 from mlorb/ml-sci-1826 
Sign up with linkedIn account [SCI-1826]
 2018-03-05 13:24:36 +01:00
mlorb a19b672a83
change validation again 2018-03-05 13:12:44 +01:00
Matej Zrimšek 61d1f5374d Additionaly removed some unneeded code, related to the previous commit. 2018-03-04 15:24:43 +01:00
Matej Zrimšek fa7710fb80 Forgot to remove unneeded code form permissions after the previous refactoring. 2018-03-04 15:17:46 +01:00
Matej Zrimšek 53f75f3cd6 Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +01:00
Matej Zrimšek 5724f8ed4d Minor permissions refactoring, including putting the same checks for multiple permissions before the specific ones, hence preventing further evaluation if those permissions are not met. 2018-03-04 14:19:17 +01:00
mz3944 c04a153652
Merge pull request #1005 from mz3944/mz-SCI-2064 
At adding file to task, cancel button does not respond [SCI-2064]
 2018-03-04 13:34:50 +01:00
Zanz2 ba67446eee quick fix for if previous guid is unknown format 2018-03-03 22:26:00 +01:00
Zanz2 5bcda7f6de fixed pr 2018-03-02 23:02:35 +01:00
Zanz2 350f12bdbc using dig method now 2018-03-02 22:29:51 +01:00
mlorb d19ca7fbdc
change validation 2018-03-02 16:32:46 +01:00
mlorb f5949e9d10 refactor 2018-03-01 17:52:24 +01:00
Luka Murn 070450f813 Merge branch 'release-1.12.11' 
Conflicts:
	config/initializers/extends.rb
 2018-03-01 14:04:57 +01:00
mlorb 08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
Oleksii Kriuchykhin aa933ad1f4 Add extendable file types mappings for icons [PIP-46] 2018-02-26 14:23:02 +01:00
Matej Zrimšek 96a6779d55 Fixed misspelled permission call. 2018-02-22 14:08:12 +01:00
Matej Zrimšek ff9dff5c10 Fixed reports permissions check calls. Fixed Hound warnings. 2018-02-22 13:51:22 +01:00
Matej Zrimšek 1904099954 Put permissions helper methods inside utility module. 2018-02-21 20:22:13 +01:00
Zanz2 29aea1ebd2 refactored according to PR 2018-02-21 16:17:53 +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 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
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
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
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