900 commits

Author	SHA1	Message	Date
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	c5728c4018	Merge branch 'master' into null_step_crash_sci2043	2018-03-05 16:37:24 +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	53f75f3cd6	Minor permissions and their calls refactoring and fixing.	2018-03-04 14:49:41 +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
mlorb	08439e7f58	sign up with linkedIn account	2018-02-28 18:12:21 +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
Zanz2	29aea1ebd2	refactored according to PR	2018-02-21 16:17:53 +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
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	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
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
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	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	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	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
Matej Zrimšek	d058c371d4	Readded project archive permission.	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	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
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
Zmago Devetak	e400514020	Merge pull request #981 from ZmagoD/zd_SCI_2026 ... fixes bug with step table update [fixes SCI-2026]	2018-02-07 14:35:15 +01:00
Zanz2	ef0733b886	Merge pull request #988 from Zanz2/red_error_msg_sci1993 ... Accidentally deleted this off master, identical to the branch before [SCI-1993]	2018-02-07 13:08:45 +01:00
Zanz2	367eff6401	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00