WIP: V10 #102

Draft
webmsgr wants to merge 76 commits from v10 into master
webmsgr commented 2023-01-19 07:56:39 -08:00 (Migrated from github.com)

Version 10

git branch -m v10-scs-astary v10
git fetch origin
git branch -u origin/v10 v10
git remote set-head origin -a
Version 10 ``` git branch -m v10-scs-astary v10 git fetch origin git branch -u origin/v10 v10 git remote set-head origin -a ```
webmsgr commented 2023-01-19 07:59:39 -08:00 (Migrated from github.com)

Hopefully this branch is deployed under https://v10.schedule-personalizer.pages.dev

Hopefully this branch is deployed under https://v10.schedule-personalizer.pages.dev
Owner

Hopefully

Hopefully
cloudflare-workers-and-pages[bot] commented 2023-01-19 09:00:38 -08:00 (Migrated from github.com)

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: d1f947c
Status:   Deploy successful!
Preview URL: https://7929cfe7.schedule-personalizer.pages.dev
Branch Preview URL: https://v10.schedule-personalizer.pages.dev

View logs

## Deploying with &nbsp;<a href="https://pages.dev"><img alt="Cloudflare Pages" src="https://user-images.githubusercontent.com/23264/106598434-9e719e00-654f-11eb-9e59-6167043cfa01.png" width="16"></a> &nbsp;Cloudflare Pages <table><tr><td><strong>Latest commit:</strong> </td><td> <code>d1f947c</code> </td></tr> <tr><td><strong>Status:</strong></td><td>&nbsp;✅&nbsp; Deploy successful!</td></tr> <tr><td><strong>Preview URL:</strong></td><td> <a href='https://7929cfe7.schedule-personalizer.pages.dev'>https://7929cfe7.schedule-personalizer.pages.dev</a> </td></tr> <tr><td><strong>Branch Preview URL:</strong></td><td> <a href='https://v10.schedule-personalizer.pages.dev'>https://v10.schedule-personalizer.pages.dev</a> </td></tr> </table> [View logs](https://dash.cloudflare.com/?to=/:account/pages/view/schedule-personalizer/7929cfe7-20c9-439f-be6c-04341debbc3a)
webmsgr commented 2023-01-19 09:28:55 -08:00 (Migrated from github.com)

Mobile still looks a little weird but it works? Now I've gotta implement everything else, joy

Mobile still looks a little weird but it works? Now I've gotta implement everything else, joy
webmsgr commented 2023-01-20 08:56:02 -08:00 (Migrated from github.com)

This latest commit should prevent the font from being times new Roman while the other font is loading

This latest commit should prevent the font from being times new Roman while the other font is loading
This pull request has changes conflicting with the target branch.
  • .gitignore
  • Jakefile
  • package.json
  • src/App.tsx
  • src/apis/schoolWebsiteAlertScraper/scrape.ts
  • src/apis/studentvue/studentVueAPI.ts
  • src/components/StudentVueReloader.tsx
  • src/config/lunches.ts
  • src/config/mapLocation.ts
  • src/config/readme.md
  • src/config/schedules.ts
  • src/config/settings.ts
  • src/config/teachers.ts
  • src/eggs.scss
  • src/index.html
  • src/index.tsx
  • src/lib/lib.ts
  • src/pages/editor/DateEditor.tsx
  • src/pages/editor/index.tsx
  • src/pages/schedule/components/Map/MP.tsx
  • src/pages/schedule/components/ScheduleEntry.tsx
  • src/pages/schedule/components/ScheduleHeader.tsx
  • src/pages/schedule/handleOverides.ts
  • src/pages/schedule/index.tsx
  • src/pages/settings/index.tsx
  • src/pages/setup/steps/Login.tsx
  • src/sw.ts
  • src/types.ts
  • src/types/lunchesTypes.ts
  • yarn.lock
View command line instructions

Checkout

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

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 master
git merge --no-ff v10
git switch v10
git rebase master
git switch master
git merge --ff-only v10
git switch v10
git rebase master
git switch master
git merge --no-ff v10
git switch master
git merge --squash v10
git switch master
git merge --ff-only v10
git switch master
git merge v10
git push origin master
Sign in to join this conversation.
No description provided.