1915 commits

Author	SHA1	Message	Date
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
zmagod	1b618e88e5	fix reports pdf for user annotation [SCI-1051]	2017-05-03 10:50:43 +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
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
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +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
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
zmagod	0757563d02	adds step tiny_mce asset relation	2017-04-19 17:22:57 +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
zmagod	37be04c09c	add tiny_mce controller	2017-04-19 09:13:16 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +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
Oleksii Kriuchykhin	4fac6484b5	Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]	2017-04-14 16:05:35 +02:00
Zmago Devetak	e1a30cc17c	Merge pull request #558 from ZmagoD/zd_SCI_1192 ... fixes broken users search method for smart annotation [fixes SCI-1192]	2017-04-14 15:38:33 +02:00
zmagod	8af3858209	fix hound	2017-04-14 11:13:58 +02:00
Luka Murn	9c28608fbf	Fix encoding when cloning tables ... Closes SCI-1175.	2017-04-13 17:00:27 +02:00
zmagod	9ee971c24b	fixes broken users search method for smart annotation [fixes SCI-1192]	2017-04-13 16:14:12 +02:00
Zmago Devetak	cb1ad9e0be	Merge pull request #555 from ZmagoD/zd_SCI_1103 ... adds additional explanations [fixes SCI-1103]	2017-04-13 15:15:08 +02:00
zmagod	0987cf8abc	fixes hound alerts	2017-04-13 14:55:18 +02:00
Zmago Devetak	40af0df882	Merge pull request #551 from ZmagoD/zd_SCI_1189 ... fixes the user_name field in csv export [fixes SCI-1189]	2017-04-13 14:36:44 +02:00
zmagod	a6183af63d	fix method_missing again	2017-04-13 14:34:58 +02:00
mlorb	ddc0e86c92	Merge pull request #556 from mlorb/ml_sci_1174 ... Fix bug with changing user own role from admin to normal user [SCI-1174]	2017-04-13 14:33:58 +02:00
Zmago Devetak	ec60044949	Merge pull request #548 from ZmagoD/zd_SCI_1129_v2 ... Disables annimateSpiner in result assets actions	2017-04-13 14:06:50 +02:00
zmagod	0534bce1ed	adds super in method_missing	2017-04-13 14:03:56 +02:00
zmagod	241af0620a	fixes hound alerts	2017-04-13 13:27:43 +02:00
zmagod	b6daf2648b	refactor zip_export	2017-04-13 13:01:05 +02:00
zmagod	f104444a0c	adds additional explanations [fixes SCI-1103]	2017-04-12 16:56:47 +02:00
Mojca Lorber	27c661d7c4	fix bug with changing user own role from admin to normal user	2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin	181d981a51	Add image preview to protocol repository [SCI-877]	2017-04-12 16:05:38 +02:00
mlorb	2932052628	Merge pull request #549 from mlorb/ml_sci_1172 ... Fix overlapping text in audit trail table [SCI-1172, SCI-1181]	2017-04-12 15:10:48 +02:00
okriuchykhin	0fe84c4e24	Merge pull request #550 from okriuchykhin/ok_SCI_1157 ... Improve speed of search [SCI-1157]	2017-04-12 13:11:26 +02:00
Zmago Devetak	9c31239318	Merge pull request #552 from biosistemika/release-1.9.0 ... Release 1.9.1	2017-04-12 13:08:37 +02:00
zmagod	f4fdb840d8	fixes the user_name field in csv export [fixes SCI-1189]	2017-04-12 09:05:54 +02:00
Oleksii Kriuchykhin	07d658ab82	Improve speed of search [SCI-1157]	2017-04-11 14:55:44 +02:00
Mojca Lorber	b09c18a9bc	fix overlaping text in audit trail table	2017-04-11 14:29:31 +02:00
zmagod	929d8aab5e	disables annimateSpiner in result assets actions	2017-04-10 15:40:36 +02:00
Zmago Devetak	91793c295a	Merge pull request #542 from ZmagoD/zd_SCI_825 ... Smart annotations and Notifications	2017-04-10 15:10:17 +02:00
zmagod	90faeec410	fixes typos and protocol step links	2017-04-10 11:21:28 +02:00
Zmago Devetak	ccb6cd0c8c	Merge pull request #546 from ZmagoD/zd_SCI_1185 ... adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-10 09:12:03 +02:00
Luka Murn	cd4664e4d0	Merge pull request #544 from Ducz0r/lm-sci-794-fix ... Only require jquery-ui-sortable on samples page [SCI-794]	2017-04-10 07:44:57 +02:00
mz3944	2c78d10768	Merge pull request #532 from biosistemika/mz-SCI-1150 ... Fixed so that file deletion callbacks are triggered	2017-04-07 15:18:43 +02:00
zmagod	122e638b7e	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
Luka Murn	becdd687a6	Only require jquery-ui-sortable on samples page ... (hopefully) closes SCI-794.	2017-04-07 13:05:22 +02:00
zmagod	9610c5f5a0	fix info dropdown links [fixes SCI-1141]	2017-04-07 11:31:09 +02:00
Matej Zrimšek	1447a34dc7	Files didn't get deleted in previous commit. [fixes SCI-1150]	2017-04-06 16:59:34 +02:00
okriuchykhin	aa776aaa71	Merge pull request #541 from okriuchykhin/ok_SCI_615 ... Fix moving of the steps after adding a new one [SCI-615]	2017-04-06 15:50:01 +02:00
zmagod	e77df92017	fix samples_controller	2017-04-06 15:26:24 +02:00
zmagod	9bb1bb3f9b	refactor [fixes SCI-825]	2017-04-06 15:08:03 +02:00
zmagod	439cd0cd89	add notification to experiments	2017-04-06 14:55:18 +02:00
zmagod	046b608018	add notification for my_module/project comments	2017-04-06 14:07:22 +02:00
zmagod	b398bb7516	add step annotations methods in steps_action concerns	2017-04-06 13:06:20 +02:00
zmagod	f16607579f	refactor steps annotation	2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin	5c0197220d	Fix moving of the steps after adding a new one [SCI-615]	2017-04-06 12:53:21 +02:00
Matej Zrimšek	e72184d10d	Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150]	2017-04-06 11:34:03 +02:00
mlorb	4855111dcb	Merge pull request #540 from mlorb/ml_sci_1089_v2 ... Remove ERROR from message [SCI-1089]	2017-04-06 10:44:20 +02:00
zmagod	bb437bd8c5	adds notification to results annotation	2017-04-06 09:33:49 +02:00
zmagod	d331911ffe	completed step annotations	2017-04-06 08:42:16 +02:00
mlorb	e9441559d3	Merge pull request #538 from mlorb/ml_sci_1044_vol3 ... Change helper method for user info popover	2017-04-05 17:04:30 +02:00
Mojca Lorber	5e62046627	remove ERROR from message	2017-04-05 14:40:55 +02:00
mlorb	7730493ef4	Merge pull request #535 from biosistemika/ml_sci_1044_vol2 ... Fix bug with constants	2017-04-04 15:46:50 +02:00
Mojca Lorber	b222a34a97	fix hound	2017-04-04 15:38:16 +02:00
Mojca Lorber	a0fe47a05d	change helper method for user info popover	2017-04-04 15:22:41 +02:00
okriuchykhin	8cff0a9a5b	Merge pull request #534 from okriuchykhin/ok_SCI_1127_v2 ... Add user popover method for users [SCI-1127]	2017-04-04 14:36:16 +02:00
zmagod	99c116f257	first run	2017-04-04 09:19:43 +02:00
Mojca Lorber	715fafe58c	fix bug with constants	2017-04-03 17:07:58 +02:00
Oleksii Kriuchykhin	2faa137f67	Add user popover method for users [SCI-1127]	2017-04-03 15:10:00 +02:00
zmagod	e1ee53eeb5	generates query in background worker	2017-04-03 13:37:54 +02:00
mlorb	317739af1e	Merge pull request #530 from biosistemika/ml_sci_1044 ... Add data-hook and yadcf-filter plug-in [SCI-1044]	2017-03-31 14:00:23 +02:00
Mojca Lorber	a2c1ed6994	fix constants	2017-03-31 13:53:18 +02:00
Mojca Lorber	503ee5b62e	change place of data-hook	2017-03-30 17:21:29 +02:00
Oleksii Kriuchykhin	42ccefe2ce	Remove logs table and old unused logging code [SCI-1127]	2017-03-30 11:47:57 +02:00
Mojca Lorber	9458f391e5	add data-hook and yadcf-filter plug-in	2017-03-29 15:59:51 +02:00
Zmago Devetak	2b35b34eb8	Merge pull request #529 from ZmagoD/zd_SCI_1135 ... fixes alert messages in samples [fixes SCI-1135]	2017-03-29 14:57:11 +02:00
Zmago Devetak	0019fd19ea	Merge pull request #525 from ZmagoD/zd_SCI_765 ... Export large files - utility class	2017-03-29 11:55:51 +02:00
zmagod	0096f9dc14	refactor	2017-03-29 09:32:23 +02:00
okriuchykhin	05a49e5a82	Merge pull request #528 from okriuchykhin/ok_SCI_1133 ... Fix secondary navigation on Mac [SCI-1133]	2017-03-29 09:30:34 +02:00
zmagod	9ce95470b3	fixes alert messages in samples [fixes SCI-1135]	2017-03-28 15:14:05 +02:00
Oleksii Kriuchykhin	391c5af267	Fix secondary navigation on Mac [SCI-1133]	2017-03-28 14:36:52 +02:00
zmagod	7039420f99	add hook to canvas module actions	2017-03-28 10:43:39 +02:00
zmagod	0996c14449	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765	2017-03-27 10:41:58 +02:00
zmagod	2235fd3fb7	adds view if download expires	2017-03-27 10:38:28 +02:00
mlorb	3beb179f87	Merge pull request #514 from biosistemika/ml_sci_1089 ... Add error messages to sample group/type edit/delete actions [SCI-1089]	2017-03-27 09:57:32 +02:00
zmagod	239a44c26b	change send to public_send	2017-03-24 16:25:50 +01:00
zmagod	4635a3320d	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-24 16:09:28 +01:00
okriuchykhin	71dc6921fb	Merge pull request #524 from okriuchykhin/ok_SCI_1046 ... Add team_id field to assets and tables [SCI-1046]	2017-03-24 14:48:16 +01:00
Oleksii Kriuchykhin	d2c8e9a395	Set team for assets and tables in generators [SCI-1046]	2017-03-24 14:46:20 +01:00
Zmago Devetak	804fb2fec9	Merge pull request #519 from ZmagoD/zd_SCI_1092_v2 ... adds hooks in team switch [fixes SCI-1092]	2017-03-24 12:56:52 +01:00
zmagod	b352ef1600	removed unneeded method	2017-03-24 12:53:33 +01:00
zmagod	023b3213e8	fixes email link [fixes SCI-765]	2017-03-24 12:10:07 +01:00
zmagod	94732c6d18	adds delayed zip generator	2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin	2edebb282a	Add team_id field to assets and tables [SCI-1046]	2017-03-23 10:36:55 +01:00
zmagod	4385c68f5f	adds zip_export utility first run	2017-03-21 16:15:11 +01:00
okriuchykhin	33544ec91d	Merge pull request #521 from okriuchykhin/ok_SCI_1087 ... Move flash message creation JS code to helper method [SCI-1087]	2017-03-20 15:35:21 +01:00
Zmago Devetak	38299d9f67	Merge pull request #522 from ZmagoD/zd_SCI_1111 ... fixes breadcrumbs in office file [fixes SCI-1111]	2017-03-20 13:53:29 +01:00
zmagod	d8955d1a78	fixes breadcrumbs in office file [fixes SCI-1111]	2017-03-20 13:48:45 +01:00
Oleksii Kriuchykhin	c715902058	Move flash message creation JS code to helper method [SCI-1087]	2017-03-17 17:58:53 +01:00
Mojca Lorber	83fa8570d7	refactoring	2017-03-17 17:52:15 +01:00
zmagod	c244e69e81	fixed report comments bug [fixes SCI-1100]	2017-03-17 16:59:40 +01:00
zmagod	5cc6cd094e	refactor	2017-03-17 16:47:58 +01:00
zmagod	95a0f596b7	adds file link	2017-03-17 16:40:57 +01:00
zmagod	70f17a924e	adds hooks in team switch [fixes SCI-1092]	2017-03-17 16:10:22 +01:00
zmagod	52878e0989	fixed wopi buttons [fixes SCI-1110]	2017-03-16 15:38:11 +01:00
zmagod	307fef17d8	fixes owner id if empty	2017-03-15 18:01:15 +01:00
Zmago Devetak	1afb4c9a42	Merge pull request #515 from ZmagoD/file_owner_id_bug ... fixes bug with wopi contorller	2017-03-15 17:40:07 +01:00
zmagod	c5156f5ca3	fixes bug with wopi contorller	2017-03-15 17:33:36 +01:00
Mojca Lorber	4792bd87b9	fix error message when editing custom column on locked task	2017-03-15 14:09:44 +01:00
Mojca Lorber	7a4e3201e7	add error messages to sample group/type edit/delete actions	2017-03-14 17:32:25 +01:00
zmagod	5d372851d3	fixes reports comment bug [fixes SCI-1100]	2017-03-14 16:24:02 +01:00
zmagod	856a4611c6	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-14 15:58:08 +01:00
zmagod	15b1712a3d	fixes bug with organization	2017-03-14 13:29:59 +01:00
zmagod	b821fff4a5	adds non breaking space between file name and buttons	2017-03-13 14:14:44 +01:00
zmagod	df2abe5d17	fixed typo	2017-03-13 13:51:31 +01:00
zmagod	7b16e5643e	fix assets preprocesor for wopi files	2017-03-13 13:20:49 +01:00
zmagod	0c2523beca	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-03-10 16:21:43 +01:00
mlorb	39e1ac4b26	Merge pull request #512 from biosistemika/ml_sci_1074 ... Fix permissions for experiment actions [SCI-1074]	2017-03-10 11:44:27 +01:00
okriuchykhin	2a33391f4b	Merge pull request #511 from okriuchykhin/ok_SCI_1090 ... Refactoring of the comments using STI [SCI-1090]	2017-03-10 10:50:43 +01:00
Mojca Lorber	1ba5f1748f	fix permissions for experiment actions	2017-03-09 17:45:34 +01:00
Oleksii Kriuchykhin	456934464a	Remove unneeded validation calls [SCI-1090]	2017-03-09 17:20:27 +01:00
zmagod	1d42d46c02	fixes bug with step comments	2017-03-09 16:02:52 +01:00
Luka Murn	ae96223437	Fix rake db:add_user task	2017-03-09 15:37:15 +01:00
zmagod	3057965940	fix bug with filenames	2017-03-09 11:48:50 +01:00
zmagod	9939d8df06	refactor	2017-03-09 10:51:54 +01:00
Luka Murn	1e3a697a91	Merge pull request #508 from biosistemika/lm-sci-838-fix ... Open edit/view Office files in new browser tab/window [SCI-838]	2017-03-09 10:39:16 +01:00
zmagod	49f91184da	fixes locals	2017-03-09 09:55:15 +01:00
Luka Murn	a4bf5516a5	Merge pull request #505 from Ducz0r/lm-sci-1082-fix ... Minor change [SCI-1082]	2017-03-09 08:58:14 +01:00
Luka Murn	0e8f5f8e99	Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix ... Conflicts: app/views/my_modules/_state_buttons.html.erb	2017-03-09 08:44:09 +01:00
zmagod	f78ef8c82a	fixes hound	2017-03-08 14:41:42 +01:00
zmagod	5c2e9a4b04	adds extends and fixes report methods	2017-03-08 14:14:03 +01:00
Luka Murn	800df7a26b	Also make button icons work when rendering them via JS ... Closes SCI-1073.	2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin	0f8336e5a5	Refactoring of the comments using STI [SCI-1090]	2017-03-08 13:18:20 +01:00
Luka Murn	7c9aa2e476	Hide complete&uncomplete task buttons if user cannot do it ... Closes SCI-1091.	2017-03-06 16:01:04 +01:00
Luka Murn	86a800a84e	Open edit/view Office files in new browser tab/window ... Closes SCI-838.	2017-03-06 14:12:18 +01:00
Luka Murn	473487faec	Add HTML <head><title> to edit, view file pages ... Closes SCI-1049.	2017-03-06 13:55:07 +01:00
Luka Murn	4ddb139911	Fix padding of state buttons ... Closes SCI-1073.	2017-03-03 16:36:52 +01:00
Luka Murn	42b773f180	Merge pull request #504 from Ducz0r/lm-sci-1078-fix ... Fix sample type groups edit color script [SCI-1078]	2017-03-02 13:09:51 +01:00
Luka Murn	043613782e	Minor change	2017-03-02 13:04:13 +01:00
Luka Murn	808fdf6744	Merge pull request #502 from Ducz0r/lm-sci-1073-fix ... Fix protocol state buttons a bit [SCI-1073]	2017-03-02 09:02:52 +01:00
Luka Murn	7a48da2e94	Merge pull request #501 from Ducz0r/lm-sci-1057-fix ... Canvas should now properly work again [SCI-1057]	2017-03-02 09:01:51 +01:00
Luka Murn	3599537e42	Fix sample type groups edit color script so it works properly now ... Closes SCI-1078.	2017-03-01 09:09:44 +01:00
Oleksii Kriuchykhin	4868ec5331	Remove task completion duplicated code [SCI-1075]	2017-02-28 17:07:59 +01:00
Luka Murn	3d7f09bde6	Fix protocol state buttons a bit ... Closes SCI-1073.	2017-02-28 14:35:12 +01:00
Luka Murn	2252b46afc	Canvas should now properly work again ... Closes SCI-1057.	2017-02-28 10:41:55 +01:00
zmagod	e1b3dcc2ba	adds enum extends to report element part of SCI-1003	2017-02-27 13:53:46 +01:00
Luka Murn	fecfc9e41d	Merge pull request #498 from biosistemika/release-1.8.1 ... Release 1.8.1	2017-02-23 14:57:30 +01:00
Luka Murn	dc89c160be	Fix a bug with team page not working from user task modal	2017-02-23 14:45:00 +01:00
Luka Murn	87599dca88	Merge branch 'lm-sci-1026-fix' into release-1.8.1	2017-02-23 13:55:41 +01:00
mlorb	a72a072fac	Merge pull request #495 from mlorb/ml_sci_948 ... Fix report - checklist items are in separate row than checkboxes [SCI-948]	2017-02-23 10:50:48 +01:00
okriuchykhin	986ad051a1	Merge pull request #496 from okriuchykhin/ok_SCI_873 ... Improve image scaling in image preview [SCI-873]	2017-02-23 09:30:56 +01:00
Oleksii Kriuchykhin	cb588ed378	Improve image scaling in image preview [SCI-873]	2017-02-22 16:55:57 +01:00
okriuchykhin	d30e149936	Merge pull request #493 from okriuchykhin/ok_SCI_739 ... Lower z-index value for notification count icon [SCI-739]	2017-02-22 16:48:39 +01:00
okriuchykhin	75792cde14	Merge pull request #492 from okriuchykhin/ok_SCI_759 ... Add more extensive explanation when project name is already taken [SCI-759]	2017-02-22 16:25:16 +01:00
Mojca Lorber	f84611f558	fix report - checklist items are in separate row than checkboxes	2017-02-22 15:51:26 +01:00
Oleksii Kriuchykhin	a326fa374f	Lower z-index value for notification count icon [SCI-739]	2017-02-22 14:35:07 +01:00
Zmago Devetak	58f97fdb5b	Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook ... adds hook for lock task action	2017-02-22 14:24:01 +01:00
Oleksii Kriuchykhin	35b0b33ddf	Add more extensive explanation when project name is already taken [SCI-759]	2017-02-22 14:18:48 +01:00
mlorb	b65c716b79	Merge pull request #491 from biosistemika/ml_sci_1028_v2 ... Fix repeat tutorial is always created on the same team [SCI-1028]	2017-02-22 13:52:46 +01:00
Mojca Lorber	330fe9c291	fix repeat tutorial is always created on the same team ... Closes SCI-1028.	2017-02-22 13:43:03 +01:00
mlorb	42e6a99911	Merge pull request #487 from mlorb/ml_sci_1032 ... Fix visual bug in edit avatar mode [SCI-1032]	2017-02-22 10:59:18 +01:00
mlorb	8c111db31a	Merge pull request #486 from mlorb/ml_sci_1033 ... Fix user has no teams view [SCI-1033]	2017-02-22 10:58:39 +01:00
zmagod	151dc79a81	adds hook for lock task action	2017-02-21 16:25:50 +01:00
Mojca Lorber	ac0988ef32	add data-hooks for remove manage teams button	2017-02-21 15:39:08 +01:00
Mojca Lorber	0fd41e8a6d	remove changes on user has no teams view	2017-02-21 15:12:58 +01:00
Oleksii Kriuchykhin	53ba9437b2	Fix circular dependency while loading Settings [SCI-1004]	2017-02-21 14:38:13 +01:00
mlorb	ea1711be83	Merge pull request #485 from mlorb/ml_sci_1001 ... Add data-hook for E-signature manifestation/display [SCI-1001]	2017-02-21 14:25:08 +01:00
mlorb	01d9f306a5	change div to span	2017-02-21 14:22:28 +01:00
Mojca Lorber	6b30f097f0	fix visual bug in edit avatar mode	2017-02-21 14:02:42 +01:00
okriuchykhin	95af5001ab	Merge pull request #484 from okriuchykhin/ok_SCI_1004 ... Add global settings base class [SCI-1004]	2017-02-21 13:20:24 +01:00
Mojca Lorber	90864a45a0	fix user has no teams view	2017-02-21 13:08:06 +01:00
Oleksii Kriuchykhin	7703db3386	Change implementation of the Settings base class [SCI-1004]	2017-02-21 13:07:10 +01:00
Luka Murn	6f1c19ae2d	Fix _user_dropdown.html.erb	2017-02-21 09:27:42 +01:00
Mojca Lorber	cb2127ee7f	add data-hook for E-signature manifestation/display	2017-02-20 18:03:55 +01:00
okriuchykhin	8e18ff44a6	Merge pull request #479 from okriuchykhin/ok_SCI_999 ... Add task complete/uncomplete functionality [SCI-999]	2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin	2aba0f46a6	Add global settings base class [SCI-1004]	2017-02-20 15:11:57 +01:00
Luka Murn	573f3c8d42	Merge pull request #483 from Ducz0r/lm-sci-1026-fix ... Fix manage project users modal bug [SCI-1026]	2017-02-20 08:22:03 +01:00
Luka Murn	ce617894c5	Fix manage project users modal bug ... Closes SCI-1026.	2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin	4fb5fa79af	Move task completion activity and notification creation to separate methods [SCI-999]	2017-02-16 13:36:05 +01:00
Oleksii Kriuchykhin	218e96b1f0	Code style fixes [SCI-999]	2017-02-16 11:45:07 +01:00
Zmago Devetak	c963674e49	Merge pull request #482 from ZmagoD/zd_SCI_987_vol2 ... fixes bug with user teams table [fixes SCI-987]	2017-02-15 13:30:25 +01:00
Luka Murn	164bd787e9	Merge pull request #481 from Ducz0r/lm-sci-958-fix ... Team administrators are Viewers of all Projects in Team [SCI-958]	2017-02-15 10:40:52 +01:00
zmagod	836baa7412	fixes bug with user teams table [fixes SCI-987]	2017-02-15 10:06:21 +01:00
Nbernot	97584aabb3	Updated the lists of office online file extensions ... Extended the list of file extensions that receive office online icons and 'open in' text.	2017-02-14 16:44:03 +01:00
Luka Murn	d097f0dd15	Merge pull request #477 from Ducz0r/lm-sci-928 ... Refactor, merge, unify, improve, update, beautify settings page [SCI-928]	2017-02-13 16:42:57 +01:00
Luka Murn	1b6f50647c	Please Hound	2017-02-13 16:40:27 +01:00
Luka Murn	b369177d1f	Merge pull request #480 from Ducz0r/lm-sci-964-fix ... Fix system notification email links not working bug [SCI-964]	2017-02-13 16:31:04 +01:00
Oleksii Kriuchykhin	f97c20e9b5	Fix hound warnings [SCI-999]	2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin	78d5cbb223	Add links to task completion notification [SCI-999]	2017-02-13 14:51:21 +01:00
Luka Murn	86be639a7c	Please the Hound	2017-02-13 14:20:44 +01:00
Luka Murn	3313d14316	Fix search for administrators and projects ... Closes SCI-958.	2017-02-13 14:15:53 +01:00
Luka Murn	c6ed73bc82	Allow team admins to see all projects, even hidden ones	2017-02-13 13:42:53 +01:00
Luka Murn	f93cc89624	Fix system notification email links not working bug ... Closes SCI-964.	2017-02-10 15:13:33 +01:00
Oleksii Kriuchykhin	cf8566df33	Add task complete/uncomplete functionality [SCI-999]	2017-02-10 14:27:20 +01:00
Luka Murn	3eb4faa44b	Fix task restore action ... Closes SCI-991.	2017-02-10 14:08:56 +01:00
Luka Murn	280b7a0e75	Minor fix	2017-02-09 15:10:45 +01:00
Luka Murn	2a9f975c13	Some minor fixes	2017-02-09 14:58:11 +01:00
Luka Murn	f7bd62547e	Refactor teams settings into its own controllers	2017-02-09 14:37:59 +01:00
Luka Murn	7bee3a4ea0	Move user profile to settings	2017-02-09 11:34:52 +01:00
Luka Murn	5cb3eb5e09	Refactor preferences -> move them to subcontroller, subroute	2017-02-09 11:07:16 +01:00
okriuchykhin	c2a69982aa	Merge pull request #471 from okriuchykhin/ok_SCI_936 ... Adds datatable to all teams page [SCI-936]	2017-02-07 10:33:33 +01:00
okriuchykhin	e2de3c92e7	Merge pull request #472 from okriuchykhin/ok_SCI_984 ... Check that user is a member of a team when switching to it [SCI-984]	2017-02-07 09:36:46 +01:00
okriuchykhin	53ff6a2893	Merge pull request #473 from okriuchykhin/ok_SCI_997 ... Fix smart annotation is missing at editing column with smart annotation [SCI-997]	2017-02-07 09:33:40 +01:00
Oleksii Kriuchykhin	80dbc669d0	Simplify all teams dt definition [SCI-936]	2017-02-06 17:17:48 +01:00
Oleksii Kriuchykhin	449f4479e9	Fix code style issues [SCI-936]	2017-02-06 17:08:20 +01:00
zmagod	c99a540eb3	adds hook to team name in the invitation template [fixes SCI-930]	2017-02-03 16:53:42 +01:00
Oleksii Kriuchykhin	916ed2572a	Fix smart annotation is missing at editing column with smart annotation [SCI-997]	2017-02-03 16:42:38 +01:00
Oleksii Kriuchykhin	cc6b518c7f	Check that user is a member of a team when switching to it [SCI-984]	2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin	62535a01bd	Move teams datatable js code into separate file [SCI-936]	2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin	8b105aa030	Add override hooks [SCI-936]	2017-02-02 23:35:47 +01:00
Zmago Devetak	65bbd81497	Merge pull request #469 from ZmagoD/zd_SCI_929 ... Adds hook in user settings navigation	2017-02-02 15:01:37 +01:00
mlorb	970d99e6e3	Merge pull request #465 from mlorb/ml_sci_937 ... Redesign of individual team page [SCI-937]	2017-02-02 11:15:55 +01:00
mlorb	5510fa7751	rename data-hooks in team view	2017-02-02 10:36:23 +01:00
Oleksii Kriuchykhin	db90c5d63b	Add datatable to all teams page [SCI-936]	2017-02-02 09:53:59 +01:00
zmagod	bb42bd04a5	adds hook in user settings navigation	2017-02-01 17:10:22 +01:00
Mojca Lorber	86351ce17d	add data-hooks for billing	2017-02-01 15:01:54 +01:00
Mojca Lorber	d3e0eca44e	redesign individual team page	2017-02-01 14:44:47 +01:00
Oleksii Kriuchykhin	031741d122	Disable protocols link if user has no teams [SCI-934]	2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin	c119b7c014	Make sciNote work for users without any teams [SCI_934]	2017-02-01 14:16:26 +01:00
Zmago Devetak	5c9954bb89	Merge pull request #450 from ZmagoD/zd_SCI_939 ... Refactor "organizations" to "teams"	2017-02-01 13:12:02 +01:00
okriuchykhin	067b9452a4	Merge pull request #464 from okriuchykhin/ok_SCI_935 ... Add config option to enable/disable users registration [SCI-935]	2017-02-01 09:36:36 +01:00
Luka Murn	059f9cfb25	Merge pull request #468 from biosistemika/hotfix-1.7.2 ... Change URLs to sciNote help pages [SCI-978]	2017-01-31 16:15:39 +01:00
Luka Murn	db75231617	Update URLs to sciNote support pages ... Closes SCI-978.	2017-01-31 15:48:56 +01:00
zmagod	be5faad97c	fixes hound	2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin	d1e69438de	Add config option to enable/disable users registration [SCI-935]	2017-01-30 15:04:02 +01:00
mlorb	bc8c4c3c6c	Merge pull request #463 from mlorb/ml_sci_965 ... Fix step does not save if table is without content [SCI-965]	2017-01-30 11:08:21 +01:00
Mojca Lorber	b291553d01	fix hound	2017-01-27 16:36:03 +01:00
Mojca Lorber	d5021fad2c	fix step does not save if table is without content	2017-01-27 16:25:11 +01:00
okriuchykhin	9909f9dcff	Merge pull request #456 from okriuchykhin/ok_SCI_951 ... Fix missing preview images in task and protocol management [SCI-951]	2017-01-27 14:42:41 +01:00
okriuchykhin	c6fe0003f4	Merge pull request #458 from okriuchykhin/ok_SCI_957 ... Fix protocol table filtering by keywords [SCI-957]	2017-01-27 14:19:53 +01:00
okriuchykhin	53e09bd50a	Merge pull request #457 from okriuchykhin/ok_SCI_955 ... Fix comments re-initialization after edit of the results [SCI-955]	2017-01-27 11:50:52 +01:00
zmagod	e59b2e039a	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939	2017-01-27 11:15:31 +01:00
zmagod	61b260fb8a	fixes bug in protocol management	2017-01-27 11:01:44 +01:00
mlorb	77236f161b	Merge pull request #461 from mlorb/ml_sci_952 ... Fix bug with avatar in smart annotations [SCI-952]	2017-01-27 10:08:53 +01:00
Luka Murn	2c3be391a8	Merge pull request #462 from ZmagoD/zd_SCI_962_vol2 ... fix edit action	2017-01-26 17:25:57 +01:00
Luka Murn	36f25e98f1	Merge pull request #459 from okriuchykhin/ok_SCI_943 ... Fix RTF toolbar init after eding new step [SCI-943]	2017-01-26 17:25:41 +01:00
zmagod	30912c514e	fix edit action	2017-01-26 17:24:24 +01:00
Mojca Lorber	5bed5f0f4a	fix bug with avatar in smart annotations	2017-01-26 17:15:00 +01:00
zmagod	cec5f1333d	fixes RTE bug for new text results [fixes SCI-962]	2017-01-26 16:54:43 +01:00
Oleksii Kriuchykhin	100cc700c6	Fix RTF toolbar init after eding new step [SCI-943]	2017-01-26 16:37:44 +01:00
Luka Murn	3bf447b0f4	Fix bug where reCaptcha form wasn't working	2017-01-26 16:06:29 +01:00
Oleksii Kriuchykhin	17a53cbd7f	Fix protocol table filtering by keywords [SCI-957]	2017-01-26 15:52:46 +01:00
Oleksii Kriuchykhin	ff86184b24	Fix comments re-initialization after edit of the results [SCI-955]	2017-01-26 15:24:37 +01:00
Oleksii Kriuchykhin	0f860496a7	Fix image preview after saving of report [SCI-951]	2017-01-26 14:42:14 +01:00
Luka Murn	3e6d11a087	Merge pull request #455 from mlorb/ml_sci_944 ... Fix entering new smart anotations [SCI-944]	2017-01-26 14:06:35 +01:00
Mojca Lorber	13d1cc5171	fix entering new smart anotations	2017-01-26 13:50:32 +01:00
Oleksii Kriuchykhin	08aa882155	Fix generation of image previews after protocol loading from repo [SCI-951]	2017-01-26 13:19:59 +01:00
Luka Murn	0baaf12de3	Re-display images & checkboxes in PDF reports ... Closes SCI-953.	2017-01-26 10:46:58 +01:00
Luka Murn	8c5a52417c	Merge pull request #445 from okriuchykhin/ok_SCI_940 ... Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:49:38 +01:00
okriuchykhin	648d256dff	Merge pull request #448 from okriuchykhin/ok_SCI_945 ... Fix openning of protocol preview with images [SCI-945]	2017-01-25 17:27:01 +01:00
okriuchykhin	6610c75bfc	Merge pull request #452 from okriuchykhin/ok_SCI_949 ... Fix error when referencing deleted sample in SA [SCI-949]	2017-01-25 17:26:48 +01:00
Oleksii Kriuchykhin	c55f3cb99c	Add flag to disable simple_format in custom_auto_link [SCI-940]	2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin	310d8c1920	Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:18:19 +01:00
mlorb	bedef297c4	Merge pull request #453 from mlorb/ml_sci_950 ... Fix problem with protocol export [SCI-950]	2017-01-25 17:15:21 +01:00
okriuchykhin	4c0f68ffbd	Merge pull request #410 from okriuchykhin/ok_SCI_855 ... Improved tooltip handling in samples datatable V2 [SCI-855]	2017-01-25 16:19:52 +01:00
Mojca Lorber	99a40961fa	fix problem with protocol export	2017-01-25 16:12:48 +01:00
Oleksii Kriuchykhin	5fe9261595	Fix error when referencing deleted sample in SA [SCI-949]	2017-01-25 15:54:12 +01:00
zmagod	a507bb4d1f	hound	2017-01-25 15:40:35 +01:00
zmagod	1220466035	fixing hound	2017-01-25 15:00:14 +01:00
zmagod	afd8328e9c	rename ortanizations -> teams	2017-01-25 14:22:06 +01:00
Oleksii Kriuchykhin	ddd8bcf7b0	Prevent double initialization of popup [SCI-855]	2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin	96a9857dec	Add handling of popups in the end of the table [SCI-855]	2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin	fb49ce8be2	Improved tooltip handling in samples datatable [SCI-855]	2017-01-25 13:47:01 +01:00
Mojca Lorber	6905fc8c08	remove letter f	2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin	90e4b26c69	Fix openning of protocol preview with images [SCI-945]	2017-01-25 13:06:12 +01:00
zmagod	f04a2f663a	renamed organizations in config/	2017-01-25 12:30:11 +01:00
zmagod	8c035a1981	renames organization in assets	2017-01-25 12:12:27 +01:00
okriuchykhin	35b8638598	Merge pull request #446 from okriuchykhin/ok_SCI_902_v2 ... Add sanitization of group/type to sample edit [SCI-902]	2017-01-25 12:05:30 +01:00
zmagod	72e13beee3	renamed organizations in views	2017-01-25 12:01:23 +01:00
Mojca Lorber	2277af534c	fix table titles	2017-01-25 11:01:35 +01:00
zmagod	a6285f0431	renamed utilities	2017-01-25 10:24:50 +01:00
zmagod	9ae799d52c	rename organization/org/Organization to Team in datatables	2017-01-25 09:48:49 +01:00
zmagod	9d90b9b42a	rename Organization to Team in models	2017-01-24 17:08:48 +01:00
zmagod	c2c5616078	rename Organization to Team in controllers	2017-01-24 17:06:51 +01:00
Oleksii Kriuchykhin	fe6d6842c2	Add sanitization of group/type to sample edit [SCI-902]	2017-01-24 16:58:03 +01:00
zmagod	21c2f82582	rename controllers where org/organization	2017-01-24 16:57:14 +01:00
zmagod	a193850ae6	rename models where org/organization	2017-01-24 16:34:21 +01:00
Oleksii Kriuchykhin	365eef506c	Fixes merge conflicts with smart-annotations branch	2017-01-24 15:20:50 +01:00
okriuchykhin	f1483e4cad	Merge pull request #444 from okriuchykhin/ok_SCI_902_v2 ... Add sanitization to sample groups/types [SCI-902]	2017-01-24 14:44:55 +01:00
Oleksii Kriuchykhin	a04f05eeb3	Add sanitization to sample groups/types [SCI-902]	2017-01-24 14:39:54 +01:00
mlorb	02f314ce60	Merge pull request #443 from mlorb/ml_sci_919_v2 ... Remove table of content and customize link target [SCI-919]	2017-01-24 14:39:47 +01:00
Luka Murn	53699193a2	Merge branch 'smart-annotations' ... Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb	2017-01-24 14:33:23 +01:00
Mojca Lorber	4dc7998fdd	Remove table of content and customize link target	2017-01-24 13:10:01 +01:00
Zmago Devetak	40bf293ec7	Merge pull request #441 from ZmagoD/zd_SCI_924 ... adds smart annotation in task comments, refactor smart_annotation_par…	2017-01-24 11:18:41 +01:00
mlorb	4253e3de2b	Merge pull request #439 from mlorb/ml_sci_919 ... Remove functionalities from rich text formatting [SCI-919]	2017-01-24 11:03:34 +01:00
mz3944	34f832d123	Merge pull request #437 from mz3944/mz-sci-913 ... Added smart annotations when adding new sample in samples table [SCI-913]	2017-01-24 11:03:00 +01:00
okriuchykhin	7fa1f3d966	Merge pull request #438 from okriuchykhin/ok_SCI_921 ... Remove unneeded HTML scrubber in protocol importer [SCI-921]	2017-01-24 11:02:43 +01:00
Matej Zrimšek	b48e48e100	Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913]	2017-01-24 10:56:10 +01:00
zmagod	6e7fa21dd3	adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]	2017-01-24 10:51:12 +01:00
Matej Zrimšek	2e041d9e81	Added smart annotations when adding new sample in samples table. [SCI-913]	2017-01-24 10:23:26 +01:00
Oleksii Kriuchykhin	2434c73a0c	Remove unneeded HTML scrabber in protocol importer [SCI-921]	2017-01-24 09:52:38 +01:00
Mojca Lorber	eb40513ada	remove functionalities from rich text formatting	2017-01-24 09:44:37 +01:00
Oleksii Kriuchykhin	401b37956b	Simplify protocol export start [SCI-742]	2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin	d555ba7905	Add export to protocol management page and code style improvements [SCI-742]	2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin	14a6705b55	Implemented protocol export through Zip::OutputStream [SCI-742]	2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin	1abd7fc574	Added xml schemas and zip gem [SCI-742]	2017-01-23 17:34:02 +01:00
Oleksii Kriuchykhin	69f31a62e7	Initial code commit [SCI-742]	2017-01-23 17:33:10 +01:00
Zmago Devetak	674999f987	Merge pull request #436 from ZmagoD/zd_SCI_922 ... fixed user without permissions bug [fixes SCI-922]	2017-01-23 17:25:07 +01:00
zmagod	20cde2654b	fixed user without permissions bug [fixes SCI-922]	2017-01-23 10:53:42 +01:00
zmagod	9c3bc8dac7	fixes checklist item user popover bug [fixes SCI-907]	2017-01-23 09:47:04 +01:00
mz3944	fd63a1de12	Merge pull request #432 from mlorb/ml-sci-fix-847 ... Add dynamic length for sample type/group field when adding new sample [SCI-847]	2017-01-20 15:46:34 +01:00
mlorb	2d073c8c04	Merge pull request #430 from mlorb/ml_sci_826 ... Display smart annotations in reports [SCi-826]	2017-01-20 13:49:40 +01:00
Mojca Lorber	8e02c2e025	add locale - fix	2017-01-20 13:37:07 +01:00
mz3944	18a2e4c423	Merge pull request #433 from mz3944/mz-sci-914 ... Edit of a sample in sample table does not work	2017-01-20 13:02:05 +01:00
Zmago Devetak	c1e7cc83a7	Merge pull request #434 from ZmagoD/zd_SCI_915 ... Text is deleted when entering smart annotation in rich text editor	2017-01-20 13:01:29 +01:00
Zmago Devetak	7bd368e002	Merge pull request #431 from ZmagoD/zd_add_code_highlight ... Fixes code highlight and smart annotations experiments bug	2017-01-20 12:59:21 +01:00
mlorb	9a3c56de97	Merge pull request #421 from mlorb/ml_sci_540 ... Protocol steps/results - adding titles for tables [SCI-540]	2017-01-20 11:41:49 +01:00
zmagod	71453398b1	bugfix	2017-01-20 11:33:49 +01:00
zmagod	4f7d62e79d	removes unneeded annotations [fixes SCI-915]	2017-01-20 11:33:10 +01:00
Matej Zrimšek	5d65627808	Fixed sample editing in samples table. [SCI-914]	2017-01-20 11:10:17 +01:00
Mojca Lorber	3789769af3	add dynamic length for sample type/group field when adding new sample	2017-01-20 09:53:44 +01:00
zmagod	9550c6dd35	fixes highlight.js	2017-01-19 17:09:25 +01:00
Mojca Lorber	6653f0d4c1	small fixes	2017-01-19 16:42:14 +01:00
Mojca Lorber	6de83ff53b	fix hound	2017-01-19 15:58:40 +01:00
Mojca Lorber	4ea154410a	add to fields with rich text formatting	2017-01-19 15:27:24 +01:00
Matej Zrimšek	54f8b01341	Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]	2017-01-19 15:26:28 +01:00
Mojca Lorber	44de927cf4	display smart annotations in reports - without rich text fields	2017-01-19 14:22:54 +01:00
Oleksii Kriuchykhin	890c5e3c3d	Add “no results found” message in smart annotation [SCI-886]	2017-01-19 13:42:58 +01:00
Zmago Devetak	039a8d7da6	Merge pull request #426 from ZmagoD/zd_add_tinyMCE ... Add tiny mce	2017-01-19 12:57:55 +01:00
zmagod	2cbb8ba41a	removed unneeded comments	2017-01-19 12:54:48 +01:00
mz3944	da604d2619	Merge pull request #427 from mz3944/mz-sci-908 ... Some smart annotations refactoring [SCI-908]	2017-01-19 12:15:20 +01:00
zmagod	f2d5066dc7	fix some bugs	2017-01-19 11:37:59 +01:00
Matej Zrimšek	5d86bbb812	Smart annotations improved documentation. [SCI-908]	2017-01-19 10:56:02 +01:00
Matej Zrimšek	fec83e8c45	Smart annotations refactoring. [SCI-908]	2017-01-19 10:55:43 +01:00
zmagod	2ccafdd670	bug fix	2017-01-19 10:12:01 +01:00
zmagod	27d3868f37	fix bugs	2017-01-19 09:40:39 +01:00
zmagod	88d7cb200e	removed quill	2017-01-18 23:06:14 +01:00
zmagod	65fa631b1c	adding tinyMce first run	2017-01-18 22:40:08 +01:00
okriuchykhin	18d329fb42	Merge pull request #423 from okriuchykhin/ok_SCI_896 ... Make search work for full names in smart annotations [SCI-896]	2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin	6555fd02b6	Make search work for full names in smart annotations [SCI-896]	2017-01-18 16:57:51 +01:00
okriuchykhin	7f6ceef9e9	Merge pull request #422 from okriuchykhin/ok_SCI_897 ... Remove sample type and group from smart annotation [SCI-897]	2017-01-18 16:26:25 +01:00
mz3944	b5e38afb64	Merge pull request #416 from mz3944/mz-sci-884 ... Smart annotation bug fixes [SCI-884, SCI-889] [WIP]	2017-01-18 16:13:19 +01:00
Matej Zrimšek	dbbb709bf2	Smart annotations minor refactoring. [SCI-884, SCI-889]	2017-01-18 16:04:39 +01:00
Matej Zrimšek	24458fe590	Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]	2017-01-18 15:29:48 +01:00
Oleksii Kriuchykhin	e45749d3b2	Remove sample type and group from smart annotation [SCI-897]	2017-01-18 14:46:53 +01:00
Mojca Lorber	f656a1093d	fix hound	2017-01-18 14:40:24 +01:00
Mojca Lorber	6155a458e7	update search	2017-01-18 14:22:19 +01:00
Mojca Lorber	dde9854bf1	update protocol import/export and clone	2017-01-18 14:22:19 +01:00
Mojca Lorber	3b92ab9f36	add names to tables from protocol steps in reports	2017-01-18 14:22:19 +01:00
Mojca Lorber	b3c423c582	add table name in protocol step	2017-01-18 14:22:18 +01:00
okriuchykhin	8a220c2351	Merge pull request #414 from okriuchykhin/ok_SCI_887 ... Do not show archived projects, experiments and tasks in smart annotations [SCI-887]	2017-01-18 13:50:22 +01:00
Oleksii Kriuchykhin	55d0e82fcd	Change If statement to ternary operator [SCI-887]	2017-01-18 13:43:21 +01:00
Oleksii Kriuchykhin	a490a12fb1	Add truncation of image description in the preview [SCI-873]	2017-01-18 13:28:56 +01:00
Luka Murn	cf72da5635	Merge branch 'improved-files-handling' into 'master' ... Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb	2017-01-18 11:29:40 +01:00
okriuchykhin	9dfa30fbb4	Merge pull request #418 from okriuchykhin/ok_SCI_855_v2 ... Remove previous fix for popups [SCI-855]	2017-01-18 11:00:54 +01:00
Oleksii Kriuchykhin	12eb1df69f	Remove previous fix for popups [SCI-855]	2017-01-18 10:59:00 +01:00
Zmago Devetak	1b9f7db385	Merge pull request #405 from ZmagoD/zd_SCI_832 ... Visualization of User smart annotation after saving the field	2017-01-18 09:36:42 +01:00
okriuchykhin	781a68e0d5	Merge pull request #415 from okriuchykhin/ok_SCI_888 ... Add missed space in the string [SCI-888]	2017-01-18 09:34:51 +01:00
zmagod	cb0483a6e6	refactor	2017-01-18 08:34:29 +01:00
Oleksii Kriuchykhin	ea8f6a8c6b	Fix issue in report editor [SCI-102]	2017-01-17 14:21:59 +01:00
Matej Zrimšek	3085452ec9	Fixed some hound alerts. [SCI-884]	2017-01-17 11:04:16 +01:00
Matej Zrimšek	d3c33c9dca	Refactored smart annotation JS. [SCI-884]	2017-01-17 10:05:41 +01:00
Luka Murn	ffc2b56dff	Fix String quotes	2017-01-17 08:28:41 +01:00
Luka Murn	2f48409fdd	Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2 ... Fix filter not working correctly with hidden custom columns [SCI-813]	2017-01-17 08:17:52 +01:00
Oleksii Kriuchykhin	0ce71884a5	Add missed space in the string [SCI-888]	2017-01-16 17:09:41 +01:00
Oleksii Kriuchykhin	50edaef4ff	Do not show archived projects, experiments and tasks in smart annotations [SCI-887]	2017-01-16 16:55:10 +01:00
Luka Murn	16955dcee6	Fix Hound errors.	2017-01-16 15:58:37 +01:00
Luka Murn	a2935c6620	Add sample info modal popup to sample smart annotations ... This MR also loads datatables.js globally (as it's required by the modal), so I removed it everywhere in code, and it shouldn't be used anymore (e.g. '//= require datatables'). Closes SCI-892.	2017-01-16 15:52:02 +01:00
Matej Zrimšek	2877126dc6	Fixed selected search filter button style. [SCI-884]	2017-01-16 12:52:03 +01:00
okriuchykhin	02bfd19d1c	Merge pull request #385 from okriuchykhin/ok_SCI_102 ... Fix XSS on activites and throghout the rest of app [SCI-102]	2017-01-16 11:41:38 +01:00
mlorb	88cc87d168	Merge pull request #408 from mlorb/ml-sci-847-v2 ... Adjust columns width in samples table header after selecting sample group [SCI-847]	2017-01-16 10:52:00 +01:00
Luka Murn	a0e9e5afa8	Merge pull request #402 from mz3944/mz-sci-848-v2 ... Unable to delete samples [SCI-848]	2017-01-16 10:47:13 +01:00
Luka Murn	0fd9660eb7	Merge pull request #403 from Ducz0r/lm-sci-876-fix ... Year difference problems with notifications [SCI-876]	2017-01-14 10:01:38 +01:00
Luka Murn	1acf258c70	Fix minor Zmagohound comment	2017-01-14 10:00:52 +01:00