2696 commits

Author	SHA1	Message	Date
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	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
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	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
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
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	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	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
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
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