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

6377 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik bd1c5e4454 Fix focus for RTE 2019-10-04 14:55:14 +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
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
Urban Rotnik e2a779ccfe Activestorage fix for disk storage 
[SCI-3947]
 2019-10-02 14:01:38 +02:00
Alex Kriuchykhin ed6e5e244e
Merge pull request #2112 from okriuchykhin/ok_SCI_3938 
Improve file processing indicator [SCI-3938]
 2019-10-02 11:01:49 +02:00
Alex Kriuchykhin 2c3c690713
Merge pull request #2113 from okriuchykhin/ok_SCI_3839 
Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]
 2019-10-02 10:39:35 +02:00
Alex Kriuchykhin ca6118ba39
Merge pull request #2109 from okriuchykhin/ok_SCI_3854 
Improve ActiveStorage migrations [SCI-3854]
 2019-10-02 10:34:55 +02:00
Urban Rotnik 4b626ab2dd
Merge pull request #2103 from urbanrotnik/ur-sci-3936-permission-issue 
Add permission check for button show [SCI-3936]
 2019-10-02 09:51:53 +02:00
Oleksii Kriuchykhin dd7f2fe095 Fix large preview for documents [SCI-3938] 2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin efe5d8a6ea Remove the deprecated foreign keys from TinyMceAsset [SCI-3839] 2019-10-01 15:49:37 +02:00
Oleksii Kriuchykhin 6a6a43f5ff Improve file processing indicator [SCI-3938] 2019-10-01 15:20:46 +02:00
aignatov-bio 835410a3d8
Merge pull request #2107 from aignatov-bio/ai-sci-3941-fix-docx-report-for-active-storage 
Fix docx report for active storage [SCI-3941]
 2019-10-01 14:54:29 +02:00
aignatov-bio 675d5eb088 Fix MarvinJS representation in global search 2019-10-01 14:20:20 +02:00
Alex Kriuchykhin 86e9456c73
Merge pull request #2110 from biosistemika/activestorage_migration 
Merge latest changes from Active storage branch
 2019-10-01 13:54:30 +02:00
Alex Kriuchykhin d4aae6da9b
Merge pull request #2106 from jbargu/jg_sci_3916 
[SCI-3916] Fix and enable cucumber tests
 2019-10-01 13:49:12 +02:00
Alex Kriuchykhin b5769ee66c
Merge pull request #2100 from okriuchykhin/ok_SCI_3935 
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
 2019-10-01 13:45:26 +02:00
aignatov-bio b8e917455a
Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel 
Update MarvinJS asset on result text cancel [SCI-3907]
 2019-10-01 13:39:01 +02:00
Oleksii Kriuchykhin 46bcc0e78e Fix cloning of TinyMCE images in protocol description [SCI-3935][SCI-3926][SCI-3934] 2019-10-01 13:38:09 +02:00
Oleksii Kriuchykhin 584f2d07c0 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-01 13:06:01 +02:00
Oleksii Kriuchykhin f00f594dbf Improve ActiveStorage migrations [SCI-3854] 2019-10-01 12:45:51 +02:00
aignatov-bio 0da995280f
Merge pull request #2108 from aignatov-bio/master 
Merge Active storage
 2019-10-01 10:40:43 +02:00
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Anton Ignatov b382eb607b Fix docx report for active storage 2019-10-01 10:26:24 +02:00
Jure Grabnar 45aa057378 Enable cucumber tests 2019-09-30 22:35:15 +02:00
Jure Grabnar 6db8b48d16 Fix cucumber tests 
Close SCI-3916
 2019-09-30 22:34:33 +02:00
aignatov-bio 91cc054096
Merge pull request #2105 from aignatov-bio/ai-sci-fix-tests-for-import-repository-row 
Fix tests for repository row importer
 2019-09-30 16:47:17 +02:00
Anton Ignatov 99005cf22e Fix tests for repository row importer 2019-09-30 16:27:45 +02:00
Anton Ignatov 859c5931a4 Update MArvinJS asset on result text cancel 2019-09-30 16:09:43 +02:00
Jure Grabnar 4d9156ebf7 Add chromium-driver patch from Alex 2019-09-30 16:08:44 +02:00
Jure Grabnar 4b605d357a
[SCI-3751] Improve the auto-save functionality on RTF fields (#2086) 
[SCI-3751] Improve the auto-save functionality on RTF fields
 2019-09-30 15:09:32 +02:00
Jure Grabnar 9f704559ef Fix hound formatting issues 2019-09-30 14:42:15 +02:00
Urban Rotnik 248da9475f
Merge pull request #2102 from urbanrotnik/ur-sci-3929-missing-border 
Fixed missing border, counter, buttons position [SCI-3929]
 2019-09-30 14:34:02 +02:00
Jure Grabnar 096228abbb Shorten padding format in scss 2019-09-30 14:32:09 +02:00