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
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
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
Oleksii Kriuchykhin
64b7a5646a
Implement custom document file previewer [SCI-3677]
2019-07-10 14:37:23 +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
Urban Rotnik
b9bec32316
Add tests for StepComponents
2019-07-10 12:48:08 +02:00
Urban Rotnik
0ee2afae29
Merge pull request #1913 from urbanrotnik/ur-sci-3657-log-errors
...
Log to console when error occur on ProtocolsImport actions [SCI-3657]
2019-07-10 09:01:01 +02:00
Urban Rotnik
cc3cd43270
Log to console when error occur on ProtocolsImport actions
2019-07-09 15:32:43 +02:00
mlorb
f2690883aa
Merge pull request #1898 from mlorb/ml-sci-3634
...
Fixes visual bugs on protocols.io and home page [SCI-3634]
2019-07-09 14:38:19 +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
1a75a31647
Remove webinar button [SCI-3664] ( #1906 )
...
* Remove webinar button
* Remove constants and i18n
2019-07-09 14:01:09 +02:00
aignatov-bio
fc78d8f401
Fix tooltip position ( #1909 )
2019-07-09 14:00:53 +02:00
Urban Rotnik
0ac972ffbd
Merge pull request #1910 from urbanrotnik/ur-sci-3656
...
Fix styling for StepComponents in step description [SCI-3656]
2019-07-09 13:42:34 +02:00
Urban Rotnik
10639deb97
Strip tags for table's content
2019-07-09 13:41:52 +02:00
Urban Rotnik
be77746aef
Fix description styling of components
2019-07-09 13:41:51 +02:00
Urban Rotnik
8411e92fa2
Add linebreak for 'There was a table' message
2019-07-09 10:54:48 +02:00
Alex Kriuchykhin
e1185ff551
Merge pull request #1862 from okriuchykhin/ok_SCI_3539
...
Migrate to ActiveStorage [SCI-3539]
2019-07-09 10:42:30 +02:00
Oleksii Kriuchykhin
a1941a21dc
Futher refactoring of old Paperclip methods [SCI-3539]
2019-07-09 10:28:15 +02:00
