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 |
|
Anton Ignatov
|
646107a35b
|
Fix error on task copy
|
2019-09-23 16:33:57 +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 |
|
Anton Ignatov
|
69eb8681bd
|
Error handling, when image unavaliable for base64
|
2019-09-18 15:11:51 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Oleksii Kriuchykhin
|
c068901b00
|
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-12 17:24:08 +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 |
|
Alex Kriuchykhin
|
59a85d8181
|
Merge pull request #2004 from okriuchykhin/ok_SCI_3778
Fix new office file creation [SCI-3778]
|
2019-09-04 15:40:34 +02:00 |
|
Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +02:00 |
|
Miha Mencin
|
9e9e698778
|
SCI-3806 Add an icon indicating shared status to dropdown
|
2019-08-26 09:14:37 +02:00 |
|
aignatov-bio
|
0810699770
|
Update shared inventory permissions [SCI-3802] (#2009)
* Update shared inventory permissions
* Fix tests and simplify condition for placeholder
|
2019-08-23 10:57:02 +02:00 |
|
Oleksii Kriuchykhin
|
3918c893db
|
Fix new office file creation [SCI-3778]
|
2019-08-21 13:26:11 +02:00 |
|
aignatov-bio
|
f94b8165dc
|
Fix marvinjs edit button and icon (#1985)
|
2019-08-21 11:15:57 +02:00 |
|
Mojca Lorber
|
530d09df64
|
add i-shared inventory icon
|
2019-08-19 15:43:55 +02:00 |
|
aignatov-bio
|
d741e52427
|
Fix global search for inventories (#1988)
|
2019-08-19 09:23:59 +02:00 |
|
Urban Rotnik
|
89f289660b
|
Add share_with_all feature to service, add new activities
|
2019-08-14 11:03:15 +02:00 |
|
Urban Rotnik
|
0ce331227c
|
Update permission and model to share repository over all teams
|
2019-08-13 14:07:24 +02:00 |
|
aignatov-bio
|
737f9e572c
|
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976)
* Replace marvinJS logo and fix some merge issues
* Fix tests
|
2019-08-13 11:04:19 +02:00 |
|
Urban Rotnik
|
dc4751e49a
|
Update scope 'accessible_by_teams' and fix load_vars method in controllers
|
2019-08-12 10:55:30 +02:00 |
|
Oleksii Kriuchykhin
|
32054c5516
|
Handle situation for assets without blob in list sorting [SCI-3757]
|
2019-08-09 15:17:19 +02:00 |
|
Oleksii Kriuchykhin
|
c352a73d79
|
ActiveStorage fixies after latest master merge [SCI-3757]
|
2019-08-09 14:56:00 +02:00 |
|
Urban Rotnik
|
786716974b
|
Add validation for team on TeamRepository
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
32783576c1
|
Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
|
2019-08-09 14:15:50 +02:00 |
|
Mojca Lorber
|
0e5afa6048
|
Small refactor
|
2019-08-09 14:13:02 +02:00 |
|
Mojca Lorber
|
7d4941015f
|
Update global search, so it will be able to search through shared inventories
|
2019-08-09 14:13:01 +02:00 |
|
Mojca Lorber
|
7e9be932f3
|
Make scope for repositories accessible by teams and simplify read permission
|
2019-08-09 14:13:00 +02:00 |
|
Mojca Lorber
|
cac7dab440
|
Show shared inventories in left navigation and fix read repository permission
|
2019-08-09 14:13:00 +02:00 |
|
Urban Rotnik
|
1a77702fa7
|
Add uniq index for Repository and Team in TeamRepositories
|
2019-08-09 14:13:00 +02:00 |
|
Urban Rotnik
|
077369d960
|
Update permissions for Repositories
|
2019-08-09 14:12:59 +02:00 |
|
Urban Rotnik
|
f569411bc7
|
Add TeamRepository model
|
2019-08-09 14:12:59 +02:00 |
|
aignatov-bio
|
6e5f078dea
|
Add activities for marvinJS [SCI-3630] (#1950)
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
|
2019-08-09 09:47:07 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Anton Ignatov
|
e2e876b2a3
|
Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests
|
2019-08-05 13:51:04 +02:00 |
|
aignatov-bio
|
f0b7771e19
|
Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export
Fix protocol copy, add metadata to assets [SCI-3629]
|
2019-08-05 12:55:16 +02:00 |
|
Anton Ignatov
|
feadd940f7
|
Fix duplicate for TinyMCE model
|
2019-08-05 11:33:49 +02:00 |
|
Anton Ignatov
|
24da016465
|
Reuse duplicate file method
|
2019-08-05 11:30:36 +02:00 |
|
Oleksii Kriuchykhin
|
a2fe4bee94
|
Add text extraction from MarvinJS for search [SCI-3643]
|
2019-08-02 15:17:28 +02:00 |
|
Anton Ignatov
|
7e379d4e0d
|
Fix download file
|
2019-07-29 10:24:31 +02:00 |
|
Anton Ignatov
|
f35f4886a3
|
Fix markup
|
2019-07-29 10:18:34 +02:00 |
|
Anton Ignatov
|
a4b2825258
|
Fix tests for active storage
|
2019-07-26 15:58:51 +02:00 |
|
Anton Ignatov
|
618f0cc334
|
Fix tests for services
|
2019-07-26 14:16:44 +02:00 |
|
Anton Ignatov
|
84fe10df47
|
Fix tests for models and tema import/export
|
2019-07-26 12:40:36 +02:00 |
|
Anton Ignatov
|
3b7f715e0b
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-22 13:09:17 +02:00 |
|
Anton Ignatov
|
b762ae6a90
|
Copy protocol assets through tempfile
|
2019-07-19 15:23:34 +02:00 |
|
aignatov-bio
|
4fe0227d8c
|
Add metadata for .eln assets (#1942)
|
2019-07-19 10:53:33 +02:00 |
|
aignatov-bio
|
2fae7d8208
|
Fix issue in report (#1941)
|
2019-07-19 10:37:44 +02:00 |
|
Anton Ignatov
|
b5a35f583a
|
Fix protocol copy, add metadata to assets
|
2019-07-18 15:39:08 +02:00 |
|
Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
Anton Ignatov
|
3339c1fbbf
|
Add MarvinJS to Result and TinyMce MarvinJS refactor
|
2019-07-15 17:17:14 +02:00 |
|
Anton Ignatov
|
ba1d6d45ca
|
Fix merging issues
|
2019-07-12 15:47:15 +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 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
Miha Mencin
|
ab9b7a7429
|
Merge pull request #1902 from biosistemika/release-1.16.6
Merge 'release-1.16.6' into 'master'
|
2019-07-08 12:49:40 +02:00 |
|
Alex Kriuchykhin
|
82708f0124
|
Merge pull request #1891 from okriuchykhin/ok_SCI_3654
Fix project page view saving [SCI-3654]
|
2019-07-08 11:46:54 +02:00 |
|
Oleksii Kriuchykhin
|
9d926dc956
|
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
|
2019-07-05 16:56:05 +02:00 |
|
aignatov-bio
|
88dc2dcdd0
|
Hot fix for TinyMCE asset permission check (#1896)
* Hot fix for TimyMCE asset permission check
|
2019-07-04 15:59:11 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
Jure Grabnar
|
20134c9f8a
|
Features/protocolsio integration (#1893)
Features/protocolsio integration
|
2019-07-03 17:32:20 +02:00 |
|
aignatov-bio
|
d147e8260d
|
Fix issue with moving protocol in repository (#1887)
|
2019-07-03 15:35:37 +02:00 |
|
Oleksii Kriuchykhin
|
e16cb513e1
|
Fix project page view saving [SCI-3654]
|
2019-07-03 15:34:16 +02:00 |
|
Oleksii Kriuchykhin
|
4ea6b56582
|
Fix Step and Result file previews [SCI-3539]
|
2019-07-01 23:30:20 +02:00 |
|
Anton Ignatov
|
1f40fa69fc
|
Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-07-01 11:51:27 +02:00 |
|
aignatov-bio
|
a08d93376c
|
Add promo modal when MarvinJS disabled (#1872)
|
2019-07-01 11:51:13 +02:00 |
|
Anton Ignatov
|
c9ae9f056e
|
Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration
|
2019-07-01 10:44:29 +02:00 |
|
aignatov-bio
|
2793777463
|
Features/docx report (#1873)
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
|
2019-07-01 10:14:16 +02:00 |
|
Anton Ignatov
|
390002f40f
|
Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539
|
2019-07-01 10:12:26 +02:00 |
|
Oleksii Kriuchykhin
|
5acb16d43e
|
Update Asset helper methods [SCI-3539]
|
2019-06-28 08:17:09 +02:00 |
|
Oleksii Kriuchykhin
|
ba2daede0b
|
Add migration scripts [SCI-3539]
|
2019-06-24 15:17:42 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +02:00 |
|
Alex Kriuchykhin
|
db7c6435b3
|
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-20 11:31:15 +02:00 |
|
Oleksii Kriuchykhin
|
f2b617ac12
|
Fix code formatting [SCI-3436]
|
2019-06-19 14:23:12 +02:00 |
|
Oleksii Kriuchykhin
|
ae1a63037b
|
Raise an exception if required methods for ViewableModel are not implemented [SCI-3436]
|
2019-06-19 14:17:17 +02:00 |
|
aignatov-bio
|
9653f16196
|
Convert image to base64 in PDF reports [SCI-3557] (#1835)
* Convert image to base64 in PDF reports
* Fix typo error
|
2019-06-19 13:57:04 +02:00 |
|
Urban Rotnik
|
807104035c
|
Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated
|
2019-06-17 12:24:09 +02:00 |
|
aignatov-bio
|
68937dd192
|
Fix RTE import for protocol repository (#1833)
|
2019-06-14 16:20:27 +02:00 |
|
aignatov-bio
|
7a3eedf461
|
Adding missing avatars to comments (#1838)
|
2019-06-14 16:20:13 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
Oleksii Kriuchykhin
|
097639e71e
|
Fix view state validation [SCI-3436]
|
2019-06-13 14:28:46 +02:00 |
|
Alex Kriuchykhin
|
599274eb13
|
Merge pull request #1830 from okriuchykhin/ok_SCI_3528
Make repositories more extendable [SCI-3528]
|
2019-06-13 09:45:18 +02:00 |
|
Oleksii Kriuchykhin
|
6e1a7a3392
|
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-11 10:08:33 +02:00 |
|
Jure Grabnar
|
bbfe2b9c89
|
Merge pull request #1798 from biosistemika/jg_sci_3145_thumbnail_preview
File preview on new attachments layout [SCI-3145]
|
2019-06-10 17:59:12 +02:00 |
|
Jure Grabnar
|
56949db9da
|
Move extract_image_quality to before_post_process
|
2019-06-10 17:48:00 +02:00 |
|
Jure Grabnar
|
c2d615ab48
|
Remove image quality preprocessor
|
2019-06-10 15:10:07 +02:00 |
|
Urban Rotnik
|
bbe0062bfd
|
Small fixes for factories
|
2019-06-10 12:24:05 +02:00 |
|
Urban Rotnik
|
965b7eb58b
|
Add missing factories
|
2019-06-10 12:24:04 +02:00 |
|
Urban Rotnik
|
f19eeba8dc
|
Add factory valid check for User's associations
|
2019-06-10 12:24:04 +02:00 |
|
Urban Rotnik
|
ba340f7bee
|
Add valid factory check for Table, Tag, Team
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
9348886fb1
|
Minior changes in SystemNotifications tests
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
15cbd8864c
|
Add valid factory check to Steps models
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
1e60102a7d
|
Add valid factory check for Sample(s) models
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
c66aa29227
|
Add valid factory check for Result(s) models
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
3adf2bb736
|
Add factories and validation tests for repositories and related models
Repositories, cells, columns, values (date, text, asset, list), rows, items
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
a7558d83be
|
Add valid factory check for Project, MyModules, notification, protocol
|
2019-06-10 12:24:01 +02:00 |
|
Urban Rotnik
|
3348b81b14
|
Checklist, checklist_item, activity, experiment spec and factories updated
|
2019-06-10 12:24:01 +02:00 |
|
Urban Rotnik
|
6321c0f5c0
|
Assets spec and factories updated
|
2019-06-10 12:24:01 +02:00 |
|
Oleksii Kriuchykhin
|
8920d38a02
|
Make repositories more extendable [SCI-3528]
|
2019-06-06 17:28:59 +02:00 |
|
Oleksii Kriuchykhin
|
e543a849d4
|
Add document file preview generation with LibreOffice [SCI-3145]
|
2019-06-05 14:52:30 +02:00 |
|
Anton Ignatov
|
c9a29b12ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-31 10:27:14 +02:00 |
|
aignatov-bio
|
0b3b6d593b
|
Small style fixes [SCI-3498] (#1799)
* Adding error, if TinyMCE asset not in text, when we copy anything
* Small style fixes
|
2019-05-27 16:27:27 +02:00 |
|
Luka Murn
|
d7fe23c6ce
|
Merge pull request #1796 from Ducz0r/lm-sci-3494
Fix the user.activities association so it works [SCI-3494]
|
2019-05-24 14:21:42 +02:00 |
|
Luka Murn
|
3a2bf2ce8a
|
Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup
Add a startup check for WOPI_ENABLED == true variables
|
2019-05-22 16:56:55 +02:00 |
|
aignatov-bio
|
0f86ebf173
|
Adding error, if TinyMCE asset not in text, when we copy anything [SCI-3495] (#1797)
* Adding error, if TinyMCE asset not in text, when we copy anything
|
2019-05-22 16:13:40 +02:00 |
|
Luka Murn
|
8b116d9de7
|
Fix the user.activities association so it works
Closes SCI-3494.
|
2019-05-22 15:42:50 +02:00 |
|
Oleksii Kriuchykhin
|
d3f29d5d72
|
Add type column to zip_exports for STI [SCI-3368]
|
2019-05-20 16:35:24 +02:00 |
|
aignatov-bio
|
b22dba7f05
|
Add delay job for handling unknown tinyMCE images (#1781)
* Add delay job for handling unknown tinyMCE images
|
2019-05-20 12:44:16 +02:00 |
|
Luka Murn
|
4136aa0575
|
Add a startup check for WOPI_ENABLED == true variables
|
2019-05-18 10:22:53 +02:00 |
|
Luka Murn
|
8aa702a4bf
|
Fix bug with external TinyMCE assets
|
2019-05-16 13:33:04 +02:00 |
|
Anton Ignatov
|
259b75a6ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-16 09:28:48 +02:00 |
|
aignatov-bio
|
980d86824f
|
Fix updating process for old tinyMCE tags (#1772)
* Fix update old tinyMCE for deleted objects
* Add error handling
|
2019-05-15 16:11:48 +02:00 |
|
aignatov-bio
|
f1f04adeb2
|
Fix placeholder in protocol description [SCI-3454] (#1769)
* Fix placeholder in protocol description
* Change task tags text
|
2019-05-15 14:13:13 +02:00 |
|
Miha Mencin
|
13d126bc39
|
Merge pull request #1761 from mlorb/ml-sci-3456
Fix broken global activities team filter [SCI-3456]
|
2019-05-14 16:36:44 +02:00 |
|
aignatov-bio
|
1555daa0c6
|
Fix non associated tinyMCE images (#1762)
* Fix non assosiated tinyMCE images
|
2019-05-14 15:01:57 +02:00 |
|
Mojca Lorber
|
54f735551c
|
Fix broken global activities team filter
|
2019-05-14 13:50:10 +02:00 |
|
Oleksii Kriuchykhin
|
65fb4b1372
|
Fix processing_image_url for S3 storage [SCI-3381]
|
2019-05-14 12:53:35 +02:00 |
|
Luka Murn
|
bd9ffe4bd2
|
Refactor WOPI filename length validation onto the model
|
2019-05-13 15:41:39 +02:00 |
|
Anton Ignatov
|
652fba0e23
|
Merge branch 'master-with-note-section'
|
2019-05-13 11:08:11 +02:00 |
|
aignatov-bio
|
d3aa6371cd
|
Fix report saving [SCI-3443] (#1753)
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
|
2019-05-13 10:55:08 +02:00 |
|
aignatov-bio
|
da5b24ef57
|
Fix attachment appearence after update (#1745)
|
2019-05-13 10:54:16 +02:00 |
|
aignatov-bio
|
0b194eb3b1
|
Revert "Fix report saving (#1748)" (#1752)
This reverts commit 3db6129808.
|
2019-05-13 09:09:36 +02:00 |
|
aignatov-bio
|
3db6129808
|
Fix report saving (#1748)
|
2019-05-13 08:58:47 +02:00 |
|
Anton Ignatov
|
e5b4adcc25
|
Merge branch 'master-with-note-section' into features/marvinjs-integration
|
2019-05-11 20:51:01 +02:00 |
|
aignatov-bio
|
bbf54de9c7
|
Merge pull request #1736 from aignatov-bio/ai-sci-3423-add-old-tinymce-support
Add old tinymce image support [SCI-3423]
|
2019-05-10 15:27:42 +02:00 |
|
Alex Kriuchykhin
|
2a7f70929a
|
Merge pull request #1717 from okriuchykhin/ok_SCI_3368
Improve clean up of Export All files [SCI-3368]
|
2019-05-09 13:37:56 +02:00 |
|
Oleksii Kriuchykhin
|
40550f92c9
|
Improve HTML data escaping in JSON endpoints [SCI-3403]
|
2019-05-08 17:38:24 +02:00 |
|
Anton Ignatov
|
995408e7fc
|
Fix protocol update error, rollback bootstrap gems and fix step name
|
2019-05-08 17:18:19 +02:00 |
|
Anton Ignatov
|
bee87f51ba
|
Fix tests
|
2019-05-08 15:22:06 +02:00 |
|
Anton Ignatov
|
b5271bdd2c
|
Add remote api support
|
2019-05-08 15:00:36 +02:00 |
|
Anton Ignatov
|
5a5101410c
|
Fix markup
|
2019-05-08 14:35:28 +02:00 |
|
Anton Ignatov
|
b2063d3018
|
Fix markup
|
2019-05-08 14:30:33 +02:00 |
|
Anton Ignatov
|
f201c5440b
|
Add check for old tinymce for report and reassign process
|
2019-05-08 14:29:25 +02:00 |
|
Anton Ignatov
|
5d959f648e
|
Convert old tinymce assets to new on fly
|
2019-05-08 14:23:26 +02:00 |
|
Anton Ignatov
|
dcf94e78e1
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-08 14:03:41 +02:00 |
|
Urban Rotnik
|
62bc0520e9
|
Update method last_sync_timestamp from Last to First user
|
2019-05-08 08:38:11 +02:00 |
|
Urban Rotnik
|
2364c2653f
|
Add bulk insert for UserSystemNotifications, New service for sending emails
|
2019-05-08 08:38:10 +02:00 |
|
Urban Rotnik
|
357c6e6b98
|
Change ordering by created_at instead by last_time_changed_at
|
2019-05-08 08:37:34 +02:00 |
|
Oleksii Kriuchykhin
|
8461949bed
|
Fix deletion of inconfirmed users [SCI-3351]
|
2019-05-07 16:02:45 +02:00 |
|
Anton Ignatov
|
7f296b35fa
|
Update team exporter for new tinymce images
|
2019-05-07 13:22:55 +02:00 |
|
Jure Grabnar
|
c866d96ea7
|
Merge pull request #1720 from jbargu/jg_sci_3375
One project is duplicated in project list [SCI-3375]
|
2019-05-06 11:43:24 +02:00 |
|
Anton Ignatov
|
565a4959b4
|
small fixes and improvments
|
2019-05-03 15:24:28 +02:00 |
|
Anton Ignatov
|
88e67a16c2
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-02 16:16:03 +02:00 |
|
Anton Ignatov
|
fef691d30f
|
Add error handling and secutiry checks
|
2019-05-02 16:12:25 +02:00 |
|
Anton Ignatov
|
4d0d5aa014
|
Adding team sketches selector
|
2019-04-30 17:32:55 +02:00 |
|
Jure Grabnar
|
de6509cc97
|
Add distinct to #visible_to in project.rb
Closes SCI-3375
|
2019-04-30 16:40:12 +02:00 |
|
Anton Ignatov
|
7c55fcf0cf
|
Merge branch 'master' into master-with-note-section
|
2019-04-30 12:07:59 +02:00 |
|
Oleksii Kriuchykhin
|
1b792e2b7e
|
Improve clean up of Export All files [SCI-3368]
|
2019-04-30 00:43:34 +02:00 |
|
Mojca Lorber
|
5fd4c47388
|
Move change owner functionality to RepositoryRow
|
2019-04-29 14:02:02 +02:00 |
|
Anton Ignatov
|
f80d881847
|
Fix markup
|
2019-04-28 19:11:41 +02:00 |
|
Anton Ignatov
|
2847ec7609
|
Add env variable and check for MarvinJS available
|
2019-04-28 17:08:18 +02:00 |
|
Anton Ignatov
|
260810fff8
|
Add editing mode for tinymce images
|
2019-04-28 16:16:31 +02:00 |
|
Anton Ignatov
|
193edfbc35
|
Add marvin js support to TinyMCE
|
2019-04-27 22:54:59 +02:00 |
|
Anton Ignatov
|
fe620c4a63
|
Add marvin model and controller
|
2019-04-26 22:59:38 +02:00 |
|
Mojca Lorber
|
eac90109f7
|
Change ownership of inventory items, when a user leaves a team
|
2019-04-26 10:47:08 +02:00 |
|
Alex Kriuchykhin
|
6bb19ed0be
|
Merge pull request #1697 from okriuchykhin/ok_SCI_3264
Update limits for new rich text enabled fileds [SCI-3264]
|
2019-04-25 23:54:05 +02:00 |
|
Oleksii Kriuchykhin
|
a3f5974dbd
|
Update limits for new rich text enabled fileds [SCI-3264]
|
2019-04-24 13:37:22 +02:00 |
|
aignatov-bio
|
84993ea3ef
|
Update protocol repository for new description format [SCI-3371] (#1689)
* Update protocol repository for new description format
* move image clone method to concerns
|
2019-04-24 13:34:56 +02:00 |
|
Oleksii Kriuchykhin
|
7c91b4a255
|
Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266
|
2019-04-23 17:01:13 +02:00 |
|
Oleksii Kriuchykhin
|
c7a707f9db
|
Fix task clonning with TinyMCE images [SCI-3266]
|
2019-04-23 15:16:40 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
Jure Grabnar
|
1da1558849
|
Merge pull request #1683 from jbargu/jg_3179
Archived results are now separated in exported project
|
2019-04-19 18:26:22 +02:00 |
|
aignatov-bio
|
6b45dcd475
|
Update eln export for new tinyMCE image format (#1680)
|
2019-04-19 14:44:40 +02:00 |
|
Jure Grabnar
|
1295c0583a
|
Archived results are now separated in exported project
Closes SCI-3179
|
2019-04-17 16:37:21 +02:00 |
|
Oleksii Kriuchykhin
|
f9832013b0
|
Improve experiment preview image generation [SCI-3177]
|
2019-04-17 12:06:46 +02:00 |
|
Urban Rotnik
|
0ba0dccd57
|
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix
Fix for exports_left, fix for some edge cases [SCI-3345]
|
2019-04-16 10:32:31 +02:00 |
|
Urban Rotnik
|
22af36dd2d
|
Fix for exports_left, fix for some edge cases
|
2019-04-16 09:59:02 +02:00 |
|
aignatov-bio
|
8d7cc57da1
|
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654)
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
|
2019-04-15 09:49:44 +02:00 |
|
aignatov-bio
|
8ba0555922
|
Add check for tasks complete in project notifications (#1657)
|
2019-04-12 09:17:34 +02:00 |
|
Urban Rotnik
|
caccf8d9f0
|
Reset counter for export in last 24 hours
Fix for check if user has avaiable exports, bit refactored increas_counter method.
|
2019-04-10 10:56:33 +02:00 |
|
aignatov-bio
|
e2e299b424
|
Add dynamic generating filters for global activities [SCI-3228] (#1644)
* Add dynamic generating filters
* Add url methods
|
2019-04-09 09:08:27 +02:00 |
|
Jure Grabnar
|
bc9eff2ef5
|
Add asset validation on wopi creation
Missing file
|
2019-04-04 17:05:25 +02:00 |
|
Miha Mencin
|
97d9fde3fd
|
SCI-3286 add breadcrumbs to the report activity
|
2019-04-04 10:30:31 +02:00 |
|
Jure Grabnar
|
26848ecaef
|
Refactor step position + 1 into a method
|
2019-04-03 13:07:30 +02:00 |
|
Alex Kriuchykhin
|
bfd275c313
|
Merge pull request #1632 from okriuchykhin/ok_SCI_3281
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
|
2019-04-03 11:39:59 +02:00 |
|
aignatov-bio
|
e034a0c055
|
Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631)
* Fix bug with update protocol from repository and modal disable button
|
2019-04-03 09:18:18 +02:00 |
|
Oleksii Kriuchykhin
|
ffa7c5ecb2
|
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
|
2019-04-02 16:38:53 +02:00 |
|
Anton Ignatov
|
c9f9523210
|
Remove src when save description and rename token tag
|
2019-04-02 13:41:32 +02:00 |
|
aignatov-bio
|
e6102c72c7
|
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties
* Adding test for activities
|
2019-04-02 11:50:37 +02:00 |
|
aignatov-bio
|
e93b0c3109
|
Adding preload filters for global activities [SCI-3254] (#1619)
* Adding preload filter for global activities
* Adding link to task activities
|
2019-04-02 11:14:36 +02:00 |
|
Urban Rotnik
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +02:00 |
|
Alex Kriuchykhin
|
b3aa6be23d
|
Merge pull request #1621 from okriuchykhin/ok_SCI_3255
Add global activities to reports [SCI-3255]
|
2019-04-01 15:07:06 +02:00 |
|
Jure Grabnar
|
83130426e2
|
Merge pull request #1617 from jbargu/jg_3244
Duplicated activity, report activity ... [SCI-3244]
|
2019-04-01 14:31:53 +02:00 |
|
Jure Grabnar
|
111b0e2b7f
|
Merge pull request #1615 from jbargu/jg_sci_3252
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
|
2019-04-01 12:30:48 +02:00 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
Jure Grabnar
|
6533368763
|
Add activity for importing inv items
|
2019-03-29 15:41:34 +01:00 |
|
Jure Grabnar
|
f843092aac
|
Add activity for moving worklfows
Closes SCI-3252
|
2019-03-29 13:51:17 +01:00 |
|
Oleksii Kriuchykhin
|
7d4fbcb32e
|
Fix unconfirmed users clean-up issues [SCI-3172]
|
2019-03-29 11:11:53 +01:00 |
|
Alex Kriuchykhin
|
9137740266
|
Merge pull request #1607 from okriuchykhin/ok_SCI_3229
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
|
2019-03-28 17:32:24 +01:00 |
|
Oleksii Kriuchykhin
|
d7d45bec70
|
Fix links for archived objects in global activities [SCI-3229]
|
2019-03-28 13:43:50 +01:00 |
|
mlorb
|
5f663b3c74
|
Merge pull request #1600 from mlorb/ml-sci-3215
Implement missing tests for global activities [SCI-3215][SCI-3219]
|
2019-03-28 11:10:38 +01:00 |
|
Oleksii Kriuchykhin
|
37c559debd
|
Fix experiment workflow image display after touching [SCI-3177]
|
2019-03-27 17:02:59 +01:00 |
|
Mojca Lorber
|
f06358b2ae
|
Implement missing tests for global activities (task and protocol activities)
|
2019-03-27 11:24:44 +01:00 |
|
aignatov-bio
|
c2e1e85913
|
Adding localization for activity name and activity group (#1598)
|
2019-03-27 10:33:33 +01:00 |
|
Oleksii Kriuchykhin
|
dab75d5aec
|
Fix duplicated projects in new report modal [SCI-3173]
|
2019-03-26 17:24:30 +01:00 |
|
Alex Kriuchykhin
|
935e3a65cf
|
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
|
2019-03-26 16:02:44 +01:00 |
|
aignatov-bio
|
54fd3a748b
|
Adding activity groups [SCI-3203] (#1588)
* Adding activty groups
|
2019-03-26 15:29:21 +01:00 |
|
Oleksii Kriuchykhin
|
e3a3ec4491
|
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]
|
2019-03-25 17:38:13 +01:00 |
|
Miha Mencin
|
4a87216a3d
|
Merge branch 'master' into features/global-activities
|
2019-03-25 14:35:24 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
Anton Ignatov
|
5d6f009ee8
|
fix error for delay deleting
|
2019-03-20 15:20:31 +01:00 |
|
Anton Ignatov
|
55c93922ea
|
markup fixes
|
2019-03-20 14:46:54 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Mojca Lorber
|
4f9814b884
|
Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021
|
2019-03-20 11:03:00 +01:00 |
|
Mojca Lorber
|
42ff1c0a68
|
fix bug in revert protocol method
|
2019-03-20 09:43:38 +01:00 |
|
Mojca Lorber
|
cd7a87348f
|
Protocol activities refactoring, without tests
|
2019-03-19 16:12:07 +01:00 |
|
Mojca Lorber
|
c476816359
|
Task activities refactoring, without tests
|
2019-03-19 15:33:57 +01:00 |
|
Urban Rotnik
|
fe35c805b7
|
Add model breadcrumbs, update activities_helper
|
2019-03-19 14:01:06 +01:00 |
|
aignatov-bio
|
6eae12efab
|
Updating permission check for image editing [SCI - 3153, 3159] (#1568)
*Add permission check for assets editing
* Add check for image format
|
2019-03-19 13:52:57 +01:00 |
|
Oleksii Kriuchykhin
|
0c71493fdb
|
Add viewing permissions for global activities [SCI-2997]
|
2019-03-18 15:38:19 +01:00 |
|
Urban Rotnik
|
2ea2700837
|
fixup! Fix failing tests
|
2019-03-15 10:30:51 +01:00 |
|
Urban Rotnik
|
3f18166320
|
Add Task and TaskTags activities
|
2019-03-12 09:15:06 +01:00 |
|
Urban Rotnik
|
b33e95e18a
|
New Protocols actions logging
|
2019-03-12 09:14:53 +01:00 |
|
Urban Rotnik
|
3992336db9
|
Add type and value_for attributes to user hash
|
2019-03-11 08:37:22 +01:00 |
|
Urban Rotnik
|
b8e84b5685
|
Add logic for saving message items values and types
|
2019-03-11 08:37:22 +01:00 |
|