498 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	4ea6b56582	Fix Step and Result file previews [SCI-3539]	2019-07-01 23:30:20 +02:00
aignatov-bio	d207cf5dce	Refactored comments over SciNote [SCI-3505] (#1808) ... * Preparing helpers for comments * Refactored comments over scinote * Update events	2019-06-04 14:40:21 +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
Oleksii Kriuchykhin	882c12cd31	Remove protocol description from preview popup [SCI-3485]	2019-05-20 15:04:54 +02:00
Miha Mencin	5ff344c208	Merge pull request #1746 from biosistemika/lm-sci-3426 ... Changes to create new office file button [SCI-3426]	2019-05-13 10:55:58 +02:00
aignatov-bio	d3aa6371cd	Fix report saving [SCI-3443] (#1753) ... * Fix report saving * Fix the report saving by using the reports' structures * Remove uneccesary yarn.lock (mistake)	2019-05-13 10:55:08 +02:00
aignatov-bio	364f903b3c	Fix protocol preview name (#1749)	2019-05-13 10:17:47 +02:00
aignatov-bio	0b194eb3b1	Revert "Fix report saving (#1748)" (#1752) ... This reverts commit 3db6129808.	2019-05-13 09:09:36 +02:00
aignatov-bio	3db6129808	Fix report saving (#1748)	2019-05-13 08:58:47 +02:00
Luka Murn	b78caef915	Fix the file preview modal so it supports WOPI_ENABLED == false	2019-05-10 16:41:11 +02:00
Urban Rotnik	c41413234c	Use MS office icons for MS files	2019-04-26 09:29:39 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Urban Rotnik	b1dabaca15	New helper for file thumbnails	2019-04-23 13:50:48 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
mlorb	1e3d0e901a	Merge pull request #1667 from mlorb/ml-sci-3304 ... Fix links in activity message for protocols in repository [SCI-3304]	2019-04-15 11:55:08 +02:00
Anton Ignatov	dd8b3caf65	Fix duplicate activtiy issue and fix link to inventory	2019-04-15 11:35:30 +02:00
Mojca Lorber	252fdaf9a8	Fix links in activity message for protocols in repository	2019-04-12 15:14:41 +02:00
Urban Rotnik	ee3dc571e1	Update attachments view, add ordering on FE	2019-04-09 14:17:40 +02:00
Anton Ignatov	811f07a62c	Update API endpoints for new activities	2019-04-08 15:07:45 +02:00
Jure Grabnar	b12916b828	Add main functionality	2019-04-04 17:05:25 +02:00
Oleksii Kriuchykhin	d6bd703ec8	Fix activity genereation with discarded inventories [SCI-3290]	2019-04-03 21:18:48 +02:00
Oleksii Kriuchykhin	8c2b2513b0	Fix user popup in global activities [SCI-3285]	2019-04-03 12:53:52 +02:00
Urban Rotnik	86ddbc68b6	fixup! Show date actual value without link	2019-04-02 14:21:06 +02:00
Urban Rotnik	8eaeeee9f8	Show date actual value without link	2019-04-02 13:15:34 +02:00
Urban Rotnik	73dd6678ee	Fix for show date value	2019-04-02 10:36:11 +02:00
Urban Rotnik	dc0c629798	Fix to show report name in Activities	2019-04-01 15:58:28 +02:00
Urban Rotnik	0ed96d68de	Add step position for steps in Protocol repository. Add default value for blank names also.	2019-04-01 15:58:17 +02:00
Alex Kriuchykhin	b3aa6be23d	Merge pull request #1621 from okriuchykhin/ok_SCI_3255 ... Add global activities to reports [SCI-3255]	2019-04-01 15:07:06 +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
Oleksii Kriuchykhin	98e58ff7eb	Add global activities to reports [SCI-3255]	2019-04-01 11:26:51 +02:00
Urban Rotnik	03dcc91cf1	Fix showing result icon when result is deleted	2019-04-01 09:58:13 +02:00
Oleksii Kriuchykhin	5008339d81	Add handling of links for objects from another team [SCI-3229][SCI-3241]	2019-03-28 14:56:34 +01:00
Oleksii Kriuchykhin	d7d45bec70	Fix links for archived objects in global activities [SCI-3229]	2019-03-28 13:43:50 +01:00
Miha Mencin	8e12e0f5b3	[SCI-3236] showing font-awesome icon based on result type	2019-03-26 17:04:31 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
Anton Ignatov	bc58f0aecd	Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload	2019-03-21 11:48:51 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Jure Grabnar	5de51f9c58	Prevent smart annotations accessing other teams when importing protocol ... Closes SCI-3163	2019-03-20 12:58:22 +01:00
Mojca Lorber	4f9814b884	Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021	2019-03-20 11:03:00 +01:00
Oleksii Kriuchykhin	b46f3566ef	Fix rendering of HTML in RTE fields [SCI-3111]	2019-03-19 23:32:24 +01:00
Mojca Lorber	d1e38e5bc9	Project activities refactoring	2019-03-19 15:33:57 +01:00
Urban Rotnik	fe35c805b7	Add model breadcrumbs, update activities_helper	2019-03-19 14:01:06 +01:00
Oleksii Kriuchykhin	a822227383	Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	ded74044de	Fix circle icon in image editor [SCI-2855]	2019-03-11 15:10:38 +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
mz3944	f6c8af105d	Merge pull request #1434 from mz3944/mz-SCI-2903 ... Fix (unite) Date and Time display formats [SCI-2903]	2019-01-21 09:50:34 +01:00
Matej Zrimšek	838455af0d	Fix protocols.io Date handling at import	2019-01-12 19:28:45 +01:00
Alex Kriuchykhin	be514fd62d	Merge pull request #1445 from okriuchykhin/ok_SCI_2931 ... Fix image URLs in export all document [SCI-2931]	2019-01-11 12:03:06 +01:00
Oleksii Kriuchykhin	ec28db6f4f	Fix image URLs in export all document [SCI-2931]	2019-01-10 14:19:40 +01:00
Oleksii Kriuchykhin	2769add4d9	Disable edit button for unsupported WOPI formats [SCI-2904]	2018-12-31 18:10:12 +01:00