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
|
ebbb36cc6d
|
Remove border from the import button
|
2019-06-28 11:32:47 +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
|
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 |
|
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
|
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
|
a843a016a0
|
Fix markup and naming
|
2019-06-19 15:19:47 +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
|
81d10c8ce4
|
Remove recent protocol button on new step (#1841)
|
2019-06-19 12:49:22 +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 |
|
aignatov-bio
|
fb3b7918af
|
Fix handson table issue (#1827)
|
2019-06-14 16:21:27 +02:00 |
|
aignatov-bio
|
2dfbdacfa3
|
Change restore button background (#1829)
|
2019-06-14 16:21:01 +02:00 |
|
aignatov-bio
|
da8d748c49
|
Fix small comments bugs (#1832)
|
2019-06-14 16:20:47 +02:00 |
|
aignatov-bio
|
7a3eedf461
|
Adding missing avatars to comments (#1838)
|
2019-06-14 16:20:13 +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 |
|
Oleksii Kriuchykhin
|
4d579db2e2
|
Refactor assets polling to use setTimeout [SCI-3461]
|
2019-06-11 13:14:07 +02:00 |
|
mlorb
|
fa28e772f0
|
Merge pull request #1807 from mlorb/ml-sci-3508
Fix some css on step panel heading [SCI-3508]
|
2019-06-11 11:12:12 +02:00 |
|
Oleksii Kriuchykhin
|
6e1a7a3392
|
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-11 10:08:33 +02:00 |
|
Mojca Lorber
|
ca1b91a409
|
css fix again
|
2019-06-10 11:23:40 +02:00 |
|
aignatov-bio
|
d553fee2b3
|
Prevent negative scroll for sidebar (#1819)
|
2019-06-05 12:41:27 +02:00 |
|
Urban Rotnik
|
3d3c6d5350
|
Toolbar position fix for Safari
|
2019-06-04 15:55:44 +02:00 |
|
aignatov-bio
|
d207cf5dce
|
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
|
2019-06-04 14:40:21 +02:00 |
|
Anton Ignatov
|
d0439f478d
|
Fix markup
|
2019-06-03 09:52:04 +02:00 |
|
Anton Ignatov
|
559bb2d793
|
Prevent selecting empty tag
|
2019-06-03 09:50:55 +02:00 |
|
aignatov-bio
|
cd7460a4bd
|
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
|
2019-05-31 15:44:27 +02:00 |
|
aignatov-bio
|
3681df7b9f
|
Fix scroll issue in repository column editor (#1813)
|
2019-05-31 09:48:45 +02:00 |
|
Alex Kriuchykhin
|
c49dbe5c44
|
Merge pull request #1810 from okriuchykhin/ok_SCI_3511
Fix RTE editor initialization for new step in protocol [SCI-3511]
|
2019-05-30 12:54:36 +02:00 |
|
Oleksii Kriuchykhin
|
d061aec5cd
|
Fix RTE editor initialization for new step in protocol [SCI-3511]
|
2019-05-29 18:33:20 +02:00 |
|
Mojca Lorber
|
ca4d8e71bb
|
fix some css on step panel heading
|
2019-05-29 13:56:55 +02:00 |
|
Oleksii Kriuchykhin
|
2c9ced0c75
|
Fix step numbering update on reposition [SCI-3507]
|
2019-05-29 12:20:35 +02:00 |
|
aignatov-bio
|
0b3b6d593b
|
Small style fixes [SCI-3498] (#1799)
* Adding error, if TinyMCE asset not in text, when we copy anything
* Small style fixes
|
2019-05-27 16:27:27 +02:00 |
|
aignatov-bio
|
fb30e6b6e5
|
Add check for refreshProtocolStatusBar function exist (#1794)
|
2019-05-22 10:31:29 +02:00 |
|
aignatov-bio
|
da33a053cf
|
Fix avatar image position on global activities (#1792)
|
2019-05-22 10:21:18 +02:00 |
|
Oleksii Kriuchykhin
|
84a2ad4487
|
Refactor the async thumbnail reloading (spinner) [SCI-3461]
|
2019-05-21 17:29:33 +02:00 |
|
aignatov-bio
|
2cee46a10d
|
Fix experiment name length (#1789)
|
2019-05-21 15:54:01 +02:00 |
|
aignatov-bio
|
d97e803d01
|
Adding placeholder to TinyMCE editor (#1788)
|
2019-05-21 15:53:47 +02:00 |
|
aignatov-bio
|
59e824ef9e
|
Fix nil handling in different places [SCI-2840] (#1777)
* Fix nil handling in different places
|
2019-05-21 15:53:34 +02:00 |
|
mlorb
|
be0393e642
|
Merge pull request #1785 from biosistemika/lm-ml-sci-3193
Update protocol status bar upon protocol changing [SCI-3193]
|
2019-05-21 15:28:58 +02:00 |
|
aignatov-bio
|
2de2ead723
|
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
|
2019-05-21 15:19:44 +02:00 |
|
aignatov-bio
|
5081546c78
|
Fix padding for protocol description (#1782)
|
2019-05-21 10:21:30 +02:00 |
|
Mojca Lorber
|
b479a6a145
|
Cover all use cases for updating protocol status bar
|
2019-05-20 16:09:43 +02:00 |
|
aignatov-bio
|
d959769b65
|
Fix experiment and step title (#1779)
|
2019-05-20 11:20:08 +02:00 |
|
aignatov-bio
|
20b626d791
|
Fix warning message issue in step description [SCI-3479] (#1778)
* Fix warning message issue
|
2019-05-20 11:19:53 +02:00 |
|
Luka Murn
|
c26489acdc
|
Update protocol status bar upon changing of protocol description
|
2019-05-17 10:22:16 +02:00 |
|
aignatov-bio
|
24e30867da
|
Add smart annotation to comments [SCI-3458] (#1768)
* Add smart annotation to comments
|
2019-05-15 14:59:15 +02:00 |
|
aignatov-bio
|
825e34e661
|
Fix inside click action in inline editing [SCI-3440] (#1765)
* Fix inside click action
|
2019-05-14 16:25:46 +02:00 |
|
aignatov-bio
|
d28d466dc9
|
Fix multiple confirm windows [SCI-3452] (#1763)
* Fix multiple confirm windows
|
2019-05-14 16:25:34 +02:00 |
|
aignatov-bio
|
4a753f8519
|
Fix user smart annotation fpr tinyMCE (#1759)
|
2019-05-14 15:02:12 +02:00 |
|
aignatov-bio
|
fe2a3c4ee6
|
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754)
* Add message when turbolinks change page with dirty tinuMCE
|
2019-05-14 09:49:00 +02:00 |
|
aignatov-bio
|
f970eea525
|
Some gui fixes (#1757)
|
2019-05-14 09:43:02 +02:00 |
|
Oleksii Kriuchykhin
|
4b1c4bd140
|
Fix handling of proccessing step attachments [SCI-3381]
|
2019-05-13 17:12:06 +02:00 |
|
aignatov-bio
|
039b2f3754
|
Fix zoom on Y axis [SCI-3374] (#1750)
* Add zoom to image annotation
|
2019-05-13 11:01:39 +02:00 |
|
Miha Mencin
|
5ff344c208
|
Merge pull request #1746 from biosistemika/lm-sci-3426
Changes to create new office file button [SCI-3426]
|
2019-05-13 10:55:58 +02:00 |
|
aignatov-bio
|
d3aa6371cd
|
Fix report saving [SCI-3443] (#1753)
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
|
2019-05-13 10:55:08 +02:00 |
|
Alex Kriuchykhin
|
837e5d1fea
|
Merge pull request #1744 from okriuchykhin/ok_SCI_3439
Change implementation of TinyMCE floating toolbar [SCI-3439]
|
2019-05-13 10:46:23 +02:00 |
|
aignatov-bio
|
71b3228310
|
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
|
2019-05-13 10:45:12 +02:00 |
|
Oleksii Kriuchykhin
|
b60bd79e2b
|
Change implementation of TinyMCE floating toolbar [SCI-3439]
|
2019-05-13 10:26:15 +02:00 |
|
aignatov-bio
|
3633274c8f
|
Fix import for eln (#1741)
|
2019-05-13 10:22:30 +02:00 |
|
aignatov-bio
|
364f903b3c
|
Fix protocol preview name (#1749)
|
2019-05-13 10:17:47 +02:00 |
|
aignatov-bio
|
2010b3ad8f
|
Fix step comments bugs (#1751)
|
2019-05-13 09:49:53 +02:00 |
|
aignatov-bio
|
634b58bd6a
|
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
|
2019-05-11 16:04:28 +02:00 |
|
Luka Murn
|
bbfad0efe5
|
Refresh current page after new OfficeOnline file is created
|
2019-05-10 18:30:48 +02:00 |
|
Luka Murn
|
584cf4b93b
|
Change Office icon on the create New Office buttons
|
2019-05-10 17:51:29 +02:00 |
|
mlorb
|
110c4ec460
|
Merge pull request #1743 from mlorb/ml-sci-3386
Fix tiny mce visuals, saving and cursor position [SCI-3386]
|
2019-05-10 17:45:12 +02:00 |
|
aignatov-bio
|
f684ddd365
|
Change dropdown highlight color and fix task tag position [SCI-3410] (#1735)
* Change dropdown highlight color and fix task tag position
|
2019-05-10 16:37:59 +02:00 |
|
Mojca Lorber
|
86255b9037
|
Remove automatic saving on task and protocol description
|
2019-05-10 15:30:29 +02:00 |
|
Mojca Lorber
|
d761a5cecb
|
Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description
|
2019-05-10 11:27:47 +02:00 |
|
Mojca Lorber
|
8e6413b031
|
Fix tiny mce visuals, saving and cursor position
|
2019-05-10 10:52:14 +02:00 |
|