Commit graph

13751 commits

Author SHA1 Message Date
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
ajugo
949dd494d7
Merge pull request #5898 from sboursen-scinote/sb_SCI-8126
Issues with the "You've reached the end of the list" banner [SCI-8126]
2023-08-07 08:40:37 +02:00
ajugo
c82f296aeb
Merge pull request #5914 from sboursen-scinote/sb_SCI-8940
Fix various CSS issues [SCI-8940]
2023-08-07 08:39:06 +02:00
Martin Artnik
8aa11e93f7 Fix production SASS build errors 2023-08-04 17:41:32 +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
ajugo
40b4a972f4
Merge pull request #5915 from rekonder/aj_SCI_8979
Fix calculations in table for shareable task [SCI-8979]
2023-08-04 13:49:48 +02:00
ajugo
380a426524
Merge pull request #5916 from sboursen-scinote/sb_SCI-8975
Fix shareable links CSS [SCI-8975]
2023-08-04 13:49:32 +02:00
sboursen-scinote
40f78f4a28 Fix shareable links CSS [SCI-8975]
- Fix the style of the toggle button globally.
- Fix permissions on who can toggle team shareable links.
- Change wrong translations in shareable links modal.
- Remove placeholder text for start-date
2023-08-04 12:34:04 +02:00
Andrej
caf34320f8 Fix calculations in table for shareable task [SCI-8979] 2023-08-04 12:32:19 +02:00
ajugo
7a6886b895
Fix rendering of RTE images for shareable links [SCI-8970] (#5913) 2023-08-04 11:24:27 +02:00
Soufiane
f3bef4ae25
Fix Broken CSP on the shareable links page [SCI-8969] (#5911) 2023-08-04 11:22:33 +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
sboursen-scinote
c27c7245bc Fix various CSS issues [SCI-8940]
- Maintain the position of the top navigation controls when user is without team.
- Add "missing" avatar to avatar change modal
- Disable wrapping of (A) in archived P/E/T
- Fix padding/margin issues in Archived tasks and Protocol templates
2023-08-04 09:11:53 +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
Alex Kriuchykhin
e50d53c691
Merge pull request #5870 from wandji20/wb-SCI-8738
Add method to filter by timestamp range for mobile api endpoints
2023-08-03 09:45:56 +02:00
wandji20
90b3f8943a Improve api step controller create action [SCI-8907] 2023-08-03 04:08:26 +01:00
Alex Kriuchykhin
b264bfab68
Merge pull request #5906 from scinote-eln/features/shareable-links
Merge features/shareable_links to develop
2023-08-02 16:34:23 +02: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
ivanscinote
5a531c98ae
Add callback to clear form errors at create wopi files [SCI-8927] (#5877)
* Add callback to clear form errors at create wopi files [SCI-8927]
2023-08-02 15:34:36 +02:00
artoscinote
7a8663779e
Merge pull request #5902 from ivanscinote/SCI-8712-UI-arrows-tooltip
Replace jstree sprite image and remove inventory table overlaying tooltip [SCI-8712]
2023-08-02 11:56:24 +02:00
Soufiane
382a4e57ac
Load external services asynchronously [SCI-8937] (#5900) 2023-08-02 11:17:34 +02:00
Ivan Kljun
88a6df5985 Remove table overlaying tooltip for inventories 2023-08-02 09:26:41 +02:00
Ivan Kljun
a35206cd8a Adding new sprite image for jstree 2023-08-02 09:01:29 +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
artoscinote
42f02c36c0
Merge pull request #5897 from ivanscinote/SCI-8592-long-name-experiment-modal
Set dropdown at move task modal to parent width [SCI-8592]
2023-08-01 14:10:43 +02:00
Ivan Kljun
3b3a2ed2af Set dropdown at move task modal to parent width 2023-08-01 11:40:24 +02:00
sboursen-scinote
8cca2c595f Fix end-of-list banner issues in P/E/T [SCI-8126] 2023-08-01 11:36:09 +02:00
Alex Kriuchykhin
4a563d3456
Implement loading settings from both, database and env variables [SCI-8813] (#5885) 2023-08-01 10:44:27 +02:00
wandji
2680b317e5
Fix issue when toggling repository items search fields [SCI-8874] (#5855)
* Fix issue when toggling repository items search fields [SCI-8874]

* Refactor outside click directive and make it available for all components [SCI-8874]
2023-08-01 10:41:58 +02:00
artoscinote
556c1de182
Merge pull request #5896 from G-Chubinidze/gc_SCI_8846
Inventory column resizing issues [SCI-8846]
2023-08-01 10:39:13 +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
artoscinote
1c9bd53ff9
Merge pull request #5894 from G-Chubinidze/gc_SCI_8798
Remove text when option is chosen in dropdown selector in add member to team [SCI-8798]
2023-08-01 10:38:00 +02:00
artoscinote
a76bc912b1
Merge pull request #5887 from G-Chubinidze/gc_SCI_8849
CSS - mixed issues [SCI-8849]
2023-08-01 10:32:02 +02:00
artoscinote
4e53aa80c1
Merge pull request #5881 from wandji20/wb-SCI-8793
Fix issue with repository header changing when fetching data [SCI-8793]
2023-08-01 10:31:37 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895)
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
2023-08-01 10:30:57 +02:00
ajugo
0ac5e35104
Merge pull request #5879 from sboursen-scinote/sb_SCI-8881
Update the link on the Shared task view [SCI-8881]
2023-08-01 10:28:38 +02:00
artoscinote
f117c21ea5
Merge pull request #5873 from aignatov-bio/ai-sci-8905-refactor-insert-menu
Refactor insert menu [SCI-8905]
2023-08-01 10:13:23 +02:00
artoscinote
03e77f11bb
Merge pull request #5864 from aignatov-bio/ai-sci-8879-updated-attachments-section
Update attachments section [SCI-8879]
2023-08-01 10:10:53 +02:00
artoscinote
53c9d9307d
Merge pull request #5857 from ivanscinote/SCI-8721-firefox-bug
Unify password dots display across browsers [SCI-8721]
2023-08-01 10:10:24 +02:00
artoscinote
62b847086a
Merge pull request #5871 from ivanscinote/SCI-8584-checkbox-filter-bug
Fix checkbox filter bug [SCI-8584]
2023-08-01 10:09:44 +02:00
Giga Chubinidze
8827c6d447 Inventory column resizing issues [SCI-8846] 2023-08-01 11:56:30 +04:00
Giga Chubinidze
413e806499 Remove text when option is chosen in dropdown selector in add member to team [SCI-8798] 2023-07-31 19:58:34 +04:00