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
|
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 |
|
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 |
|
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
|
68937dd192
|
Fix RTE import for protocol repository (#1833)
|
2019-06-14 16:20:27 +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 |
|
Oleksii Kriuchykhin
|
097639e71e
|
Fix view state validation [SCI-3436]
|
2019-06-13 14:28:46 +02:00 |
|
Alex Kriuchykhin
|
599274eb13
|
Merge pull request #1830 from okriuchykhin/ok_SCI_3528
Make repositories more extendable [SCI-3528]
|
2019-06-13 09:45:18 +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 |
|
Jure Grabnar
|
bbfe2b9c89
|
Merge pull request #1798 from biosistemika/jg_sci_3145_thumbnail_preview
File preview on new attachments layout [SCI-3145]
|
2019-06-10 17:59:12 +02:00 |
|
Jure Grabnar
|
56949db9da
|
Move extract_image_quality to before_post_process
|
2019-06-10 17:48:00 +02:00 |
|
Jure Grabnar
|
c2d615ab48
|
Remove image quality preprocessor
|
2019-06-10 15:10:07 +02:00 |
|
Urban Rotnik
|
bbe0062bfd
|
Small fixes for factories
|
2019-06-10 12:24:05 +02:00 |
|
Urban Rotnik
|
965b7eb58b
|
Add missing factories
|
2019-06-10 12:24:04 +02:00 |
|
Urban Rotnik
|
f19eeba8dc
|
Add factory valid check for User's associations
|
2019-06-10 12:24:04 +02:00 |
|
Urban Rotnik
|
ba340f7bee
|
Add valid factory check for Table, Tag, Team
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
9348886fb1
|
Minior changes in SystemNotifications tests
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
15cbd8864c
|
Add valid factory check to Steps models
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
1e60102a7d
|
Add valid factory check for Sample(s) models
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
c66aa29227
|
Add valid factory check for Result(s) models
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
3adf2bb736
|
Add factories and validation tests for repositories and related models
Repositories, cells, columns, values (date, text, asset, list), rows, items
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
a7558d83be
|
Add valid factory check for Project, MyModules, notification, protocol
|
2019-06-10 12:24:01 +02:00 |
|
Urban Rotnik
|
3348b81b14
|
Checklist, checklist_item, activity, experiment spec and factories updated
|
2019-06-10 12:24:01 +02:00 |
|
Urban Rotnik
|
6321c0f5c0
|
Assets spec and factories updated
|
2019-06-10 12:24:01 +02:00 |
|
Mojca Lorber
|
ca1b91a409
|
css fix again
|
2019-06-10 11:23:40 +02:00 |
|
Oleksii Kriuchykhin
|
8920d38a02
|
Make repositories more extendable [SCI-3528]
|
2019-06-06 17:28:59 +02:00 |
|
Oleksii Kriuchykhin
|
e543a849d4
|
Add document file preview generation with LibreOffice [SCI-3145]
|
2019-06-05 14:52:30 +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 |
|
Alex Kriuchykhin
|
db399864f8
|
Merge pull request #1820 from okriuchykhin/ok_SCI_3526
Update Handsontable to 6.2.2 [SCI-3526]
|
2019-06-04 14:59:22 +02:00 |
|
Alex Kriuchykhin
|
36255f82ed
|
Merge pull request #1817 from okriuchykhin/ok_SCI_3522
Add system notifications service to health check endpoint [SCI-3522]
|
2019-06-04 14:41:43 +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 |
|
Oleksii Kriuchykhin
|
01a5a17bb4
|
Update Handsontable to 6.2.2 [SCI-3526]
|
2019-06-04 14:31:37 +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 |
|
Luka Murn
|
cedb10f83e
|
Merge pull request #1815 from Ducz0r/lm-sci-2991
Rename permision_eval - permission_eval [SCI-2991]
|
2019-06-03 09:24:20 +02:00 |
|
Anton Ignatov
|
5df55d39be
|
Fix nil issue in module controller
|
2019-05-31 16:02:21 +02:00 |
|
Oleksii Kriuchykhin
|
552f69b9b1
|
Add system notifications service to health check endpoint [SCI-3522]
|
2019-05-31 15:52:47 +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 |
|
Anton Ignatov
|
16d00340cd
|
Fix merge errors
|
2019-05-31 10:35:04 +02:00 |
|
Anton Ignatov
|
c9a29b12ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-31 10:27:14 +02:00 |
|
Luka Murn
|
b21bdddf15
|
Rename permision_eval - permission_eval
Hopefully this will help with getting rid of all the errors
that we've been receiving for PermissionEval.
Closes SCI-2991.
|
2019-05-31 09:56:54 +02:00 |
|
aignatov-bio
|
94b220172d
|
Fix empty result name issue (#1812)
|
2019-05-31 09:48:58 +02:00 |
|
aignatov-bio
|
3681df7b9f
|
Fix scroll issue in repository column editor (#1813)
|
2019-05-31 09:48:45 +02:00 |
|
Alex Kriuchykhin
|
27ccf7b8fe
|
Merge pull request #1803 from okriuchykhin/ok_SCI_3412
Add additional checks for inventory state objects [SCI-3412]
|
2019-05-30 16:09:13 +02:00 |
|
Alex Kriuchykhin
|
75f122aa15
|
Merge pull request #1809 from okriuchykhin/ok_SCI_3506
Fix import of ELN protocols [SCI-3506]
|
2019-05-30 16:08:27 +02:00 |
|
mlorb
|
111c062981
|
Merge pull request #1802 from mlorb/ml-sci-3470
Hide create office file button to user without permission [SCI-3470]
|
2019-05-30 14:27:19 +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 |
|
Oleksii Kriuchykhin
|
6917ea56e8
|
Fix import of ELN protocols [SCI-3506]
|
2019-05-29 15:41:54 +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 |
|
Oleksii Kriuchykhin
|
5a9640c5d1
|
Add aditional checks for inventory state objects [SCI-3412]
|
2019-05-27 17:32:21 +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 |
|
Mojca Lorber
|
a3c29738bb
|
Hide create office file button to user without permission
|
2019-05-27 14:58:10 +02:00 |
|
Luka Murn
|
d7fe23c6ce
|
Merge pull request #1796 from Ducz0r/lm-sci-3494
Fix the user.activities association so it works [SCI-3494]
|
2019-05-24 14:21:42 +02:00 |
|
Luka Murn
|
3a2bf2ce8a
|
Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup
Add a startup check for WOPI_ENABLED == true variables
|
2019-05-22 16:56:55 +02:00 |
|
aignatov-bio
|
0f86ebf173
|
Adding error, if TinyMCE asset not in text, when we copy anything [SCI-3495] (#1797)
* Adding error, if TinyMCE asset not in text, when we copy anything
|
2019-05-22 16:13:40 +02:00 |
|
Luka Murn
|
8b116d9de7
|
Fix the user.activities association so it works
Closes SCI-3494.
|
2019-05-22 15:42:50 +02:00 |
|
aignatov-bio
|
8f2d873130
|
Fix error when editing office document (#1793)
|
2019-05-22 10:34:16 +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 |
|
Alex Kriuchykhin
|
64c31a6418
|
Merge pull request #1786 from okriuchykhin/ok_SCI_3368_v2
Add type column to zip_exports for STI [SCI-3368]
|
2019-05-21 11:04:51 +02:00 |
|
aignatov-bio
|
5081546c78
|
Fix padding for protocol description (#1782)
|
2019-05-21 10:21:30 +02:00 |
|
Oleksii Kriuchykhin
|
d3f29d5d72
|
Add type column to zip_exports for STI [SCI-3368]
|
2019-05-20 16:35:24 +02:00 |
|
Mojca Lorber
|
b479a6a145
|
Cover all use cases for updating protocol status bar
|
2019-05-20 16:09:43 +02:00 |
|
Oleksii Kriuchykhin
|
882c12cd31
|
Remove protocol description from preview popup [SCI-3485]
|
2019-05-20 15:04:54 +02:00 |
|
Oleksii Kriuchykhin
|
1128fedc51
|
Refactor title inline editing permission checking [SCI-3471]
|
2019-05-20 13:13:31 +02:00 |
|
aignatov-bio
|
b22dba7f05
|
Add delay job for handling unknown tinyMCE images (#1781)
* Add delay job for handling unknown tinyMCE images
|
2019-05-20 12:44:16 +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 |
|