Commit graph

3099 commits

Author SHA1 Message Date
ajugo 9a55889264
Merge pull request #5919 from okriuchykhin/ok_SCI_8974
Fix file URL generation on shared task page [SCI-8974]
2023-08-07 08:56:05 +02:00
Oleksii Kriuchykhin c61a075818 Fix file URL generation on shared task page [SCI-8974] 2023-08-04 15:09:59 +02:00
Alex Kriuchykhin b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
Soufiane f856ddf78c
Assigned items in task datatable will not load if stock management is enabled [SCI-8944] (#5904)
* Fix assigned items datatable in shareable link with stock management [SCI-8944]

* Avoid skipping auth token verification for assets download [SCI-8944]
2023-08-04 11:21:43 +02:00
Oleksii Kriuchykhin b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
wandji20 a0372d14bf Improve base controller timestamp filter method [SCI-8738] 2023-08-01 18:59:58 +01:00
ajugo fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878)
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
2023-08-01 16:46:41 +02:00
wandji20 07411fbc25 Refactor base controller timestamp filter method [SCI-8738] 2023-08-01 13:25:17 +01:00
Soufiane 3f3064ba19
Fix Auth issues task public view [SCI-8936] (#5890) 2023-08-01 14:23:48 +02:00
Soufiane 8d6c417936
Extract date formatting from user browser in shareable links views [SCI-8778] (#5889) 2023-08-01 10:38:00 +02:00
wandji20 1e64a246fe Rename filter_timestamps_range to timestamp_filters [SCI-8738] 2023-07-31 11:21:40 +01:00
wandji20 8e96c2427a Add options to filter records by created_at or updated_at timestamps [SCI-8738] 2023-07-27 01:31:57 +01:00
Martin Artnik 3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Soufiane 4858f41b3e
Remove user_team related tests [SCI-8815] (#5860) 2023-07-25 14:35:17 +02:00
Alex Kriuchykhin 026e96652b
Fix team name escaping in inventories export modal [SCI-8922] (#5859) 2023-07-25 13:37:45 +02:00
Ivan Kljun 685ec1dddd Clear flash messages at redirect from root path 2023-07-25 11:10:45 +02:00
Oleksii Kriuchykhin de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
artoscinote c3d9488e9f
Fix canvas tag issues [SCI-8917] (#5849) 2023-07-24 17:05:48 +02:00
Alex Kriuchykhin 2489084566
Fix handling of responses in WOPI controller [SCI-8856] (#5838) 2023-07-21 13:25:36 +02:00
artoscinote 7d62a805a3
Upgrade roo to work with Ruby 3, fix rendering of import modal [SCI-8903] (#5836) 2023-07-21 12:48:32 +02:00
aignatov-bio 160bc270b6
Merge pull request #5834 from aignatov-bio/ai-sci-8912-fix-characters-escaping
Fix escape issues [SCI-8912]
2023-07-21 11:53:27 +02:00
Alex Kriuchykhin 7cb8feefb9
Fix permission checking in WOPI controller [SCI-8856] (#5833) 2023-07-21 11:53:10 +02:00
Anton 5394fee3db Fix escape issues [SCI-8912] 2023-07-21 11:48:19 +02:00
aignatov-bio cca978dc5a
Merge pull request #5824 from aignatov-bio/ai-sci-8890-fix-navigator-render-for-active-folders
Fix navigator render for active folder with archived elements [SCI-8890]
2023-07-21 10:36:35 +02:00
Alex Kriuchykhin 8aa06bf4af
Fix generation of docx report, fix rendering of modals [SCI-8911] (#5831) 2023-07-20 16:46:16 +02:00
Alex Kriuchykhin 31880521ef
Fix displaying of file previews, refactor file analyzer [SCI-8892] (#5818) 2023-07-20 12:59:45 +02:00
ajugo c4d6fc55af
Fix marvinjs file preview in RTF [SCI-8904] (#5819) 2023-07-20 11:26:58 +02:00
Soufiane c12023f8aa
Remove user_team model and related code [SCI-8815] (#5815) 2023-07-20 10:57:29 +02:00
artoscinote b0f45713cf
Merge pull request #5826 from G-Chubinidze/gc_SCI_8820
Error at inviting user to SciNote [SCI-8820]
2023-07-20 10:47:19 +02:00
Giga Chubinidze 4645489527 fixed teams for dropdown 2023-07-20 12:46:31 +04:00
Anton 0c5d9eb23b Fix navigator render for active folder with archived elements [SCI-8890] 2023-07-20 10:18:05 +02:00
Andrej 37d8ac6cd6 Fix shareable links after develop merge 2023-07-20 09:39:17 +02:00
Anton b0b8427f53 Fix edit file result [SCI-8902] 2023-07-19 14:56:29 +02:00
Andrej f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik 5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
aignatov-bio 4b2f520779
Merge pull request #5788 from aignatov-bio/ai-sci-8870-fixed-rtf-preview-for-new-files
Fix rtf preview for new images [SCI-8870]
2023-07-19 09:57:56 +02:00
Anton 36ffe3a444 Fix asset result edit mode [SCI-8891] 2023-07-19 09:42:00 +02:00
Giga Chubinidze 6bfbb83df5 Error at inviting user to SciNote 2023-07-19 11:07:17 +04:00
aignatov-bio bab8e2c330
Merge pull request #5796 from aignatov-bio/ai-sci-8883-fix-snapshot-table-render
Fix snapshot table render [SCI-8883]
2023-07-18 14:16:13 +02:00
wandji 7dcc774414
Refactor html partial rendering in json responses [SCI-8811] (#5763)
* Remove redundant use of respond_to in controlller actions with just one responder format [SCI-8811]

* Remove redundant begin block and replace 303 status code with :see_other [SCI-8811]
2023-07-18 13:36:41 +02:00
Anton f710691709 Fix snapshot table render [SCI-8883] 2023-07-18 11:43:55 +02:00
Anton d37f335f17 Fix rtf preview for new images [SCI-8870] 2023-07-18 11:08:39 +02:00
artoscinote e79c73f8c4
Merge pull request #5777 from wandji20/wb-SCI-8851
Fix issue archiving task result tables and when downloading archived result table
2023-07-18 08:18:11 +02:00
Soufiane 5736c444f6
Remove not used code for global activities [SCI-4851] (#5773)
* Fix broken task/activity [SCI-4851]

* Remove unused code for global activities [SCI-4851]
2023-07-17 15:36:22 +02:00
wandji 063c1209ba
Fix issue when viewing task repository snapshot [SCI-8871] (#5785) 2023-07-17 13:15:04 +02:00
Anton bd1e81f894 Fix preview generation [SCI-8855] 2023-07-17 13:05:33 +02:00
wandji20 3ee5049654 Fix issue archiving task result tables and when downloading archived tables [SCI-8851] 2023-07-15 11:33:44 +01:00
wandji ebe1bd583f
Fix issue json response for creating result table [SCI-8853] (#5768)
* Fix issue json resposnse for creating result table [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix issues when editing and updating results text/table for task [SCI-8853]

* Fix linter errors [SCI-8853]
2023-07-14 12:30:36 +02:00
Oleksii Kriuchykhin a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00