1632 commits

Author	SHA1	Message	Date
aignatov-bio	84993ea3ef	Update protocol repository for new description format [SCI-3371] (#1689) ... * Update protocol repository for new description format * move image clone method to concerns	2019-04-24 13:34:56 +02:00
Oleksii Kriuchykhin	88123f5ecd	Fix paths for highlightjs-github-theme [SCI-3377]	2019-04-24 12:35:01 +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	7a2bfc12ce	Remove form_asset partial	2019-04-23 13:50:48 +02:00
Urban Rotnik	b1dabaca15	New helper for file thumbnails	2019-04-23 13:50:48 +02:00
Urban Rotnik	ea0368aa11	Attachments update for edit page	2019-04-23 13:50:47 +02:00
Anton Ignatov	7d60eb5572	Fix migration issues	2019-04-23 11:11:22 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
Jure Grabnar	1295c0583a	Archived results are now separated in exported project ... Closes SCI-3179	2019-04-17 16:37:21 +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
Alex Kriuchykhin	3250ab70f4	Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 ... Switch to kaminari pagination in global activities [SCI-3292]	2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin	231106e131	Switch to kaminari pagination in global activities [SCI-3292]	2019-04-12 15:37:45 +02:00
Mojca Lorber	252fdaf9a8	Fix links in activity message for protocols in repository	2019-04-12 15:14:41 +02:00
Mojca Lorber	bf2e9e8194	Rename button load more system notification to fix the bug	2019-04-12 11:58:47 +02:00
aignatov-bio	8ba0555922	Add check for tasks complete in project notifications (#1657)	2019-04-12 09:17:34 +02:00
aignatov-bio	ffb0db06b9	Add scroll to team selector (#1659)	2019-04-12 09:17:14 +02:00
Alex Kriuchykhin	7f20b7fa20	Merge pull request #1661 from okriuchykhin/ok_SCI_3292 ... Improve global activities pagination and fetching [SCI-3292]	2019-04-11 16:23:37 +02:00
Oleksii Kriuchykhin	d378e33038	Improve global activities pagination and fetching [SCI-3292]	2019-04-10 15:45:17 +02:00
aignatov-bio	f47d0e2932	Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload ... Improve the image file upload into RTE input fields [SCI-3131]	2019-04-10 14:04:06 +02:00
aignatov-bio	7ef7e2397f	Change activity filter order and reduce custom date label size [SCI-3301] (#1651) ... * Change activity filter order and reduce custom date label size * Fix hound	2019-04-09 14:18:22 +02:00
Urban Rotnik	ee3dc571e1	Update attachments view, add ordering on FE	2019-04-09 14:17:40 +02:00
Urban Rotnik	a3932cc67f	New asset box style update	2019-04-09 14:17:40 +02:00
aignatov-bio	e2e299b424	Add dynamic generating filters for global activities [SCI-3228] (#1644) ... * Add dynamic generating filters * Add url methods	2019-04-09 09:08:27 +02:00
Urban Rotnik	26cf8271a1	Change step header, remove vertical line	2019-04-05 10:57:38 +02:00
Jure Grabnar	7ac88ee84b	Change icons to be relative	2019-04-04 17:05:25 +02:00
Jure Grabnar	cbf109f884	Fix create WOPI file button ... Closes SCI-3137	2019-04-04 17:05:25 +02:00
Jure Grabnar	fddff9c627	Perform styling on the WOPI modal	2019-04-04 17:05:25 +02:00
Jure Grabnar	38e47b93ab	Update labels	2019-04-04 17:05:25 +02:00
Jure Grabnar	b12916b828	Add main functionality	2019-04-04 17:05:25 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	9a4cd4fda2	Add file_present true	2019-04-04 16:57:36 +02:00
Jure Grabnar	3b8e6fa47c	Test office online	2019-04-04 16:57:36 +02:00
Oleksii Kriuchykhin	d6bd703ec8	Fix activity genereation with discarded inventories [SCI-3290]	2019-04-03 21:18:48 +02:00
Jure Grabnar	26848ecaef	Refactor step position + 1 into a method	2019-04-03 13:07:30 +02:00
Oleksii Kriuchykhin	c47d243b1f	Disable WOPI edit button in read only mode [SCI-3281]	2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin	ffa7c5ecb2	Fix permition checks for file editing and make protocol preview files read only [SCI-3281]	2019-04-02 16:38:53 +02:00
Jure Grabnar	ac1b43165d	Merge pull request #1625 from jbargu/jg_sci_3257 ... Remove html_safe on activities [SCI-3257]	2019-04-02 12:04:01 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
Jure Grabnar	8443ed0fb3	Add sanitize input to old activity messages	2019-04-02 11:25:07 +02:00
Jure Grabnar	5dd0cf091f	Remove html_safe from activites head title	2019-04-02 11:16:08 +02:00
aignatov-bio	e93b0c3109	Adding preload filters for global activities [SCI-3254] (#1619) ... * Adding preload filter for global activities * Adding link to task activities	2019-04-02 11:14:36 +02:00
Urban Rotnik	6ec22c0b3b	Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory ... Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]	2019-04-02 11:02:57 +02:00
Jure Grabnar	85bbdcf4b3	Remove .html_safe from activity ... Closes SCI-3257	2019-04-02 11:02:22 +02:00
aignatov-bio	daaa6a367b	Adding custom scrollbar to global activities [SCI-3206] (#1623) ... * Adding custom scrollbar to global activities	2019-04-02 09:56:50 +02:00
Urban Rotnik	b91f08fe99	Add activity for copying Inventory and Invetory item	2019-04-01 15:40:00 +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
Oleksii Kriuchykhin	98e58ff7eb	Add global activities to reports [SCI-3255]	2019-04-01 11:26:51 +02:00
Mojca Lorber	3c69225d6b	Change activities for task protocols	2019-03-29 15:09:20 +01:00