scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 17:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity
6090 commits 39 branches 184 tags 168 MiB
Commit graph

6090 commits

This branch
This branch
All branches
Author SHA1 Message Date
Urban Rotnik
916ff06f99
Merge pull request #1945 from urbanrotnik/ur-sci-3708-missing-error-message-at-import 
Fix showing errors [SCI-3708]
 2019-07-26 13:01:19 +02:00
Oleksii Kriuchykhin
ccf76b8531 Move repository_datatable to JS file [SCI-3679] 2019-07-26 13:00:25 +02:00
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Urban Rotnik
4699ba718a Fix showing errors 2019-07-26 11:32:51 +02:00
Urban Rotnik
88fbd6c0af Fix for archived results in row 2019-07-26 11:16:53 +02:00
Urban Rotnik
aa36d93bea Add additional NewStep button 2019-07-26 11:01:36 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Jure Grabnar
39fbd18316 Remove width on commments 
Closes SCI-3674
 2019-07-25 16:46:27 +02:00
Jure Grabnar
a579328614 Revalidate internal dimension when dragging 
Close SCI-3673
 2019-07-25 16:37:15 +02:00
Jure Grabnar
d3a5651998 Add remaining missing description in global search 
Close SCI-3723
 2019-07-25 14:27:53 +02:00
Jure Grabnar
11b3b7b4e9 Fix search description for step 2019-07-25 14:15:45 +02:00
Jure Grabnar
f44404a1f8
Merge pull request #1946 from jbargu/jg_sci_3704 
Fix Handsontable error when generation report
 2019-07-25 11:28:46 +02:00
Jure Grabnar
06657dbdf6
Add spinner when editing image annotation (#1948) 
Add spinner when editing image annotation
 2019-07-25 11:28:13 +02:00
Urban Rotnik
a472efc968
Merge pull request #1949 from urbanrotnik/ur-sci-3724-file-preview-problem-safari 
Fix for file annotating on Safari [SCI-3724]
 2019-07-24 14:42:03 +02:00
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