AriasCreations/TimeTracker
4
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Release 1.0 #2

Draft
zontreck wants to merge 84 commits from beta into main
pull from: beta
merge into: AriasCreations:main
Conversation 3 Commits 84 Files changed 56 +3048 -430
zontreck commented 2025-05-18 10:39:07 -07:00
Owner
Copy link

A work in progress PR for release 1.0

A work in progress PR for release 1.0
Final beta before release 1.0.
zontreck changed title from Release 1.0 to WIP: Release 1.0 2025-05-18 10:39:12 -07:00
aelita commented 2025-10-21 01:12:11 -07:00
Owner
Copy link

1.0 will not ship user accounts. 1.1 will switch to using user accounts.

1.0 will not ship user accounts. 1.1 will switch to using user accounts.
aelita commented 2025-10-21 01:13:56 -07:00
Owner
Copy link

Pending deprecation and removal for 1.1: Cipher for backend server [timetrackd]

Pending deprecation and removal for 1.1: Cipher for backend server [timetrackd]
aelita commented 2025-10-21 01:28:28 -07:00
Owner
Copy link

@zontreck I did your job for you. Now publish this on google play already.

@zontreck I did your job for you. Now publish this on google play already.
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

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

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 switch main
git merge --no-ff beta
git switch beta
git rebase main
git switch main
git merge --ff-only beta
git switch beta
git rebase main
git switch main
git merge --no-ff beta
git switch main
git merge --squash beta
git switch main
git merge --ff-only beta
git switch main
git merge beta
git push origin main
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
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: AriasCreations/TimeTracker#2
No description provided.
Delete branch "beta"

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?