71 commits

Author	SHA1	Message	Date
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +02:00
aignatov-bio	2793777463	Features/docx report (#1873) ... * Initial setup for docx report * Add render for project, experiment, my_module * Implement converter for RTE fields * Add all report elements * fix markup * Change headers, remove empty blocks, refactored repository draw * Add smart annotations support * Fix justify fields * Prepare for addons integration * Fix markup * Add comments to GemFile * Fix TinyMCE error * Change UI for new report download selector * Fix file error in inventory cell for docx * Fix i18n object for header	2019-07-01 10:14:16 +02:00
aignatov-bio	7a3eedf461	Adding missing avatars to comments (#1838)	2019-06-14 16:20:13 +02:00
aignatov-bio	2de2ead723	Refactor avatar image appearance across Scinote [SCI-3482] (#1787) ... * Refactor avatar appearance across Scinote	2019-05-21 15:19:44 +02:00
Luka Murn	b78caef915	Fix the file preview modal so it supports WOPI_ENABLED == false	2019-05-10 16:41:11 +02:00
Jure Grabnar	e165459ef5	Merge pull request #1574 from jbargu/jg_sci_3149_3163 ... Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]	2019-04-01 14:32:54 +02:00
Jure Grabnar	5de51f9c58	Prevent smart annotations accessing other teams when importing protocol ... Closes SCI-3163	2019-03-20 12:58:22 +01:00
Oleksii Kriuchykhin	0930277c4e	Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]	2019-02-27 16:02:53 +01:00
Oleksii Kriuchykhin	d67abfda2c	Additional fixies for smart annotations [SCI-2880]	2018-11-26 15:17:18 +01:00
Oleksii Kriuchykhin	8d0dbc7076	Add time format selection to settings [SCI-2778]	2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin	81d751974d	Fix helpers to use with export all [SCI-2793]	2018-10-22 14:32:10 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
Zmago Devetak	5a1615825d	removes unneeded comment	2018-07-11 09:29:10 +02:00
zmagod	8fe1977ca8	adds skip_user_status parameter to popover_for_user_name function in order to keep the functionality more extendable [fixes SCI-1334]	2018-07-10 15:34:07 +02:00
zmagod	87369ae16b	fixes ajax error in repositories [fixes SCI-2399]	2018-05-16 15:08:50 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
zmagod	659a088058	refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]	2018-03-29 15:55:26 +02:00
gazvoda	88f03a0706	Merge pull request #735 from gazvoda/lg-SCI-1249-v2 ... Truncate checklist items in activity modal [fixes SCI-1249]	2017-10-12 15:58:05 +02:00
lenart	e781dfc6a6	Truncate activity taking smart annotations into account fixes [SCI-1249]	2017-08-02 15:51:32 +02:00
zmagod	7b9410f02f	fixes smart annotations bug in reports [fixes SCI-1328]	2017-06-27 11:26:32 +02:00
Mojca Lorber	39dd6daabb	small fixes	2017-06-19 15:30:38 +02:00
Mojca Lorber	107aa76e55	fix bug with audit trail - ajax error	2017-06-14 14:48:22 +02:00
Zmago Devetak	6cdf37041f	Merge pull request #663 from ZmagoD/zd_SCI_1328 ... fixes bug with smart annotations in reports [fixes SCI-1328]	2017-06-13 08:57:09 +02:00
zmagod	e45c2ce560	fixes bug with smart annotations in reports [fixes SCI-1328]	2017-06-08 13:41:27 +02:00
Luka Murn	fcc3995049	Merge pull request #647 from biosistemika/master ... Bring latest master changes into custom-repositories	2017-05-30 14:18:14 +02:00
Matej Zrimšek	19ffd77d32	Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]	2017-05-26 18:14:15 +02:00
Oleksii Kriuchykhin	157b1630b9	Add missing include for sinitize_input [SCI-1309]	2017-05-25 16:28:06 +02:00
Oleksii Kriuchykhin	e99e3edb7b	Add repositories dropdown to task navigation [SCI-1273]	2017-05-18 14:21:00 +02:00
Zmago Devetak	9911c0d148	Merge pull request #613 from ZmagoD/zd_SCI_1241_v3 ... replace all ActionController::Base.helpers.sanitize calls with custom…	2017-05-11 14:30:26 +02:00
zmagod	80a0af8c9f	replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]	2017-05-11 11:36:47 +02:00
Oleksii Kriuchykhin	229693ec61	Fix root_url method unavailable in application_helper [SCI-1252]	2017-05-10 18:15:08 +02:00
Mojca Lorber	7ca62a16bb	fix hound	2017-05-09 14:55:23 +02:00
Mojca Lorber	e1475fbfef	fix bug with avatar in system log	2017-05-09 14:40:02 +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
zmagod	289a148332	refactor	2017-05-03 15:33:23 +02:00
zmagod	5b58824ec0	refactor	2017-05-03 15:30:08 +02:00
zmagod	1b618e88e5	fix reports pdf for user annotation [SCI-1051]	2017-05-03 10:50:43 +02:00
zmagod	1fefeee3d1	adds team space related methods	2017-04-25 13:44:31 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +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
zmagod	9bb1bb3f9b	refactor [fixes SCI-825]	2017-04-06 15:08:03 +02:00
zmagod	d331911ffe	completed step annotations	2017-04-06 08:42:16 +02:00
Mojca Lorber	a0fe47a05d	change helper method for user info popover	2017-04-04 15:22:41 +02:00
zmagod	99c116f257	first run	2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin	2faa137f67	Add user popover method for users [SCI-1127]	2017-04-03 15:10:00 +02: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
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	9ae799d52c	rename organization/org/Organization to Team in datatables	2017-01-25 09:48:49 +01:00