Commit graph

1315 commits

Author SHA1 Message Date
Jure Grabnar 5eb197127f Fix relative links in protocolsio iframe
Closes SCI-3660
2019-07-10 19:20:40 +02:00
aignatov-bio 7ac410e573
Fix visual bugs across ProtocolIo [SCI-3671] (#1914)
* Fix visual bugs across ProtocolIo
2019-07-10 13:00:32 +02:00
mlorb 23270393b0
Merge branch 'master' into ml-sci-3634 2019-07-09 14:38:00 +02:00
Mojca Lorber 7bb82e2fc2 Fix eternal protocols tab visuals 2019-07-09 14:35:40 +02:00
Jure Grabnar bdd1ca2a65
Merge pull request #1908 from jbargu/jg_sci_3587
[SCI-3587] Endless spinner at file preview
2019-07-08 13:06:39 +02:00
Jure Grabnar ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646
[SCI-3646] Add paging functionality to external protocols
2019-07-08 13:06:19 +02:00
aignatov-bio 81aef81634
Fix scrol jump when select activtiies in global activities (#1907) 2019-07-08 12:55:35 +02:00
aignatov-bio 99b1075c28
Fix protcol naming when load multiple protocols (#1904) 2019-07-08 12:51:47 +02:00
Jure Grabnar 0ee0b1c834 Fix file preview not showing in modal when processing is done
Close SCI-3587
2019-07-08 12:45:22 +02:00
Jure Grabnar 0eb09407bc Always scroll to top when searching for new string 2019-07-04 15:38:15 +02:00
Jure Grabnar dc7fee51fa Add Show more protocols functionality to external protocols
Closes SCI-3646
2019-07-04 15:35:18 +02:00
Jure Grabnar 20134c9f8a
Features/protocolsio integration (#1893)
Features/protocolsio integration
2019-07-03 17:32:20 +02:00
aignatov-bio d2849c88fd
Remove draft after save step (#1878) 2019-07-03 09:18:52 +02:00
aignatov-bio 378e91b426
Fix links on search page (#1867) 2019-07-02 11:21:00 +02:00
aignatov-bio 68ebf13bca
Fix tags modal issue (#1856) 2019-07-02 11:20:49 +02:00
Alex Kriuchykhin 7e4852d5aa
Merge pull request #1871 from okriuchykhin/ok_SCI_3511_v2
Fix TinyMCE editor initialization for step editing [SCI-3511]
2019-07-01 16:08:36 +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
Oleksii Kriuchykhin 2f39b7f22b Fix TinyMCE editor initialization for step editing [SCI-3511] 2019-06-28 12:06:04 +02:00
Jure Grabnar 5430fb311d Hound fixes 2019-06-28 10:41:20 +02:00
Jure Grabnar 1a9fca87d2 Fix non-existent protocol-card in preview banner 2019-06-28 08:49:12 +02:00
Jure Grabnar 149f45f4fc Hound fixes 2019-06-28 02:31:25 +02:00
Jure Grabnar 7fb696cf48 Fix unclickable import modal 2019-06-28 02:00:05 +02:00
Jure Grabnar 03b81400a9 Add timeout to search 2019-06-28 01:50:52 +02:00
Jure Grabnar 1ccabf62b3 Add preview banner in external protocols 2019-06-28 01:38:33 +02:00
Jure Grabnar d3afcbed50 Style card view on external protocols
Closes SCI-3535
2019-06-28 00:43:05 +02:00
Jure Grabnar 7fb650a125 Change click -> onchange event for sort_by buttons 2019-06-27 22:56:38 +02:00
Jure Grabnar 0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Urban Rotnik 9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Urban Rotnik 1fd0ca6795 Add steps preview 2019-06-27 16:46:02 +02:00
Urban Rotnik 2761079479 Add modal for import 2019-06-27 16:46:02 +02:00
Jure Grabnar 7d71608166 Add spinner to external preview 2019-06-26 19:43:35 +02:00
aignatov-bio 83bc9eb22f
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
Adding new activities for image editing [SCI-3369]
2019-06-24 10:31:39 +02:00
aignatov-bio 81c76fb112
Merge pull request #1854 from aignatov-bio/ai-sci-3586-comment-counter-not-updated
Fix comments counter for zero comments [SCI-3586]
2019-06-24 09:39:22 +02:00
Anton Ignatov 76e09a2a3d Clear TinyMce autosave after manual save 2019-06-21 14:21:03 +02:00
Anton Ignatov 57ef9573f2 Fix comments counter for zero comments 2019-06-21 10:43:41 +02:00
Alex Kriuchykhin db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-20 11:31:15 +02:00
Anton Ignatov df344f4d03 Merge branch 'master' into ai-sci-3369-activity-for-edited-image-annotation 2019-06-20 09:43:53 +02:00
Jure Grabnar b2b752fcf8 Fix hound complaints 2019-06-19 23:37:04 +02:00
Jure Grabnar b3c3b68dc2 Add external preview to External Protocols tab
Closes SCI-3563
2019-06-19 22:54:20 +02:00
Anton Ignatov a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +02:00
aignatov-bio 609c408c77 Fix error on new step saving command (#1845) 2019-06-19 14:06:25 +02:00
aignatov-bio 5734d0cdd7 Fix TinyMCE field selector for steps (#1844) 2019-06-19 14:06:16 +02:00
aignatov-bio 81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
aignatov-bio fb3b7918af
Fix handson table issue (#1827) 2019-06-14 16:21:27 +02:00
aignatov-bio da8d748c49
Fix small comments bugs (#1832) 2019-06-14 16:20:47 +02:00
Anton Ignatov f480c0eb8d Adding new activtiies for image editing 2019-06-14 16:15:30 +02:00
aignatov-bio 52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
2019-06-13 15:47:29 +02:00
Alex Kriuchykhin bc94771828
Merge pull request #1791 from okriuchykhin/ok_SCI_3461
Refactor the async thumbnail reloading (spinner) [SCI-3461]
2019-06-12 15:35:15 +02:00
Alex Kriuchykhin 4f851b0995
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller
Fix nil issue in tags_my_module controller [SCI-3525]
2019-06-12 13:11:40 +02:00
Oleksii Kriuchykhin a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00