scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-10-02 12:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
9926 commits 69 branches 179 tags 166 MiB
Commit graph

9926 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Miha Mencin daccad1346
Merge pull request #1928 from NicolasCARPi/patch-1 
Improve "make run" command
 2019-07-22 17:20:26 +02:00
Anton Ignatov 3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
aignatov-bio cd40084c82
Merge pull request #1876 from aignatov-bio/ai-sci-3624-refactor-marvin-js-over-active-storage 
Refactor MarvinJS core over active storage [SCI-3624]
 2019-07-22 10:53:37 +02:00
Anton Ignatov b762ae6a90 Copy protocol assets through tempfile 2019-07-19 15:23:34 +02:00
Anton Ignatov 0702dacc5b Security fixes 2019-07-19 14:10:38 +02:00
aignatov-bio 4fe0227d8c
Add metadata for .eln assets (#1942) 2019-07-19 10:53:33 +02:00
aignatov-bio 2fae7d8208
Fix issue in report (#1941) 2019-07-19 10:37:44 +02:00
Anton Ignatov ad7130d3b2 Simplify TinyMCE assets for MarvinJS 2019-07-19 09:27:03 +02:00
Anton Ignatov b5a35f583a Fix protocol copy, add metadata to assets 2019-07-18 15:39:08 +02:00
Anton Ignatov bdc2dbbac1 Simplify image creation 2019-07-18 14:29:24 +02:00
Miha Mencin 7e0efa2490
Update Version 2019-07-17 09:39:11 +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
Miha Mencin 88dcf8edb4
Merge pull request #1937 from biosistemika/3702-report-error-fix 
SCI-3702  Error at generating docx report
 2019-07-15 16:42:53 +02:00
Miha Mencin 47d3315d82 SCI-3702 revert the fix and use local variables 2019-07-15 16:20:39 +02:00
Miha Mencin 1c84e46a21 Revert "SCI-3702 replace _to_text with _to_html" 
This reverts commit 93b7c472ac.
 2019-07-15 16:18:26 +02:00
Miha Mencin 93b7c472ac SCI-3702 replace _to_text with _to_html 2019-07-15 16:16:41 +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
Miha Mencin bbf6b709bc
Merge pull request #1936 from jbargu/jg_sci_3696 
[SCI-3696] Small email template styling fixes
 2019-07-15 13:26:59 +02:00
Urban Rotnik 795c355f01
Merge pull request #1915 from urbanrotnik/ur-sci-3531-tests-for-step-components 
Add tests for StepComponents [SCI-3531]
 2019-07-15 13:25:36 +02:00
Miha Mencin 8d3b94d7bc
Merge pull request #1931 from okriuchykhin/ok_SCI_3700 
Improve permissions checks for reports [SCI-3700]
 2019-07-15 12:34:59 +02:00
Jure Grabnar 48c6b9ae91 Fix typo 
Fix SCI-3696
 2019-07-15 11:30:59 +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
Jure Grabnar 20120bf2e6 Add test for empty search key 2019-07-15 08:44:02 +02:00
Jure Grabnar 015dae1a05 Fix old tests 2019-07-15 08:27:34 +02:00
Jure Grabnar a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Alex Kriuchykhin 313d2d27b9
Update repository_rows_controller.rb 2019-07-12 17:03:09 +02:00
Urban Rotnik 4e6e5906c2
Merge pull request #1912 from urbanrotnik/ur-sci-3659 
Protocols list preview - Show published_on instead of created_on [SCI-3659]
 2019-07-12 16:59:05 +02:00
Urban Rotnik 5cf100a787 Show 'published_on' instead of 'created_on' on external_protocols list 2019-07-12 16:56:07 +02:00
Oleksii Kriuchykhin 1c235aafe5 Improve permissions checks for reports [SCI-3700] 2019-07-12 16:44:15 +02:00
Miha Mencin d4b09444b2
Merge pull request #1917 from biosistemika/SCI-3672-replace-button-title 
SCI-3672 Replace Talk to us button link
 2019-07-12 16:18:32 +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
Alex Kriuchykhin 2a905e7b75
Merge pull request #1929 from okriuchykhin/ok_SCI_3695 
Fix file result update method [SCI-3695]
 2019-07-12 15:47:07 +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
Oleksii Kriuchykhin 6166a0dbb0 Fix file result update method [SCI-3695] 2019-07-12 14:42:04 +02:00
Mojca Lorber d07e04e511 Fix dooble flash_alerts load 2019-07-12 14:33:41 +02:00
Alex Kriuchykhin c78ab50e0c
Merge pull request #1918 from okriuchykhin/ok_SCI_3677 
Implement custom document file previewer [SCI-3677]
 2019-07-12 14:27:21 +02:00
aignatov-bio 4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899) 
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
 2019-07-12 13:48:14 +02:00
Nicolas CARPi 81a2a9fa12
Improve "make run" command 
Using the "-f" flag on "rm" makes it exit silently and with success if the file is not here. This little change prevents the user running the command from seeing: `rm: cannot remove 'tmp/pids/server.pid': No such file or directory`.
 2019-07-12 12:18:44 +02:00
aignatov-bio 5ca822a7d8
Add archive lables and fix bright colors in RTE fields (#1923) 2019-07-12 11:38:48 +02:00