Commit graph

3135 commits

Author SHA1 Message Date
Martin Artnik
23a8872e11 Add some basic result component layout [SCI-8959] 2023-08-17 16:32:42 +02:00
Anton
ea299919e3 Fix results api [SCI-9012] 2023-08-16 11:45:37 +02:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Anton
f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Martin Artnik
16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
ajugo
5157f86b56
Merge pull request #5952 from ivanscinote/SCI-9025-show-label-preview
Allow zpl_preview Access Regardless of Label Template ENV Status [SCI-9025]
2023-08-10 09:54:08 +02:00
Ivan Kljun
0b4afdd9ad Enable showing Label preview even if Label template is disabled [SCI-9025] 2023-08-09 17:01:30 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
wandji20
02115cf967 Wrap timestamp filter params in the filter attribute [SCI-8738-updated] 2023-08-09 08:25:01 +01:00
Anton
758b28261d Merge branch 'develop' into features/september-release 2023-08-07 16:30:28 +02:00
Martin Artnik
11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Martin Artnik
633abf69c0 Basic results toolbar implementation [SCI-8952] 2023-08-07 16:09:15 +02:00
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
wandji
8546d451d3 Add result_orderable_elements_controller and update activities [SCI-8882] (#5880) 2023-08-07 16:08:06 +02:00
Anton
5aa01716ef Fix bundling for deleted files 2023-08-07 15:42:13 +02:00
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Alex Kriuchykhin
dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing
Merge features/protocol-parsing to develop
2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
aignatov-bio
be4bd7f038
Merge pull request #5922 from scinote-eln/features/remove-front-end-gems
Features/remove front end gems
2023-08-07 11:31:12 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
ajugo
6f76e86171
Implement results tab for shareable task link [SCI-8753] (#5910)
* Implement results tab for shareable task link [SCI-8753]
2023-08-07 10:45:52 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
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
Alex Kriuchykhin
a943ea2dd7
Merge pull request #5888 from wandji20/wb-SCI-8907
Create step orderable element for step_text when creating a step via the API [SCI-8907]
2023-08-03 14:19:05 +02:00
wandji20
90b3f8943a Improve api step controller create action [SCI-8907] 2023-08-03 04:08:26 +01:00
Oleksii Kriuchykhin
b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
wandji
31f8bc19d5
Add unique database index to checklist items position (#5886)
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
2023-08-02 15:37:01 +02:00
wandji20
88b7befbcd Create step orderable element for step_text when creating a step via the API [SCI-8907] 2023-08-01 19:55:36 +01: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
aignatov-bio
67a8729b41
Merge pull request #5847 from aignatov-bio/ai-sci-8880-clean-up-step-elements
Prepare step components for results refactor [SCI-8880]
2023-07-24 14:17:55 +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