83 commits

Author	SHA1	Message	Date
zmagod	0c2523beca	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-03-10 16:21:43 +01:00
Oleksii Kriuchykhin	0f8336e5a5	Refactoring of the comments using STI [SCI-1090]	2017-03-08 13:18:20 +01:00
zmagod	72e13beee3	renamed organizations in views	2017-01-25 12:01:23 +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
Mojca Lorber	aad2eadeae	syntax fix	2017-01-06 10:46:36 +01:00
Mojca Lorber	4e7e261225	fix protocol preview	2017-01-06 10:10:33 +01:00
Mojca Lorber	356edba1b3	add protocol preview to search results	2017-01-05 18:08:59 +01:00
Oleksii Kriuchykhin	cd3924afd3	Sanitize .html_safe marked strings which contain tags [SCI-102]	2017-01-05 13:04:19 +01:00
zmagod	a434649f42	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-01-03 16:35:25 +01:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
Luka Murn	7b825a217f	Closes SCI-596	2016-10-21 11:08:47 +02:00
zmagod	bb9c03df24	fixes controllers	2016-10-17 15:10:26 +02:00
zmagod	d7f514db09	fixes search	2016-10-17 15:10:26 +02:00
Jure Grabnar	62356c36a1	Add file extension to global search	2016-10-04 19:04:08 +02:00
Mojca Lorber	36378d03e2	fixes links and missing experiment level in search results	2016-09-13 17:13:58 +02:00
Mojca Lorber	6a802e9fa7	fixes redirection to project page for all categories in search results	2016-09-05 11:40:49 +02:00
Mojca Lorber	740392c687	optimization	2016-09-05 10:58:37 +02:00
Mojca Lorber	83034f705d	adds tasks, experiment and project category in protocol search results	2016-09-02 11:45:54 +02:00
zmagod	eb394ce209	fixes searching tables bug [fixes SCI-402]	2016-08-31 11:01:10 +02:00
zmagod	1120ef1407	adds experiment and team to tag search resuls [fixes SCI-381]	2016-08-25 10:40:03 +02:00
zmagod	9a05935067	fixed search result link for experiment [fixes SCI-347]	2016-08-22 15:35:47 +02:00
zmagod	ca0ba1403d	set flask icon to experiment [fixes SCI-330]	2016-08-17 14:17:29 +02:00
zmagod	7abc8f3a90	Merge branch 'master' into experiment-level	2016-08-17 09:28:35 +02:00
Luka Murn	edafcaeed6	Move route module_archive_project -> module_archive_experiment ... Also add some new routes, move some templates.	2016-07-29 10:25:02 +02:00
Luka Murn	1ad265835b	Move route canvas_project -> canvas_experiment	2016-07-29 10:08:28 +02:00
Luka Murn	1953e295b6	Hotfix for search results bug	2016-07-28 13:29:26 +02:00
Jure Grabnar	77ed1c5fd3	Change invalid references to project in search and shorten lines.	2016-07-26 12:59:37 +02:00
Jure Grabnar	80621c9b6b	Add experiment text to all searches related to experiment	2016-07-26 12:26:48 +02:00
Jure Grabnar	3be562bdf6	Add experiment to search results	2016-07-26 12:26:48 +02:00
Jure Grabnar	6d26203796	Add missing target var to result searches	2016-07-26 12:26:48 +02:00
Jure Grabnar	5283027da1	Add missing target var to searches.	2016-07-26 12:26:48 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00