Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
Anton Ignatov
|
3339c1fbbf
|
Add MarvinJS to Result and TinyMce MarvinJS refactor
|
2019-07-15 17:17:14 +02:00 |
|
Anton Ignatov
|
ba1d6d45ca
|
Fix merging issues
|
2019-07-12 15:47:15 +02:00 |
|
Anton Ignatov
|
ffd415d409
|
Inital refactor for Assets model
|
2019-07-12 15:02:06 +02:00 |
|
Anton Ignatov
|
7831b0a089
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 15:00:07 +02:00 |
|
Alex Kriuchykhin
|
c78ab50e0c
|
Merge pull request #1918 from okriuchykhin/ok_SCI_3677
Implement custom document file previewer [SCI-3677]
|
2019-07-12 14:27:21 +02:00 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +02:00 |
|
Alex Kriuchykhin
|
e1185ff551
|
Merge pull request #1862 from okriuchykhin/ok_SCI_3539
Migrate to ActiveStorage [SCI-3539]
|
2019-07-09 10:42:30 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
Oleksii Kriuchykhin
|
9d926dc956
|
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
|
2019-07-05 16:56:05 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
Oleksii Kriuchykhin
|
4ea6b56582
|
Fix Step and Result file previews [SCI-3539]
|
2019-07-01 23:30:20 +02:00 |
|
Anton Ignatov
|
1f40fa69fc
|
Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-07-01 11:51:27 +02:00 |
|
aignatov-bio
|
a08d93376c
|
Add promo modal when MarvinJS disabled (#1872)
|
2019-07-01 11:51:13 +02:00 |
|
Anton Ignatov
|
c9ae9f056e
|
Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration
|
2019-07-01 10:44:29 +02:00 |
|
Anton Ignatov
|
390002f40f
|
Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539
|
2019-07-01 10:12:26 +02:00 |
|
Anton Ignatov
|
6be227b2d3
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-06-28 10:47:38 +02:00 |
|
aignatov-bio
|
666d406019
|
Merge pull request #1860 from aignatov-bio/ai-sci-refactor-marvinjs-api
Refactor API connector for marvinJS
|
2019-06-28 10:45:56 +02:00 |
|
Oleksii Kriuchykhin
|
5acb16d43e
|
Update Asset helper methods [SCI-3539]
|
2019-06-28 08:17:09 +02:00 |
|
Oleksii Kriuchykhin
|
ba2daede0b
|
Add migration scripts [SCI-3539]
|
2019-06-24 15:17:42 +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
|
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 |
|
Anton Ignatov
|
ab73987245
|
improve connector perfomance
|
2019-06-23 00:48:50 +02:00 |
|
Anton Ignatov
|
31c6802a06
|
Add support for marvinjs on service
|
2019-06-23 00:09:49 +02:00 |
|
Anton Ignatov
|
8240c8baad
|
Initial refactoring for remote api support
|
2019-06-22 01:51:59 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +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 |
|
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 |
|