aignatov-bio
|
6e5f078dea
|
Add activities for marvinJS [SCI-3630] (#1950)
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
|
2019-08-09 09:47:07 +02:00 |
|
aignatov-bio
|
b57e79a557
|
Fix tables (#1963)
|
2019-08-09 09:41:32 +02:00 |
|
Oleksii Kriuchykhin
|
a5d47e75c5
|
Remove duplicated protocols.js.erb file [SCI-3678]
|
2019-08-08 14:33:07 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
d942788581
|
Implement read permissions checks for ActiveStorage controllers [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
aignatov-bio
|
aa5061a1af
|
Add custom context menu to TinyMCE images [SCI-3582] (#1944)
* Add custom context menu to TinyMCE images
* Fix permission check for unsaved objects
* Fix markup
|
2019-08-07 10:28:42 +02:00 |
|
Oleksii Kriuchykhin
|
f3849e2ece
|
Fix TinyMCE plugings config [SCI-3679]
|
2019-08-06 15:46:55 +02:00 |
|
Oleksii Kriuchykhin
|
eaf9d59819
|
Merge branch 'activestorage_migration' into ok_SCI_3679
|
2019-08-06 15:27:31 +02:00 |
|
Oleksii Kriuchykhin
|
423528933e
|
Switch to global JS constants [SCI-3679]
|
2019-08-06 15:06:19 +02:00 |
|
Jure Grabnar
|
d9ce3e5e8e
|
[SCI-3674] Remove width on comments (#1954)
[SCI-3674] Remove width on comments
|
2019-08-05 13:14:03 +02:00 |
|
Jure Grabnar
|
b12403b769
|
Add comment name fix as Urban suggested
|
2019-07-31 09:23:22 +02:00 |
|
Jure Grabnar
|
dbebde3370
|
Merge pull request #1953 from jbargu/jg_sci_3673
Revalidate internal dimension when dragging
|
2019-07-30 07:44:36 +02:00 |
|
Oleksii Kriuchykhin
|
ccf76b8531
|
Move repository_datatable to JS file [SCI-3679]
|
2019-07-26 13:00:25 +02:00 |
|
Urban Rotnik
|
4699ba718a
|
Fix showing errors
|
2019-07-26 11:32:51 +02:00 |
|
Oleksii Kriuchykhin
|
5e65b07bdc
|
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
|
2019-07-25 18:00:24 +02:00 |
|
Jure Grabnar
|
39fbd18316
|
Remove width on commments
Closes SCI-3674
|
2019-07-25 16:46:27 +02:00 |
|
Jure Grabnar
|
a579328614
|
Revalidate internal dimension when dragging
Close SCI-3673
|
2019-07-25 16:37:15 +02:00 |
|
Jure Grabnar
|
f44404a1f8
|
Merge pull request #1946 from jbargu/jg_sci_3704
Fix Handsontable error when generation report
|
2019-07-25 11:28:46 +02:00 |
|
Jure Grabnar
|
06657dbdf6
|
Add spinner when editing image annotation (#1948)
Add spinner when editing image annotation
|
2019-07-25 11:28:13 +02:00 |
|
Urban Rotnik
|
1b9db2f61e
|
Fix for file annotating on Safari
|
2019-07-24 14:16:29 +02:00 |
|
Jure Grabnar
|
cdad167be2
|
Add spinner when editing image annotation
Close SCI-3710
|
2019-07-23 15:02:33 +02:00 |
|
Jure Grabnar
|
5847a8b05c
|
Convert HOT table after it was initialized
Closes SCI-3704
|
2019-07-23 14:17:22 +02:00 |
|
Anton Ignatov
|
3b7f715e0b
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-22 13:09:17 +02:00 |
|
aignatov-bio
|
4fe0227d8c
|
Add metadata for .eln assets (#1942)
|
2019-07-19 10:53:33 +02:00 |
|
Anton Ignatov
|
ad7130d3b2
|
Simplify TinyMCE assets for MarvinJS
|
2019-07-19 09:27:03 +02:00 |
|
Anton Ignatov
|
d79fec3345
|
Move TinyMCE logic to correspond controller
|
2019-07-16 15:51:44 +02:00 |
|
Anton Ignatov
|
03a45d7dd8
|
Fix markup
|
2019-07-16 13:42:39 +02:00 |
|
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 |
|
aignatov-bio
|
a8623002e6
|
Small UI changes [SCI-3699] (#1935)
* Small ui changes
* Markup fix
* Add class for addons
|
2019-07-15 13:28:20 +02:00 |
|
aignatov-bio
|
3c32fe0895
|
Fix formulas in table report (#1934)
|
2019-07-15 13:27:27 +02:00 |
|
Jure Grabnar
|
eb615ea8dd
|
[SCI-3670] Show protocols at external protocols tab (#1933)
[SCI-3670] Show protocols at external protocols tab
|
2019-07-15 11:24:01 +02:00 |
|
aignatov-bio
|
894e201e1b
|
Fix big file issue in step attachments [SCI-3682] (#1919)
* Fix big file issue in step atachments
* Fix markup
|
2019-07-15 11:00:01 +02:00 |
|
Jure Grabnar
|
d210b0b152
|
Trigger loading of latest publications when page is loaded
Closes SCI-3670
|
2019-07-15 08:52:17 +02:00 |
|
mlorb
|
5bc8eb7392
|
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
|
2019-07-12 15:52:40 +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 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
aignatov-bio
|
c6152ccddb
|
Fix big table issue in ProtocolIo preview (#1927)
|
2019-07-12 11:17:51 +02:00 |
|
aignatov-bio
|
d8d04b89cd
|
Fix autosave issue in mozzila (#1925)
|
2019-07-12 11:15:45 +02:00 |
|
aignatov-bio
|
26ef970a1e
|
Add academy button (#1924)
|
2019-07-12 11:15:34 +02:00 |
|
aignatov-bio
|
70589126c3
|
Fix autosave for steps (#1926)
|
2019-07-12 10:16:49 +02:00 |
|
Urban Rotnik
|
d5fbe5ecd7
|
Fix for safari on external protocols tab
|
2019-07-11 11:53:49 +02:00 |
|
Mojca Lorber
|
f8afc92606
|
Fix page redirect and add success flash msg after protocols.io import action
|
2019-07-11 09:50:39 +02:00 |
|
Jure Grabnar
|
5eb197127f
|
Fix relative links in protocolsio iframe
Closes SCI-3660
|
2019-07-10 19:20:40 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +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 |
|
aignatov-bio
|
fc78d8f401
|
Fix tooltip position (#1909)
|
2019-07-09 14:00:53 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
aignatov-bio
|
01a01157d3
|
Replace Handson table in reports with simple table [SCI-3636] (#1895)
* Replace handsone table in reports with simple table
* Add result tables
|
2019-07-08 13:19:12 +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
|
6d423ed986
|
Make Navbar icons bigger [SCI-3663] (#1900)
* Make Navbar icons bigger
|
2019-07-08 12:53:43 +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 |
|
Oleksii Kriuchykhin
|
9d926dc956
|
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
|
2019-07-05 16:56:05 +02:00 |
|
Mojca Lorber
|
989c10872c
|
Fixes visual bugs on protocols.io and home page
|
2019-07-04 18:22:51 +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 |
|
Miha Mencin
|
669592f62c
|
Merge pull request #1886 from biosistemika/SCI-3640-fix-safari-search-bar
SCI-3640 Search line on Safari external protocols page needs update
|
2019-07-03 14:18:02 +02:00 |
|
Miha Mencin
|
1b31f7f30a
|
SCI-3640 set max width of search bar to 50%
|
2019-07-03 13:16:07 +02:00 |
|
Miha Mencin
|
37cc526ac9
|
fix CR comments
|
2019-07-03 10:22:59 +02:00 |
|
aignatov-bio
|
d2849c88fd
|
Remove draft after save step (#1878)
|
2019-07-03 09:18:52 +02:00 |
|
Miha Mencin
|
74b4e0d774
|
SCI-3644 hide the import button and show it only on hover & when appropriate user
|
2019-07-02 18:24:07 +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 |
|
Oleksii Kriuchykhin
|
4ea6b56582
|
Fix Step and Result file previews [SCI-3539]
|
2019-07-01 23:30:20 +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
|
a08d93376c
|
Add promo modal when MarvinJS disabled (#1872)
|
2019-07-01 11:51:13 +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
|
ebbb36cc6d
|
Remove border from the import button
|
2019-06-28 11:32:47 +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 |
|
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
|
81695665c7
|
Add hover effect on the card
|
2019-06-28 00:47:08 +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 |
|
Jure Grabnar
|
8338892fc6
|
Update external protocols form to include sort_by
|
2019-06-27 21:26:28 +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
|
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 |
|
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 |
|