RTM/rtm-website
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Create pet calendar page #3

Merged
jordansullivan merged 14 commits from js/petcal into main 2026-01-20 06:42:35 +00:00
Conversation 6 Commits 14 Files Changed 3 +385 -1
jordansullivan commented 2026-01-16 05:21:20 +00:00
Member
Copy Link
No description provided.
jordansullivan added 1 commit 2026-01-16 05:21:21 +00:00
Create pet calendar page e7f08b8ff7
jordansullivan requested review from brookechr 2026-01-16 05:21:21 +00:00
brookechr reviewed 2026-01-16 05:22:19 +00:00
src/pages/WhatWereWorkingOn.astro Outdated
@ -52,6 +52,8 @@ import "../styles/globals.css";
>
</div>
brookechr commented 2026-01-16 05:22:19 +00:00
Owner
Copy Link

wut's all this, @jordansullivan ????

wut's all this, @jordansullivan ????
jordansullivan added 1 commit 2026-01-20 05:22:06 +00:00
Add all the tutorial links babyyyy f82c72ec24
jordansullivan requested review from ammaratef45 2026-01-20 05:27:58 +00:00
jordansullivan requested review from linnealovespie 2026-01-20 05:27:59 +00:00
jordansullivan added 10 commits 2026-01-20 05:37:44 +00:00
remove stale alternatives dd13c8cfcc
1. Rename What we're working on to our projects 2. make them look clickable 097496ff94
make navbar buttons less dark in light mode 64f03449b7
Update Our Points of Unity f51b65e13c
update bookclub page; rename What Were Working On to Our Projects in the code 1af1c17d2c
add zines to our projects c22727adc7
rename ../ourprojectspages/... to just .../projects/... in the page route 4e0436f3f2
Create pet calendar page 2df8d27809
Add all the tutorial links babyyyy 6079272b8c
pet calendar updates 5193c400b4
jordansullivan added 1 commit 2026-01-20 05:47:25 +00:00
Fixing all the stuff I effed up in rebasing 763786f5bf
jordansullivan removed review request for brookechr 2026-01-20 06:03:09 +00:00
jordansullivan removed review request for ammaratef45 2026-01-20 06:03:20 +00:00
jordansullivan removed review request for linnealovespie 2026-01-20 06:03:28 +00:00
jordansullivan commented 2026-01-20 06:03:59 +00:00
Author
Member
Copy Link

I'm in rebasing hell and cannot escape. I am going to bed.

I'm in rebasing hell and cannot escape. I am going to bed.
ammaratef45 added 1 commit 2026-01-20 06:13:31 +00:00
Merge branch 'main' into js/petcal 69b6133fb0
ammaratef45 commented 2026-01-20 06:14:49 +00:00
Owner
Copy Link

I'm in rebasing hell and cannot escape. I am going to bed.

I went ahead and merged main into your branch, check my commit (69b6133fb0) and see if I messed up anything

> I'm in rebasing hell and cannot escape. I am going to bed. I went ahead and merged main into your branch, check my commit (https://git.coopcloud.tech/RTM/rtm-website/commit/69b6133fb01d1306bd0c289164a733b40007a939) and see if I messed up anything
jordansullivan commented 2026-01-20 06:23:27 +00:00
Author
Member
Copy Link

Okay @jjjj I may need help here, I have somehow completed bungled trying to merge in your most recent changes and I keep going in circles trying to rebase 😭

Ah nevermind @ammaratef45 had already assisted! ty!

Okay @jjjj I may need help here, I have somehow completed bungled trying to merge in your most recent changes and I keep going in circles trying to rebase 😭 Ah nevermind @ammaratef45 had already assisted! ty!
jordansullivan changed title from WIP: Create pet calendar page to Create pet calendar page 2026-01-20 06:41:40 +00:00
jordansullivan merged commit 8c8e048466 into main 2026-01-20 06:42:35 +00:00
jordansullivan deleted branch js/petcal 2026-01-20 06:42:35 +00:00
jordansullivan commented 2026-01-20 06:43:34 +00:00
Author
Member
Copy Link

I would appreciate if someone else could deploy the changes if possible (assuming I didn't break something)!

I will learn the deployment side eventually...

I would appreciate if someone else could deploy the changes if possible (assuming I didn't break something)! I will learn the deployment side eventually...
jjjj commented 2026-01-21 16:33:06 +00:00
Owner
Copy Link

It is live!

It is live!
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ammaratef45 brookechr dbergv jjjj jmakdah2 jordansullivan linnealovespie moosemower
No Assignees
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: RTM/rtm-website#3
No description provided.
Delete Branch "js/petcal"

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?