1564 commits

Author	SHA1	Message	Date
mlorb	4c85ac7bf5	Merge pull request #588 from mlorb/ml_sci_191 ... Add information how many samples are selected [SCI-191]	2017-05-05 15:24:16 +02:00
Zmago Devetak	de3d1172c1	Merge pull request #584 from ZmagoD/zd_SCI_1200 ... add popup for approval to complete the Task [fixes SCI-1200]	2017-05-05 14:57:27 +02:00
Zmago Devetak	28042d11e1	Merge pull request #589 from ZmagoD/zd_SCI_488 ... adds label to step in report [fixes SCI-488]	2017-05-05 14:56:01 +02:00
zmagod	b22350136f	adds label to step in report [fixes SCI-488]	2017-05-05 09:45:18 +02:00
Mojca Lorber	45baba1803	fix zmago the hound	2017-05-04 16:46:52 +02:00
Mojca Lorber	ad9497a638	add information how many samples are selected	2017-05-04 16:30:29 +02:00
zmagod	acc5594f1b	add popup for approval to complete the Task [fixes SCI-1200]	2017-05-04 12:41:22 +02:00
Mojca Lorber	f8f6a5f63a	fix bug edit canvas not working and fix positioning of cloned task/workflow	2017-05-04 10:54:50 +02:00
ajugo	41df727e57	Merge pull request #569 from rekonder/aj-SCI-1130 ... Fix error with close on reports	2017-05-03 12:27:42 +02:00
ajugo	081aa4aea7	Merge pull request #570 from rekonder/aj-SCI-1088 ... My profile - avatar size fix [SCI-1088]	2017-05-03 12:27:05 +02:00
Zmago Devetak	cc6c2942c2	Merge pull request #574 from ZmagoD/zd_SCI_1194_v2 ... prevent to get nil as a param in checklist_item_annotation method [fi…	2017-05-03 10:56:21 +02:00
zmagod	d5abb52909	refactor	2017-05-03 10:55:11 +02:00
mz3944	ca72133e2b	Merge pull request #579 from gazvoda/lg-SCI-1214 ... Tab Teams is highlighted when in Audit trails [fixes SCI-1214]	2017-04-28 12:08:32 +02:00
osboxes.org	21a39fc704	Code indentation corrected [fixes SCI-1214]	2017-04-28 10:31:14 +01:00
osboxes.org	f72802f9f2	Tab Teams is highlighted when in Audit trails [fixes SCI-1214]	2017-04-26 16:31:44 +01:00
okriuchykhin	dbd9da916b	Merge pull request #577 from okriuchykhin/ok_SCI_1029 ... Change color of turbolinks progress bar [SCI-1029]	2017-04-26 15:05:44 +02:00
Oleksii Kriuchykhin	d3fb688fce	Change color of turbolinks progress bar [SCI-1029]	2017-04-26 15:04:29 +02:00
okriuchykhin	3735bbb0f8	Merge pull request #578 from okriuchykhin/ok_SCI_1128 ... Fix dowload of export zip files from local storage [SCI-1128]	2017-04-26 13:44:30 +02:00
okriuchykhin	5ec41c0d0a	Merge pull request #576 from okriuchykhin/ok_SCI_763 ... Add additional sanitization to search parameters in datatables [SCI-763]	2017-04-26 13:44:15 +02:00
Zmago Devetak	9704b3ffd4	Merge pull request #572 from ZmagoD/zd_SCI_1192_ver2 ... make search for users case insensitive [fixes SCI-1192]	2017-04-26 13:34:16 +02:00
zmagod	0e383109a1	refactor query	2017-04-26 13:32:03 +02:00
Oleksii Kriuchykhin	cf7d0ea248	Fix dowloand of export zip files from local storage [SCI-1128]	2017-04-26 13:23:30 +02:00
Oleksii Kriuchykhin	9055894d07	Add additional sanitization to search parameters in datatables [SCI-763]	2017-04-25 17:37:42 +02:00
zmagod	0456393317	prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194]	2017-04-25 16:22:10 +02:00
Matej Zrimšek	8ad52354eb	Used locales instead of hardcoded values for intro.js tutorial popup.	2017-04-25 16:03:50 +02:00
Matej Zrimšek	e8bc9542cc	Removed some unneeded intro.js tutorial code.	2017-04-25 16:03:50 +02:00
Matej Zrimšek	a6573bd508	Next button is now always focused when navigating through tutorial steps. [fixes SCI-719]	2017-04-25 16:03:50 +02:00
Matej Zrimšek	a5cffd06f3	Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]	2017-04-25 16:03:50 +02:00
zmagod	615bbb9967	make search for users case insensitive [fixes SCI-1192]	2017-04-25 15:33:51 +02:00
mlorb	b930af0033	Merge pull request #571 from mlorb/ml_sci_316 ... Remove behavior of not allowing the empty tables in steps [SCI-316]	2017-04-25 15:30:30 +02:00
Luka Murn	92159b734f	Merge pull request #559 from Ducz0r/lm-sci-1175-fix ... Fix encoding when cloning tables [SCI-1175]	2017-04-25 14:38:34 +02:00
Mojca Lorber	49574e7a06	remove behavior of not allowing the empty tables in steps	2017-04-25 10:21:16 +02:00
rekonder	b93edac3b9	My profile - avatar size fixes [SCI-1088]	2017-04-25 10:02:00 +02:00
rekonder	dc46a7b650	Fix error with close on reports	2017-04-24 16:02:30 +02:00
mlorb	54f1c7b3e8	Merge pull request #566 from mlorb/ml_sci_365 ... New experiment redirection [SCI-365]	2017-04-24 08:55:55 +02:00
Mojca Lorber	3aa1225e16	fix hound	2017-04-20 18:14:12 +02:00
Mojca Lorber	cf00ecd62e	new experiment redirection	2017-04-20 17:55:28 +02:00
Mojca Lorber	0bae4657f6	add experiment level to user smart annotation notification	2017-04-20 13:21:02 +02:00
Mojca Lorber	b1e939e715	add experiment to activities	2017-04-20 13:16:11 +02:00
Mojca Lorber	c13b8ab270	styling	2017-04-20 13:16:11 +02:00
Mojca Lorber	1606e2163c	add experiment level to notifications	2017-04-20 13:16:11 +02:00
Matej Zrimšek	314e8fcbd2	Added :inverse_of reference for all specific comment models. [fixes SCI-1207]	2017-04-19 23:38:23 +02:00
mz3944	a0b5a94d67	Merge pull request #564 from mz3944/mz-SCI-856 ... Case insensitive email invitation	2017-04-19 09:36:46 +02:00
Luka Murn	9479b65140	Hopefully fixes the encoding issues with audit trails ... Closes SCI-1175.	2017-04-19 08:35:04 +02:00
Matej Zrimšek	bafdbf4082	Email is now case insensitive when inviting users by it. [fixes SCI-856]	2017-04-18 18:01:29 +02:00
Matej Zrimšek	57b6b9402d	Experiment description is inside of box for every supported browser. [fixes SCI-860]	2017-04-18 16:44:01 +02:00
Luka Murn	6a7e383316	Please the Hound	2017-04-18 15:38:11 +02:00
mz3944	0ebf294844	Merge pull request #562 from mz3944/mz-SCI-1187 ... Added general locale for cases when a name is optional and is not spe…	2017-04-18 15:26:35 +02:00
Matej Zrimšek	a889174938	Name of result tables should be nil, as it can't be specified. [fixes SCI-1187]	2017-04-18 15:08:13 +02:00
okriuchykhin	3d805d529d	Merge pull request #554 from okriuchykhin/ok_SCI_877 ... Add image preview to protocol repository [SCI-877]	2017-04-18 08:58:39 +02:00