Merge staging to main #24

Closed

muppeth wants to merge 3 commits from staging into main

muppeth commented

2024-05-15 20:51:18 +02:00

Owner

No description provided.

muppeth added 3 commits 2024-05-15 20:51:19 +02:00

5dfb6bfaec

added npm to apt list

26e8c2d3f7 Update to 2.0.2 (#21 )

I created an issue upstream as there is no possibility to remove modules from cli. The main dev will do is tomorrow normally. So I keep this as WIP at the moment.

Reviewed-on: #21
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>

62a7145f3a build admin page (#22 )

Fix the issue with admin page.
Also, I know we got that discussion already for cryptpad, but I removed npm package as it is already installed with nodejs even on bookworm. Otherwise I get an error as it is trying to install`npm=9.2.0` whereas with nodejs you get `npm=10.5.0`

Reviewed-on: #22
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>

meaz approved these changes 2024-05-15 20:51:55 +02:00

muppeth closed this pull request

2024-05-16 11:54:05 +02:00

Pull request closed

Please reopen this pull request to perform a merge.

No reviewers

No Label

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Disroot-Ansible/etherpad#24

No description provided.