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

6269 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 429de4f115
Merge pull request #2083 from aignatov-bio/ai-sci-3904-fix-padding-for-marvinjs-promo-modal 
Fix padding for marvinjs modal [SCI-3904]
 2019-09-24 14:26:18 +02:00
aignatov-bio 856e876b61
Merge pull request #2079 from aignatov-bio/ai-sci-3900-fix-error-on-task-copy 
Fix error on task copy [SCI-3900]
 2019-09-24 14:16:38 +02:00
aignatov-bio 8a3b6b5cda
Merge pull request #2076 from aignatov-bio/ai-sci3769-fix-repository-row-import-export 
Fix repository row import/export [SCI-3769]
 2019-09-24 12:44:18 +02:00
Anton Ignatov e01c438055 Fix padding for marvinjs modal 2019-09-24 11:02:15 +02:00
aignatov-bio 7c52728b08
Merge pull request #2081 from aignatov-bio/ai-sci-3901-recent-protocol-js-error 
Fix JS error in recent protocol drop down [SCI-3901]
 2019-09-24 10:38:42 +02:00
Anton Ignatov c389972e2a Fix JS error in recent protocol drop down 2019-09-24 09:47:04 +02:00
Anton Ignatov 646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Anton Ignatov 09e3b7c80b Fix repository row import/export 2019-09-23 13:33:02 +02:00
Jure Grabnar 73020043a4
Merge pull request #2074 from biosistemika/jg_sci_3875 
[SCI-3875] Content is not saved for office files
 2019-09-20 14:07:45 +02:00
Jure Grabnar 8780e5183b Remove CSRF check in WopiController 2019-09-19 15:55:29 +02:00
Jure Grabnar cc561d8ee5 Change wopi_controller using Paperclip for reading 2019-09-19 15:03:13 +02:00
Alex Kriuchykhin 29ffe05442
Merge pull request #1964 from okriuchykhin/ok_SCI_3643 
Add text extraction from MarvinJS for search [SCI-3643]
 2019-09-18 16:22:11 +02:00
Alex Kriuchykhin 25c91c2724
Merge pull request #2072 from okriuchykhin/ok_SCI_3888 
Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888]
 2019-09-18 15:46:51 +02:00
aignatov-bio d783391290
Merge pull request #2071 from aignatov-bio/ai-sci-3889-fix-error-on-archived-experiment-page 
Fix error on archived experiment page [SCI-3889]
 2019-09-18 15:35:53 +02:00
Oleksii Kriuchykhin b841d3dd6b Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888] 2019-09-18 15:34:49 +02:00
aignatov-bio 7951ae4218
Merge pull request #2070 from aignatov-bio/ai-sci-3874-error-handling-when-image-unavalialbe-for-base64 
Error handling, when image unavaliable for base64 [SCI-3874]
 2019-09-18 15:27:49 +02:00
Anton Ignatov 5a1efb84c6 Fix error on archived experiment page 2019-09-18 15:23:45 +02:00
Anton Ignatov 69eb8681bd Error handling, when image unavaliable for base64 2019-09-18 15:11:51 +02:00
aignatov-bio fba030dc9d
Merge pull request #2067 from aignatov-bio/ai-sci-3880-fix-error-when-save-pdf-to-inventory 
Fix error when save report to inventory [SCI-3880]
 2019-09-18 14:59:47 +02:00
aignatov-bio c652bb0d44
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button 
Fix missing expand all button [SCI-3878]
 2019-09-18 14:59:29 +02:00
aignatov-bio ce91759ee2
Merge pull request #2065 from aignatov-bio/ai-sci-3879-fix-step-table-error 
Fix step table error [SCI-3879]
 2019-09-18 14:59:16 +02:00
Anton Ignatov b9f6b3a082 Fix error when save report to inventory 2019-09-18 12:50:54 +02:00
Anton Ignatov 0adb016293 Fix missing expand all button 2019-09-18 12:33:48 +02:00
Anton Ignatov 146c725e89 Fix step table error 2019-09-18 11:47:33 +02:00
aignatov-bio f205e4aa80
Merge pull request #2064 from aignatov-bio/ai-sci-3873-fix-file-preview-in-inventory 
Fix file preview in inventory [SCI-3873]
 2019-09-18 11:36:43 +02:00
aignatov-bio d028856fe0
Fix hidden buttons in inventory (#2063) 2019-09-18 11:36:30 +02:00
Anton Ignatov 68994a77c8 Fix file preview in inventory 2019-09-18 11:21:33 +02:00
aignatov-bio 11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +02:00
aignatov-bio 52499fa285
Fix pathe to icon for chemical structure (#2056) 2019-09-18 11:18:31 +02:00
Oleksii Kriuchykhin 7181365f7d Allow use of libvips through env variable [SCI-3881] 2019-09-18 09:49:02 +02:00
aignatov-bio 64306cfb2a
Fix active storage migration script (#2060) 
* Fix active storage migration script

* Update check logic
 2019-09-18 09:20:04 +02:00
Oleksii Kriuchykhin 4639d4d1d0 Temporary disable Vips image processor [SCI-3881] 2019-09-17 16:25:37 +02:00
Urban Rotnik f6d54321f1
Merge pull request #2059 from urbanrotnik/ur-sci-rubocop-fix 
Add rubocop-rails gem
 2019-09-17 14:28:16 +02:00
Urban Rotnik e5933091d9 Add rubocop-rails gem 2019-09-17 13:42:43 +02:00
Oleksii Kriuchykhin e12cd0ae9d Fix autoloading issues [SCI-3881] 2019-09-17 10:50:01 +02:00
Alex Kriuchykhin 06dd43344f
Merge pull request #2054 from okriuchykhin/ok_SCI_3881 
Merge branch 'master' [SCI-3881]
 2019-09-16 14:57:54 +02:00
Oleksii Kriuchykhin 0475394b08 Fix test [SCI-3881] 2019-09-16 13:03:41 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Alex Kriuchykhin f65edebaed
Merge pull request #2052 from okriuchykhin/ok_SCI_3745 
Upgrade Rails to 6.0 [SCI-3745]
 2019-09-16 11:25:31 +02:00
Oleksii Kriuchykhin bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Alex Kriuchykhin 9512b448e6
Merge pull request #2027 from okriuchykhin/ok_SCI_3771 
Implement Cucumber tests for direct upload [SCI-3771]
 2019-09-12 15:34:28 +02:00
Alex Kriuchykhin 5f3b1b207b
Merge pull request #2008 from okriuchykhin/ok_SCI_3786 
Fix cucumber tests, switch to chromium-driver [SCI-3786]
 2019-09-12 15:34:14 +02:00
Alex Kriuchykhin 0d6f011e61
Merge pull request #2006 from okriuchykhin/ok_SCI_3765 
Add path method to custom ActiveStorage S3 service [SCI-3765]
 2019-09-12 15:34:03 +02:00
Alex Kriuchykhin 7f415a551d
Merge pull request #2050 from okriuchykhin/release_1_16_10 
Bump version to 1.16.10
 2019-09-12 10:48:52 +02:00
Oleksii Kriuchykhin 816d48f0e0 Bump version to 1.16.10 2019-09-12 10:47:54 +02:00
aignatov-bio c4e8e8ed07
Revert "Fix formulas in project export (#2047)" (#2049) 
This reverts commit 36ae7d05f9.
 2019-09-12 10:45:43 +02:00
aignatov-bio a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983) 
* Fix report image issues

* Small fixes
 2019-09-12 09:02:45 +02:00
aignatov-bio 36ae7d05f9
Fix formulas in project export (#2047) 2019-09-12 08:43:59 +02:00
aignatov-bio 07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00