scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 17:36:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
6615 commits 69 branches 179 tags 165 MiB
Commit graph

1945 commits

Author SHA1 Message Date
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
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
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
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
Anton Ignatov 259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +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
Anton Ignatov 65eff67926 Fix merge 2019-05-11 20:54:52 +02:00
Anton Ignatov e5b4adcc25 Merge branch 'master-with-note-section' into features/marvinjs-integration 2019-05-11 20:51:01 +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
Anton Ignatov 995408e7fc Fix protocol update error, rollback bootstrap gems and fix step name 2019-05-08 17:18:19 +02:00
Anton Ignatov b5271bdd2c Add remote api support 2019-05-08 15:00:36 +02:00
Anton Ignatov dcf94e78e1 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-08 14:03:41 +02:00
aignatov-bio d08bdd771e
Fix task tag cut off (#1734) 2019-05-08 10:21:59 +02:00
Miha Mencin 0a7696200a
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading 
Clear step edit textarea status before going to edit mode [SCI-3413]
 2019-05-07 16:36:04 +02:00
Miha Mencin b31645adbe
Merge pull request #1731 from aignatov-bio/ai-sci-3418-fix-window-scroll-after-exit-from-tinymce 
Fix floating tool bar and scroll issue after leaving editor [SCI-3418]
 2019-05-07 16:35:49 +02:00
Miha Mencin 60fd1a02c6
Merge pull request #1730 from aignatov-bio/ai-sci-3410-add-task-tag-on-enter 
Add task tag on enter button [SCI-3410]
 2019-05-07 16:35:34 +02:00
Miha Mencin 4b76151e40
Merge pull request #1727 from mlorb/ml-sci-3384 
Fix bug when saving empty step description [SCI-3384]
 2019-05-07 16:35:12 +02:00
Miha Mencin 7c088c8432
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line 
Fix due date position [SCI-3411]
 2019-05-07 16:34:23 +02:00
Anton Ignatov ea545801aa Clear edit textarea status before going to editmode 2019-05-07 15:54:32 +02:00
Anton Ignatov 826ed63f17 Fix floating tool bar and scroll issue after leaving editor 2019-05-07 15:21:15 +02:00
Anton Ignatov 168424a035 Add tag on enter button 2019-05-07 14:47:44 +02:00
aignatov-bio 7d54f2ab01
Fix issue with TInyMCE upload plugin (#1723) 2019-05-07 10:24:02 +02:00
Mojca Lorber 46e8f80965 Fix bug when saving empty step description 2019-05-06 17:14:19 +02:00
Anton Ignatov 2a294c408f Fix due date alignment and chage header structure from bootstrap to flexbox 2019-05-06 16:20:00 +02:00
aignatov-bio 4c1a64ce4f
Fix tags line up (#1722) 2019-05-06 14:19:32 +02:00
Alex Kriuchykhin 3f0401bf9a
Merge pull request #1709 from okriuchykhin/ok_SCI_3398 
Fix TinyMCE for results [SCI-3398]
 2019-05-06 10:47:11 +02:00
mlorb df16b54be0
Merge pull request #1719 from mlorb/ml-sci-3399 
Visual fixes for edit/add step on protocol [SCI-3399]
 2019-05-06 10:33:28 +02:00
aignatov-bio cc8a152278
Fix step attachments sorting (#1718) 2019-05-06 09:56:26 +02:00
Anton Ignatov 565a4959b4 small fixes and improvments 2019-05-03 15:24:28 +02:00
Anton Ignatov 88e67a16c2 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-02 16:16:03 +02:00
Anton Ignatov fef691d30f Add error handling and secutiry checks 2019-05-02 16:12:25 +02:00
Anton Ignatov f73dd38780 Add image editor to tinymce drawings 2019-04-30 18:32:59 +02:00
Anton Ignatov 4d0d5aa014 Adding team sketches selector 2019-04-30 17:32:55 +02:00
Mojca Lorber 7be151bd2d Visual fixes for edit/add step on protocol 2019-04-30 14:57:50 +02:00
aignatov-bio 60296419e8
Update project card due date dropdown (#1716) 2019-04-30 13:30:09 +02:00
aignatov-bio 26dc1a0a4a
Note section css issues [SCI-3378] (#1715) 
* Fix step name width bug
 2019-04-30 10:23:44 +02:00
aignatov-bio 7d197a6f02
Remove gray step headers (#1713) 2019-04-29 14:06:55 +02:00
Anton Ignatov f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov 2847ec7609 Add env variable and check for MarvinJS available 2019-04-28 17:08:18 +02:00
Anton Ignatov 260810fff8 Add editing mode for tinymce images 2019-04-28 16:16:31 +02:00
Anton Ignatov 193edfbc35 Add marvin js support to TinyMCE 2019-04-27 22:54:59 +02:00
Anton Ignatov 54731856f0 Finish step chemical attachments 2019-04-27 19:08:40 +02:00
Anton Ignatov cf4ff41ec6 Add delete feature 2019-04-27 13:51:35 +02:00
Anton Ignatov 46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Anton Ignatov fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov baa9b94a63 Add new graph button to step 2019-04-26 20:33:20 +02:00
Anton Ignatov 40c1c9aef7 Add marvin js modal 2019-04-26 18:24:21 +02:00
Oleksii Kriuchykhin 077ad52d4b Fix TinyMCE for results [SCI-3398] 2019-04-26 17:37:01 +02:00
Urban Rotnik 3b063348ce Hide remove icon and show only on attachment hover 2019-04-26 15:51:35 +02:00
Urban Rotnik 88050b9b93
Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable 
Fix for inline editing on Firefox [SCI-3383]
 2019-04-26 15:46:37 +02:00
aignatov-bio dc7fddc60a
Improve task tags (#1708) 2019-04-26 15:38:33 +02:00
aignatov-bio 9fbfa9215e
Add zoom to image annotation [SCI-3374] (#1694) 
* Add zoom to image annotation
 2019-04-26 15:21:01 +02:00
aignatov-bio 57b80280dc
Update attachemnts css (#1700) 2019-04-26 15:20:39 +02:00
Urban Rotnik 8413ed5ab0 Fix for inline editing on Firefox 2019-04-26 14:22:18 +02:00
aignatov-bio 1a860037f7
Update reports for new RTE [SCI-3263] (#1691) 
* Update reports for new RTE
 2019-04-25 16:16:43 +02:00
Urban Rotnik 0cf688be39
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes 
Comments section changes [SCI-3135]
 2019-04-25 14:18:05 +02:00
Anton Ignatov 0779ed598b Reuse inline editing logic 2019-04-25 11:14:55 +02:00
aignatov-bio 84993ea3ef
Update protocol repository for new description format [SCI-3371] (#1689) 
* Update protocol repository for new description format

* move image clone method to concerns
 2019-04-24 13:34:56 +02:00
Urban Rotnik f894bca694 Add saving event when user clicks out of textarea 2019-04-23 15:02:59 +02:00
Urban Rotnik 774521df7a Changes to comments section in Task Steps 2019-04-23 15:02:58 +02:00
Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Urban Rotnik 7a2bfc12ce Remove form_asset partial 2019-04-23 13:50:48 +02:00
Urban Rotnik ea0368aa11 Attachments update for edit page 2019-04-23 13:50:47 +02:00
Anton Ignatov 7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio 92d8e42a92
Add floating toolbar for tinymce (#1688) 2019-04-19 15:12:06 +02:00
aignatov-bio ba1e3dc3c6
Add smooth loading for inline task and protoocl description editing (#1682) 2019-04-19 14:47:05 +02:00
aignatov-bio 6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
Anton Ignatov f1d801117d disable zoom 2019-04-18 09:11:27 +02:00
Anton Ignatov f6ecea42cf Remove minimum zoom size 2019-04-17 18:51:52 +02:00
Urban Rotnik 3f037ef517 Fix navigationJS team switch when have only 1 team 2019-04-17 09:58:18 +02:00
Anton Ignatov dd8b3caf65 Fix duplicate activtiy issue and fix link to inventory 2019-04-15 11:35:30 +02:00
aignatov-bio 063f02dc56
Add ability to select filters with keyboard [SCI-3200] (#1649) 
* Add ability to select fitlers with keyboard
 2019-04-15 10:30:08 +02:00
aignatov-bio 8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) 
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
 2019-04-15 09:49:44 +02:00
Alex Kriuchykhin 3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 
Switch to kaminari pagination in global activities [SCI-3292]
 2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin 231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
Mojca Lorber bf2e9e8194 Rename button load more system notification to fix the bug 2019-04-12 11:58:47 +02:00
mlorb 3c0b1984d0
Merge pull request #1658 from mlorb/ml-sci-3297 
Fix activity card visuals [SCI-3297]
 2019-04-12 09:20:11 +02:00
aignatov-bio ffb0db06b9
Add scroll to team selector (#1659) 2019-04-12 09:17:14 +02:00
aignatov-bio 2b92a987e6
Fix user counter bug on project card (#1662) 2019-04-12 09:17:03 +02:00
mlorb 520738025a
Merge branch 'master' into ml-sci-3297 2019-04-12 08:32:07 +02:00
Alex Kriuchykhin 7f20b7fa20
Merge pull request #1661 from okriuchykhin/ok_SCI_3292 
Improve global activities pagination and fetching [SCI-3292]
 2019-04-11 16:23:37 +02:00
Jure Grabnar 8420974779 Move scrollTop to reloadActivities 
Closes SCI-3302
 2019-04-10 18:45:12 +02:00
Jure Grabnar 3c47521f0e Reset scrollbar after selecting date filter 
Closes SCI-3302
 2019-04-10 15:46:30 +02:00
Oleksii Kriuchykhin d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
aignatov-bio f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload 
Improve the image file upload into RTE input fields [SCI-3131]
 2019-04-10 14:04:06 +02:00
Mojca Lorber c8ddae4d1e Fix activity card visuals 2019-04-10 12:37:13 +02:00
aignatov-bio 7ef7e2397f
Change activity filter order and reduce custom date label size [SCI-3301] (#1651) 
* Change activity filter order and reduce custom date label size

* Fix hound
 2019-04-09 14:18:22 +02:00
Urban Rotnik ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00
Urban Rotnik a3932cc67f New asset box style update 2019-04-09 14:17:40 +02:00
aignatov-bio e2e299b424
Add dynamic generating filters for global activities [SCI-3228] (#1644) 
* Add dynamic generating filters

* Add url methods
 2019-04-09 09:08:27 +02:00
aignatov-bio a086f88541
Disable save button while image loading (#1646) 2019-04-09 09:07:58 +02:00
Urban Rotnik 26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Jure Grabnar d9a9045658 Hound formatting 2019-04-04 17:05:25 +02:00
Jure Grabnar d60cc2cd1c Refactor create_wopi_file 2019-04-04 17:05:25 +02:00
Jure Grabnar 56bb62c5b0 Addtional formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar 20446fb39d Hound formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar cbf109f884 Fix create WOPI file button 
Closes SCI-3137
 2019-04-04 17:05:25 +02:00
Jure Grabnar fddff9c627 Perform styling on the WOPI modal 2019-04-04 17:05:25 +02:00
Jure Grabnar b12916b828 Add main functionality 2019-04-04 17:05:25 +02:00
Jure Grabnar 613843d095 Temp commit 2019-04-04 16:58:55 +02:00
Oleksii Kriuchykhin e7151e6e6b Disable inventory import activity logging [SCI-3290] 2019-04-03 22:42:33 +02:00
Oleksii Kriuchykhin 9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +02:00
Alex Kriuchykhin bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281 
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
 2019-04-03 11:39:59 +02:00