2134 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zmagod	d5abb52909	refactor	2017-05-03 10:55:11 +02:00
zmagod	1b618e88e5	fix reports pdf for user annotation [SCI-1051]	2017-05-03 10:50:43 +02:00
mz3944	98e0793a51	Merge pull request #581 from mz3944/linter_updates ... Updated rubocop and scss-lint gems.	2017-04-28 14:08:05 +02:00
Matej Zrimšek	79b0d9c120	Updated rubocop and scss-lint gems.	2017-04-28 14:05:00 +02:00
mz3944	9c083b537f	Merge pull request #580 from gazvoda/rubocop_update ... Updated cop names with the latest version linter-rubocop (2.1.1)	2017-04-28 12:39: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	a1aa0e8590	Updated cop names with the latest version linter-rubocop (2.1.1)	2017-04-28 10:46:06 +01: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
mz3944	37eef683eb	Merge pull request #575 from mz3944/mz-SCI-1205 ... Added date format constant. [Fixes SCI-1205]	2017-04-26 14:30:23 +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
mz3944	cd75be0477	Merge pull request #573 from mz3944/mz-SCI-719 ... Next button is now always focused when navigating through tutorial.	2017-04-25 16:39:44 +02:00
Matej Zrimšek	2c76ba9471	Added date format constant. [Fixes SCI-1205]	2017-04-25 16:37:09 +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
zmagod	ed24448817	adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203]	2017-04-25 14:24:05 +02:00
zmagod	1fefeee3d1	adds team space related methods	2017-04-25 13:44:31 +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
zmagod	86c6ae3b03	display tinyMCE images in reports	2017-04-25 09:53:35 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +02:00
rekonder	dc46a7b650	Fix error with close on reports	2017-04-24 16:02:30 +02:00
okriuchykhin	e3f4d38424	Merge pull request #567 from okriuchykhin/ok_SCI_1199 ... Build bundle dependencies in separate docker volume [SCI-1199]	2017-04-24 12:48:07 +02:00
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +02:00
Oleksii Kriuchykhin	4b3d752290	Change docker-compose file version and add deface target to Makefile [SCI-1199]	2017-04-24 10:12:07 +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
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00
Oleksii Kriuchykhin	8bf220a972	Improve bundle install [SCI-1199]	2017-04-21 15:13:20 +02:00
Oleksii Kriuchykhin	cb22aa47ba	Build bundle dependencies in separate docker volume [SCI-1199]	2017-04-21 09:45:30 +02:00
mlorb	d3eaf8802c	Merge pull request #560 from mlorb/ml_sci_1195 ... Add experiment level to notifications [SCI-1195]	2017-04-20 18:23:27 +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
okriuchykhin	c57589781c	Merge pull request #565 from mz3944/mz-SCI-1207 ... Added :inverse_of reference for all specific comment models	2017-04-20 09:52:02 +02:00