Commit graph

5992 commits

Author SHA1 Message Date
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 57e0478b81
Merge pull request #1855 from aignatov-bio/ai-sci-3583-fix-table-header-in-report
Fix handsontable [SCI-3583]
2019-06-24 09:39:35 +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
aignatov-bio 8ec6802b19
Merge pull request #1853 from aignatov-bio/ai-sci-3581-too-long-protocol-name-in-task
Trunc long protocol name on task page [SCI-3581]
2019-06-24 09:39:07 +02:00
aignatov-bio 8dd57622b5
Merge pull request #1857 from aignatov-bio/ai-sci-3578-fix-autosave-rte-icon
Clear TinyMce autosave after manual save [SCI-3578]
2019-06-24 09:38:47 +02:00
Jure Grabnar 72cf169989 Upgrade axios to 0.18.1
Closes SCI-3589
2019-06-21 19:53:02 +02:00
Jure Grabnar 33cc3c29d1 Move PDF thumbnail generation to ImageMagick
Closes SCI-3579
2019-06-21 19:42:58 +02:00
Jure Grabnar 290e452aec Add ghostscript to Dockerfile 2019-06-21 16:15:08 +02:00
Anton Ignatov 76e09a2a3d Clear TinyMce autosave after manual save 2019-06-21 14:21:03 +02:00
Anton Ignatov dfece85ea1 Fix handsone table 2019-06-21 11:16:44 +02:00
Anton Ignatov 57ef9573f2 Fix comments counter for zero comments 2019-06-21 10:43:41 +02:00
Anton Ignatov 6530786f17 Fix tests 2019-06-20 16:05:19 +02:00
Anton Ignatov bc98cac9cc Trunc long protocol name on task page 2019-06-20 15:28:15 +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
Anton Ignatov 3069ec8dd2 Add check for edit permission 2019-06-20 09:43:23 +02:00
aignatov-bio a00ec02983
Add tests for edit WOPI activities [SCI-3238] (#1822)
* Add tests for edit wopi activities
2019-06-20 09:31:29 +02:00
Jure Grabnar b2b752fcf8 Fix hound complaints 2019-06-19 23:37:04 +02:00
Jure Grabnar fcd42a4178 Fix border radius around active sort button 2019-06-19 22:59:30 +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 6f1f6e297c Fix tests 2019-06-19 15:40:27 +02:00
Anton Ignatov a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +02:00
Oleksii Kriuchykhin f2b617ac12 Fix code formatting [SCI-3436] 2019-06-19 14:23:12 +02:00
Oleksii Kriuchykhin ae1a63037b Raise an exception if required methods for ViewableModel are not implemented [SCI-3436] 2019-06-19 14:17:17 +02:00
Anton Ignatov dae5a661c9 Merge branch 'master' of https://github.com/biosistemika/scinote-web 2019-06-19 14:11:51 +02:00
aignatov-bio 83b9efd7dd Fix right floating images in RTE editor (#1842) 2019-06-19 14:06:33 +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 4ddcbe5d75 Fix user permission for recent protocols (#1843) 2019-06-19 14:06:02 +02:00
aignatov-bio 9653f16196
Convert image to base64 in PDF reports [SCI-3557] (#1835)
* Convert image to base64 in PDF reports

* Fix typo error
2019-06-19 13:57:04 +02:00
aignatov-bio 81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
Urban Rotnik 3bad945e97
Merge pull request #1848 from urbanrotnik/ur-sci-3541-fixing-wrong-imports
Required fields not imported  [SCI-3541]
2019-06-19 11:24:55 +02:00
Urban Rotnik bf6041e13d Update sanitization of html descriptions 2019-06-19 11:05:22 +02:00
Urban Rotnik 7e69375016 Drop header column and row when extract tables 2019-06-19 10:47:38 +02:00
Urban Rotnik 805f98374c
Merge pull request #1846 from urbanrotnik/ur-sci-3548-additional-fields
Add Warnings, Before start and Guidelines to protocol description [SCI-3548]
2019-06-19 09:22:26 +02:00
Urban Rotnik 2a579f2240 Add Warnings, Before start and Guidelinese to protocol description 2019-06-19 09:02:42 +02:00
Mojca Lorber ebcaa4b014 Implement protocols.io error handling for api client and normalizer 2019-06-18 14:01:57 +02:00
Urban Rotnik c691ad80b5 Add fields to query params for ApiClient 2019-06-17 12:24:16 +02:00
Urban Rotnik 88d96c0938 Use service in controller 2019-06-17 12:24:15 +02:00
Urban Rotnik 7fad5fc594 Add search service and normalizer for list 2019-06-17 12:24:15 +02:00
Jure Grabnar 4f6397b5b9 Add form to external_sources#new action
Closes SCI-3532
2019-06-17 12:24:15 +02:00
Jure Grabnar c8b8bcffdb Add external_protocols#show action 2019-06-17 12:24:14 +02:00
Jure Grabnar f7c6f78925 Add external_protocols#index action 2019-06-17 12:24:14 +02:00
Jure Grabnar 2a61075156 Add ExternalProtocols#create action and tests 2019-06-17 12:24:14 +02:00
Jure Grabnar 9baa66c998 Refactor OnlineSources -> ExternalProtocols 2019-06-17 12:24:13 +02:00
Jure Grabnar eb0d677a36 Refactor pio_protocol -> built_protocol 2019-06-17 12:24:13 +02:00
Jure Grabnar 94e7fe1e6c OnlineSourcesController skeleton and #new action tested 2019-06-17 12:24:13 +02:00
Jure Grabnar 7adef9cc9e Change sort buttons positions
Closes SCI-3534
2019-06-17 12:24:13 +02:00
Jure Grabnar 218cf84775 Hound fixes 2019-06-17 12:24:12 +02:00
Jure Grabnar d103f8ffec Finish external protocols screen
Closes SCI-3534
2019-06-17 12:24:12 +02:00