Commit graph

988 commits

Author SHA1 Message Date
Anton Ignatov 7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
aignatov-bio b1f9e7f1ca Fix global activities jsonb field [SCI-3830] (#2030)
* Fix global activities jsonb field

* Fix tests
2019-11-18 13:59:54 +01:00
Urban Rotnik dcfca76602 Update method 'update_canvas' to work with new DB constraint 2019-11-18 11:11:41 +01:00
Urban Rotnik b8bf7bbd9b Rename validation 2019-11-18 11:11:40 +01:00
Urban Rotnik 43e3763ec8 Update x, y, experiment unqiue validation
[SCI-3887]
2019-11-18 11:11:40 +01:00
Urban Rotnik 060125a1c4 Add file size validation 2019-11-18 11:11:38 +01:00
Urban Rotnik 24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +01:00
Urban Rotnik 7802d5ee8b Add uniq validation for x and y position scoped to experiment 2019-11-18 11:11:36 +01:00
aignatov-bio 3eb6f5695b
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
2019-11-18 09:11:10 +01:00
aignatov-bio b979435b35
Merge pull request #2199 from aignatov-bio/ai-sci-4055-fix-eln-export-for-files-without-extension
Fix eln export for file without extension [SCI-4055]
2019-11-15 14:16:07 +01:00
aignatov-bio a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
aignatov-bio 0c5ce90895 Fix eln export for file without extension 2019-11-06 09:53:44 +01:00
Oleksii Kriuchykhin b2eda231a0 Fix TinyMCE images in protocol clonning [SCI-4053] 2019-11-05 18:13:44 +01:00
aignatov-bio 717b70f75b
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties
Fix avatars in comments and activities [SCI-3995]
2019-10-29 14:11:39 +01:00
Urban Rotnik 169a381629
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download
Fix for downloading image [SCI-4008]
2019-10-22 15:12:11 +02:00
Urban Rotnik a7d351dc38 Add file size check 2019-10-22 14:13:22 +02:00
Alex Kriuchykhin 5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
2019-10-22 12:45:02 +02:00
aignatov-bio 9950a23188 Replace base64 avatars with url 2019-10-22 12:27:13 +02:00
Urban Rotnik 0119533e75 Fix for file generation 2019-10-22 11:02:59 +02:00
Oleksii Kriuchykhin 53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin 8f52b362d6 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-11 11:46:51 +02:00
Miha Mencin 8e98c82bbf SCI-3979 removing accessors 2019-10-09 15:49:49 +02:00
Miha Mencin 6d71036d07
Remove paperclip attribute accessors 2019-10-09 10:20:00 +02:00
Miha Mencin 78fd5df0f6
Revert "Fix report in academia" 2019-10-09 10:16:39 +02:00
Miha Mencin 37e6604f8b
Merge pull request #2136 from biosistemika/SCI-3975-team-export
Sci 3975 team export
2019-10-08 21:47:08 +02:00
Miha Mencin f12c29bd2a fixing import 2019-10-08 21:40:44 +02:00
aignatov-bio 5eed152403
Revert "Force save office file" 2019-10-08 21:34:16 +02:00
aignatov-bio 0d88466894
Merge pull request #2139 from aignatov-bio/ai-sci-fix-office-save
Force save office file
2019-10-08 21:11:33 +02:00
aignatov-bio 236ce30254 Force save office file 2019-10-08 21:10:18 +02:00
aignatov-bio 4a5db36c07
Merge pull request #2138 from aignatov-bio/ai-sci-fix-report-in-academia
Fix report in academia
2019-10-08 20:19:48 +02:00
aignatov-bio 5d80c51996 Fix report in academia 2019-10-08 20:18:51 +02:00
Oleksii Kriuchykhin 3d9c2282f3 Implement JPEG quality extraction for ActiveStorage [SCI-3959] 2019-10-08 10:42:55 +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
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
Oleksii Kriuchykhin bab228e1df Skip missing files when clonning TinyMceAsset [SCI-3950] 2019-10-03 15:43:39 +02:00
Oleksii Kriuchykhin 260fcd6e89 Remove Paperclip from codebase [SCI-3908] 2019-10-02 19:45:14 +02:00
Oleksii Kriuchykhin efe5d8a6ea Remove the deprecated foreign keys from TinyMceAsset [SCI-3839] 2019-10-01 15:49:37 +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
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Jure Grabnar 0a3389f310 Fix operator for removing the lock on asset 2019-09-30 08:46:16 +02:00
Alex Kriuchykhin 53caaf647b
Merge pull request #2080 from okriuchykhin/ok_SCI_3891
Move file preview generation to delayed job [SCI-3891]
2019-09-27 10:50:21 +02:00
Miha Mencin 0e75ea2e3e
Merge pull request #2096 from aignatov-bio/ai-sci-3932-fix-tiny-mce-render-in-report
Fix tinymce assets render in report [SCI-3932]
2019-09-27 10:48:10 +02:00
Anton Ignatov 40a8c6a1cc Markup fix 2019-09-26 16:29:26 +02:00
Anton Ignatov 1f02fb4bc7 Fix tinymce assets render in report 2019-09-26 16:27:22 +02:00
Jure Grabnar 668f902570 Fix export all with active storage
Close SCI-3924
2019-09-26 16:01:30 +02:00
Anton Ignatov 305e9dc109 Fix error handling and rubocop error 2019-09-25 13:45:34 +02:00
Jure Grabnar 5cb900370a Change/fix asset locking mechanism
Close SCI-3870
2019-09-25 11:07:53 +02:00
Oleksii Kriuchykhin aabeeec95a Move file preview generation to delayed job [SCI-3891] 2019-09-23 21:07:03 +02:00