876 commits

Author	SHA1	Message	Date
mlorb	219921ee33	Merge pull request #612 from mlorb/ml_sci_1250 ... Fix sample page bugs when editing column name [SCI-1250]	2017-05-11 13:48:20 +02:00
okriuchykhin	328c9292b1	Merge pull request #606 from okriuchykhin/ok_SCI_1235 ... Fix error messages display during file upload in steps and results [SCI-1235]	2017-05-11 13:00:36 +02:00
Mojca Lorber	86bc6adc2a	fix lost column updated name at sample page and bug with another user not able to view column dropdown	2017-05-11 11:16:12 +02:00
zmagod	2081e0a94b	Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1	2017-05-10 15:14:17 +02:00
zmagod	a4032f5cc6	first run	2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin	52ad5ecdc2	Fix error messages display during file upload in steps and results [SCI-1235]	2017-05-09 17:13:47 +02:00
Oleksii Kriuchykhin	620a989a2f	Improve view of badges on experiment canvas [SCI-152]	2017-05-09 14:07:23 +02:00
okriuchykhin	ccc640f2bc	Merge pull request #593 from okriuchykhin/ok_SCI_1158 ... Add advanced search options [SCI-1158]	2017-05-09 10:23:34 +02:00
okriuchykhin	bd0b930382	Merge pull request #598 from okriuchykhin/ok_SCI_152 ... Add counters for users and comments on canvas [SCI-152]	2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin	bd5a48b9c8	Improve code style [SCI-1158]	2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin	344b9c290a	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
okriuchykhin	f292dab3b5	Merge pull request #594 from okriuchykhin/ok_SCI_1029_v2 ... Change color of loading animation in reports [SCI-1029]	2017-05-08 13:35:00 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 ... Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin	3f60439948	Change color of loading animation in reports [SCI-1029]	2017-05-08 11:02:51 +02:00
Oleksii Kriuchykhin	0ee7e11620	Add advanced search options [SCI-1158]	2017-05-05 16:41:23 +02:00
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
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	f784844472	fixes bug with empty checklist item [fixes SCI-1233]	2017-05-04 16:15:00 +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
zmagod	5b58824ec0	refactor	2017-05-03 15:30:08 +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
Oleksii Kriuchykhin	d3fb688fce	Change color of turbolinks progress bar [SCI-1029]	2017-04-26 15:04:29 +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
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	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
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00
Mojca Lorber	cf00ecd62e	new experiment redirection	2017-04-20 17:55:28 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +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
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
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
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	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
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
Luka Murn	becdd687a6	Only require jquery-ui-sortable on samples page ... (hopefully) closes SCI-794.	2017-04-07 13:05:22 +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	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
Mojca Lorber	5e62046627	remove ERROR from message	2017-04-05 14:40:55 +02:00
Mojca Lorber	b222a34a97	fix hound	2017-04-04 15:38:16 +02:00
Mojca Lorber	715fafe58c	fix bug with constants	2017-04-03 17:07:58 +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	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
zmagod	9ce95470b3	fixes alert messages in samples [fixes SCI-1135]	2017-03-28 15:14:05 +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
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	023b3213e8	fixes email link [fixes SCI-765]	2017-03-24 12:10:07 +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
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	95a0f596b7	adds file link	2017-03-17 16:40:57 +01:00
zmagod	52878e0989	fixed wopi buttons [fixes SCI-1110]	2017-03-16 15:38:11 +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	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
Luka Murn	800df7a26b	Also make button icons work when rendering them via JS ... Closes SCI-1073.	2017-03-08 13:55:10 +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	3599537e42	Fix sample type groups edit color script so it works properly now ... Closes SCI-1078.	2017-03-01 09:09:44 +01:00
Luka Murn	2252b46afc	Canvas should now properly work again ... Closes SCI-1057.	2017-02-28 10:41:55 +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
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
zmagod	151dc79a81	adds hook for lock task action	2017-02-21 16:25:50 +01:00
Mojca Lorber	6b30f097f0	fix visual bug in edit avatar mode	2017-02-21 14:02:42 +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	218e96b1f0	Code style fixes [SCI-999]	2017-02-16 11:45:07 +01:00
Oleksii Kriuchykhin	cf8566df33	Add task complete/uncomplete functionality [SCI-999]	2017-02-10 14:27:20 +01:00
Luka Murn	f7bd62547e	Refactor teams settings into its own controllers	2017-02-09 14:37:59 +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
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
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	62535a01bd	Move teams datatable js code into separate file [SCI-936]	2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin	db90c5d63b	Add datatable to all teams page [SCI-936]	2017-02-02 09:53:59 +01:00
Mojca Lorber	d3e0eca44e	redesign individual team page	2017-02-01 14:44:47 +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
zmagod	be5faad97c	fixes hound	2017-01-31 13:33:55 +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	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
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
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
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
Mojca Lorber	13d1cc5171	fix entering new smart anotations	2017-01-26 13:50:32 +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
zmagod	8c035a1981	renames organization in assets	2017-01-25 12:12:27 +01:00
Oleksii Kriuchykhin	365eef506c	Fixes merge conflicts with smart-annotations branch	2017-01-24 15:20:50 +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
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
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
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
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
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
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