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

6406 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 65ab3c421a
Merge pull request #2137 from aignatov-bio/ai-sci-fix-async-request-for-multiple-result 
Fix async assets results
 2019-10-08 19:52:04 +02:00
aignatov-bio a930f7affd Fix async assets results 2019-10-08 19:51:03 +02:00
Alex Kriuchykhin 6e6ed84014
Merge pull request #2135 from okriuchykhin/ok_SCI_3949 
Update sassc gem version to 2.2.1 [SCI-3949]
 2019-10-08 14:33:36 +02:00
Oleksii Kriuchykhin f18941ea19 Update sassc gem version to 2.2.1 [SCI-3949] 2019-10-08 14:32:25 +02:00
Alex Kriuchykhin f82d02b5d0
Merge pull request #2134 from okriuchykhin/ok_SCI_3960 
Fix team deletion script [SCI-3960]
 2019-10-08 13:35:07 +02:00
Alex Kriuchykhin 6306691cfe
Merge pull request #2133 from okriuchykhin/ok_SCI_3959 
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
 2019-10-08 13:34:57 +02:00
Oleksii Kriuchykhin 6908a5c3a3 Fix team deletion script [SCI-3960] 2019-10-08 12:04:47 +02:00
Oleksii Kriuchykhin 2608f3f1cf Improve code readability [SCI-3959] 2019-10-08 11:43:45 +02:00
Oleksii Kriuchykhin 3d9c2282f3 Implement JPEG quality extraction for ActiveStorage [SCI-3959] 2019-10-08 10:42:55 +02:00
Alex Kriuchykhin b752f32444
Merge pull request #2131 from okriuchykhin/ok_SCI_3970 
Change default executable name for LibreOffice [SCI-3970]
 2019-10-07 16:50:09 +02:00
aignatov-bio 4439ffce6c
Merge pull request #2132 from aignatov-bio/ai-sci-3676-fix-tinymce-import-from-eln 
Fix TinyMCE import from .eln [SCI-3972]
 2019-10-07 16:48:58 +02:00
aignatov-bio f9497e2e3e Fix TinyMCE import from ELN 2019-10-07 16:21:11 +02:00
Oleksii Kriuchykhin 8b3c042e39 Change default executable name for LibreOffice [SCI-3970] 2019-10-07 16:13:43 +02:00
Alex Kriuchykhin 39a2669eef
Merge pull request #2129 from okriuchykhin/ok_SCI_3950 
Improve missing files handling when clonning TinyMceAsset [SCI-3950]
 2019-10-07 09:18:45 +02:00
Oleksii Kriuchykhin a2d70afeca Improve missing files handling when clonning TinyMceAsset [SCI-3950] 2019-10-04 15:59:22 +02:00
mlorb ba8ee86c9f
Merge pull request #2128 from mlorb/ml-sci-3966 
Fix position of shared inventory icon [SCI-3966]
 2019-10-04 15:21:48 +02:00
aignatov-bio 002686ba23
Merge pull request #2127 from aignatov-bio/ai-sci-3965-fix-complete-button-position 
Fix complete button position [SCI-3965]
 2019-10-04 15:19:27 +02:00
Mojca Lorber 564321d327 Fix position of shared inventory icon 2019-10-04 15:18:17 +02:00
aignatov-bio b460cd4384 Fix complete button position 2019-10-04 15:17:28 +02:00
Urban Rotnik 037bba9a16
Merge pull request #2126 from urbanrotnik/ur-sci-3738-new-ste-default-field-selection 
Fix focus for RTE [SCI-3738]
 2019-10-04 15:02:55 +02:00
Urban Rotnik bd1c5e4454 Fix focus for RTE 2019-10-04 14:55:14 +02:00
mlorb 9e1339fb18
Merge pull request #2124 from aignatov-bio/ai-sci-3961-fix-image-in-archive-experiments 
Fix image in archived experiments [SCI-3961]
 2019-10-04 14:52:55 +02:00
aignatov-bio 23581059e7 Remove image 2019-10-04 14:50:27 +02:00
Urban Rotnik c296760be8
Merge pull request #2125 from urbanrotnik/ur-sci-3962-step-is-not-saved-after-removing-file 
Add team_id when asset is creating [SCI-3962]
 2019-10-04 14:46:18 +02:00
Alex Kriuchykhin 076d61d4d0
Merge pull request #2116 from okriuchykhin/ok_SCI_3908 
Remove Paperclip from the codebase [SCI-3908]
 2019-10-04 14:45:42 +02:00
Urban Rotnik 8f0c3bd2ce Add team_id when asset is creating 2019-10-04 14:24:19 +02:00
aignatov-bio a7b13a4a70 Fix image in archived experiments 2019-10-04 13:29:42 +02:00
Oleksii Kriuchykhin 9d2ac4179e Fix failing tests [SCI-3908] 2019-10-04 13:02:18 +02:00
aignatov-bio 8176ce3a9d
Merge pull request #2123 from aignatov-bio/ai-sci-fix-merge-for-repository-datatable 
Fix merge for repository datatable [SCI-3957]
 2019-10-04 12:59:22 +02:00
aignatov-bio fcc1829660 Fix merge for repository datatable 2019-10-04 10:51:13 +02:00
aignatov-bio a39a95d2a7
Merge pull request #2122 from aignatov-bio/ai-sci-disable-autosave-feature 
Disable autosave notification feature
 2019-10-04 09:17:16 +02:00
Urban Rotnik c69e47de40
Merge pull request #2121 from okriuchykhin/ok_SCI_3950 
Skip missing files when cloning TinyMceAsset [SCI-3950]
 2019-10-04 09:17:02 +02:00
aignatov-bio 9e7eff9615
Merge pull request #2120 from aignatov-bio/ai-sci-3946-remove-image-icon-from-preview 
Remove image icon from preview [SCI-3946]
 2019-10-04 09:16:47 +02:00
aignatov-bio c2c8343c57
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search 
Fix MarvinJS representation in global search [SCI-3943]
 2019-10-04 09:16:34 +02:00
aignatov-bio af69e12d1e Disable autosave notification feature 2019-10-04 09:13:42 +02:00
Urban Rotnik 09e6545f30
Merge pull request #2115 from urbanrotnik/ur-sci-3947-local-storage 
Fix for disk storage [SCI-3947]
 2019-10-03 16:28:09 +02:00
aignatov-bio 0cbc699c62 Remove image icon from preview 2019-10-03 15:44:03 +02:00
Oleksii Kriuchykhin bab228e1df Skip missing files when clonning TinyMceAsset [SCI-3950] 2019-10-03 15:43:39 +02:00
Oleksii Kriuchykhin 52bbf6740d Remove paperclip attachments from migrations [SCI-3908] 2019-10-03 13:59:17 +02:00
Urban Rotnik 81d66ceedd Add CustomDisk Service for ActiveStorage 2019-10-03 13:16:15 +02:00
aignatov-bio afecc3fd0e
Merge pull request #2119 from aignatov-bio/ai-sci-fix-marvin-js-preview 
Fix marvin JS preview
 2019-10-03 11:59:19 +02:00
aignatov-bio a31c5ea1f5 Fix marvin JS preview 2019-10-03 11:54:26 +02:00
aignatov-bio e35617208d
Merge pull request #2118 from aignatov-bio/ai-sci-3841-enable-additional-tools 
Enable additional tools [SCI-3841]
 2019-10-03 11:24:31 +02:00
aignatov-bio 8630be70dc
Merge pull request #2117 from aignatov-bio/ai-sci-3945-fix-duplicate-code-in-file-preview 
Fix duplicate code in file preview [SCI-3945]
 2019-10-03 11:24:00 +02:00
aignatov-bio 65b1e0c041 Fix reload page 2019-10-03 11:19:12 +02:00
aignatov-bio 9000438025 Enable additional tools 2019-10-03 11:07:19 +02:00
Urban Rotnik 9c88327a16 Rename ActiveStorage base controller 2019-10-03 11:00:59 +02:00
aignatov-bio 301b37cccd Fix duplicate code in file preview 2019-10-03 10:55:54 +02:00
Oleksii Kriuchykhin 260fcd6e89 Remove Paperclip from codebase [SCI-3908] 2019-10-02 19:45:14 +02:00
Urban Rotnik e2a779ccfe Activestorage fix for disk storage 
[SCI-3947]
 2019-10-02 14:01:38 +02:00