scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 07:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
5765 commits 70 branches 179 tags 165 MiB
Commit graph

1300 commits

Author SHA1 Message Date
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
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
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
aignatov-bio fb3b7918af
Fix handson table issue (#1827) 2019-06-14 16:21:27 +02:00
aignatov-bio da8d748c49
Fix small comments bugs (#1832) 2019-06-14 16:20:47 +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
Oleksii Kriuchykhin 6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +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
Oleksii Kriuchykhin 2c9ced0c75 Fix step numbering update on reposition [SCI-3507] 2019-05-29 12:20:35 +02:00
aignatov-bio fb30e6b6e5
Add check for refreshProtocolStatusBar function exist (#1794) 2019-05-22 10:31:29 +02:00
Oleksii Kriuchykhin 84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +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
Mojca Lorber b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +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
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
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