Deuxfleurs/alps
24
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

WIP: compare deuxfleurs to master #1

Draft
lx wants to merge 5 commits from deuxfleurs into master
pull from: deuxfleurs
merge into: Deuxfleurs:master
Conversation 0 Commits 5 Files changed 6 +19 -13
lx commented 2022-12-06 15:10:32 +00:00
Owner
Copy link
No description provided.
lx added 14 commits 2022-12-06 15:10:32 +00:00 
Signed-off-by: Alexey Terentyev <axifnx@gmail.com>
Upon failed login, this patch sets the status code to 401 and provides a
Notice to show in login.html
The statement changed here creates new variables, whereas it means to
assign values to the previously declared `ao` to be used outside of the
if statement. This lead to PUT requests always being sent to a URL
containing a new UUID, causing problems with some CardDAV servers.
This commit upgrades go-webdav to what is currently the master branch.
The go-webdav client implementation gained some features with regards to
service discovery that alps can benefit from.

With this change, one can pass e.g. the following upstream URL:

   carddav+insecure://example.com/.well-known/carddav

This URL is defined in [RFC 6764, section 6][1]. If the server supports
it, it will respond with a redirect to the currently authenticated
user's principal URL. In the version used so far, the go-webdav client
does not handle this redirect well.

[1]: https://datatracker.ietf.org/doc/html/rfc6764#section-6

See also: https://github.com/emersion/go-webdav/commit/0363312
This makes calendar events viewable in the sourcehut theme.
lx added 1 commit 2022-12-06 15:12:34 +00:00
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin deuxfleurs:deuxfleurs
git checkout deuxfleurs

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff deuxfleurs
git checkout deuxfleurs
git rebase master
git checkout master
git merge --ff-only deuxfleurs
git checkout deuxfleurs
git rebase master
git checkout master
git merge --no-ff deuxfleurs
git checkout master
git merge --squash deuxfleurs
git checkout master
git merge --ff-only deuxfleurs
git checkout master
git merge deuxfleurs
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: Deuxfleurs/alps#1
No description provided.
Delete branch "deuxfleurs"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?