Commit graph

86 commits

Author SHA1 Message Date
Anton d37f335f17 Fix rtf preview for new images [SCI-8870] 2023-07-18 11:08:39 +02:00
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane 78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Alex Kriuchykhin b852cf92fe
Fix displaying of tinyMCE images in search results [SCI-8823] (#5751) 2023-07-11 14:47:15 +02:00
Oleksii Kriuchykhin e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
artoscinote 4fe0ad026d
Change the way ConnectedDevice logging is added to TokensController [SCI-8287] (#5634) 2023-06-20 12:50:36 +02:00
Alex Kriuchykhin 3869475e3d
Fix links to archived items in breadcrumbs [SCI-8562] (#5538) 2023-06-01 14:28:47 +02:00
Alex Kriuchykhin d4fb499a17
Fix task archiving permissions, archived labels in breadcrumbs [SCI-8586] (#5535) 2023-06-01 11:31:54 +02:00
Giga Chubinidze 1039d784d3 fixed archive projects breadcrumb link url 2023-05-28 03:46:04 +04:00
Giga Chubinidze b20912c52e removed unnecessary code 2023-05-24 02:54:05 +04:00
Giga Chubinidze e553909755 moved logic to controllers & concern 2023-05-24 02:52:26 +04:00
Anton e8b952f4fd Revert "Revert "Improve breadcrumbs implementation [SCI-8087]""
This reverts commit 78d41d10a6.
2023-04-19 10:53:39 +02:00
artoscinote 88cc8e3df4
Amend token revocation check method name [SCI-7631] 2023-02-07 11:05:48 +01:00
Martin Artnik 8345f4ac5d Throw error when authenticating with revoked tokens [SCI-7631] 2023-01-24 15:57:59 +01:00
ajugo 67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
aignatov-bio 6af72a28ee
Merge pull request #4715 from aignatov-bio/ai-sci-7559-add-step-text-notification
Add new step text notification [SCI-7559]
2023-01-04 10:06:57 +01:00
Anton 8e1e95b219 Add new step text notification [SCI-7559] 2022-12-13 14:47:53 +01:00
Oleksii Kriuchykhin 3b474fc9f0 Improve activity records creation in controllers [SCI-7505] 2022-11-24 15:19:17 +01:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
artoscinote dd27fadd98
Add step reordering and step element reordering service endpoints to API [SCI-6891][SCI-6892] (#4179)
* Add step reordering service endpoint to API [SCI-6891]

* Generalize reorder validation [SCI-6891]

* Add endpoint for reordering step elements, fix issues [SCI-6892]

* Add appropriate serializers [SCI-6891][SCI-6892]

* Add step elements to step serializer [SCI-6891]

* Simplify routes, add locking [SCI-6891]
2022-07-12 10:13:47 +02:00
Anton 24d68da455 Fix tinymce assets for steps [SCI-6809] 2022-05-11 13:01:23 +02:00
Martin Artnik 5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +02:00
Martin Artnik 56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +02:00
Martin Artnik 861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
artoscinote f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration
Features/bioeddie integration
2021-08-03 13:32:53 +02:00
aignatov-bio 53456988ba
Add bioEddie activities and user licenses [SCI-5845][SCI-5842] (#3411)
* Add bio eddie licens to users [SCI-5845]

* Add activities for BioEddie [SCI-5842]
2021-07-19 21:33:28 +02:00
Oleksii Kriuchykhin bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin f13f3691b1 Fix blob permissions check to support multiple attachments [SCI-5613] 2021-04-14 16:07:01 +02:00
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
Oleksii Kriuchykhin d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +01:00
Oleksii Kriuchykhin 7d89088b14 Multiple small bugfixes [SCI-5494] 2021-02-18 13:55:03 +01:00
aignatov-bio fcdad51222 Fix assets sorting in report 2020-11-17 15:33:25 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2
Release/1.20.2
2020-10-28 13:58:25 +01:00
Alex Kriuchykhin 8ef5bafc1a
Revert "Init user session for devise controllers after token auth [SCI-5123]" 2020-10-27 13:20:14 +01:00
Oleksii Kriuchykhin 00a2f5f41b Init user session for devise controllers after token auth [SCI-5123] 2020-10-26 16:35:49 +01:00
Oleksii Kriuchykhin 5f70984919 Add token authentication to Active Storage controllers [SCI-5123] 2020-10-23 19:22:31 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
Oleksii Kriuchykhin 2e2e6be31c Fix file view permission check in inventories [SCI-4440] 2020-03-12 11:52:46 +01: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 f3a6c18a84 Improve permission checking for reports [SCI-3991] 2019-10-14 14:50:05 +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
Oleksii Kriuchykhin c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +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 b4f632dba8 Remove dowload endpoint from assets controller [SCI-3680] 2019-08-07 15:21:41 +02:00
Oleksii Kriuchykhin d942788581 Implement read permissions checks for ActiveStorage controllers [SCI-3680] 2019-08-07 15:21:41 +02:00
Luka Murn 83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Anton Ignatov a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +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