Commit graph

5962 commits

Author SHA1 Message Date
Jure Grabnar
cdad167be2 Add spinner when editing image annotation
Close SCI-3710
2019-07-23 15:02:33 +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
Miha Mencin
7e0efa2490
Update Version 2019-07-17 09:39:11 +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
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
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
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
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
Alex Kriuchykhin
5ca333fe1c
Merge pull request #1920 from jbargu/jg_poppler_pdf
Switch to pdftoppm PDF preview maker
2019-07-12 10:23:10 +02:00
aignatov-bio
70589126c3
Fix autosave for steps (#1926) 2019-07-12 10:16:49 +02:00
Alex Kriuchykhin
fa45bb75eb
Update Dockerfile.production 2019-07-12 10:00:27 +02:00
Alex Kriuchykhin
ea9fddc5d2
Update Dockerfile 2019-07-12 10:00:06 +02:00
Jure Grabnar
83d450c445 Simplify generation of PDF previwe files 2019-07-12 07:51:03 +02:00
Jure Grabnar
03d7affaae Switch to pdftoppm PDF preview maker 2019-07-12 07:51:03 +02:00
Jure Grabnar
a20a0ed5e2 Add poppler-utils 2019-07-12 07:51:03 +02:00
Urban Rotnik
ac1ee3ea66
Merge pull request #1922 from urbanrotnik/ur-sci-3693-external-protocols-safari-fix
Fix for safari on external protocols tab [SCI-3693]
2019-07-11 13:30:56 +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
aignatov-bio
ac7970209c
Add helper for inline JS code (#1916) 2019-07-11 09:31:30 +02:00
Jure Grabnar
28ba03b27c
[SCI-3660] Protocols preview (main pane): All the links in the… (#1911)
[SCI-3660] Protocols preview (main pane): All the links in the preview are relative
2019-07-10 23:19:36 +02:00
Jure Grabnar
ed5eb39bb2 Fix tests for GET show on protocols.io 2019-07-10 19:20:40 +02:00
Jure Grabnar
5eb197127f Fix relative links in protocolsio iframe
Closes SCI-3660
2019-07-10 19:20:40 +02:00
Miha Mencin
f8ea51f7d6 SCI-3672 change the copy of the import button 2019-07-10 14:24:17 +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