Commit graph

203 commits

Author SHA1 Message Date
Unknown
f2a483f4bb
Merge branch 'Pull-request-branch' 2025-03-10 14:16:35 -07:00
Unknown
c547b09c1d
Update jekyll-gh-pages.yml 2025-03-10 14:14:04 -07:00
Unknown
0aa946ac46
Update CNAME 2025-03-10 14:12:44 -07:00
Unknown
ef12f5f86f
Merge branch 'Pull-request-branch' of https://github.com/EndofTimee/Team_Website into Pull-request-branch 2025-03-10 14:10:21 -07:00
Unknown
b179ca2351
Merge branch 'Pull-request-branch' 2025-03-10 14:10:13 -07:00
Unknown
a904f4a45b
Merge branch 'TeamParadise:main' into Pull-request-branch 2025-03-10 14:10:00 -07:00
Unknown
6493523557
Update sponsors.html 2025-03-10 14:09:22 -07:00
Unknown
3a4545ae54
Update CNAME 2025-01-20 15:26:38 -07:00
Unknown
816ed7aae2 Merge branch 'main' into Pull-request-branch 2025-01-08 14:28:42 -07:00
Unknown
57a616a4ae
Merge pull request #30 from EndofTimee/main 2025-01-08 07:12:46 -07:00
Unknown
5ae7307b52
Update navbar.html 2025-01-07 19:49:25 -07:00
Unknown
14c93acbab
Merge pull request #24 from EndofTimee/main
merge
2025-01-07 19:00:33 -07:00
Unknown
c071e0e787 Updated to preferred name 2025-01-07 18:57:59 -07:00
Unknown
81fe3c0ac3 Resolve Comments 2025-01-04 15:54:51 -07:00
Unknown
b4cd8f8593 Revert "Update CNAME"
This reverts commit ecc11ec589.
2024-12-21 12:23:55 -07:00
Unknown
ecc11ec589
Update CNAME 2024-12-21 12:22:33 -07:00
Unknown
a59e7d8fec Make website be in compliance with YPP 2024-12-21 12:18:04 -07:00
Unknown
17f041ec94 Update index.html 2024-11-29 21:57:39 -06:00
Unknown
388dd4734f Update navbar.html 2024-11-07 08:24:32 -07:00
Unknown
5c0e6fbe83 Merge branch 'Pull-request-branch' 2024-10-31 07:36:56 -07:00
Unknown
6248f605aa Update index.html 2024-10-30 14:08:40 -07:00
Unknown
11c8fc0353
Update .gitignore 2024-10-30 14:05:06 -07:00
Unknown
1405c738b2
Merge pull request #23 from ComputerCraftr/development
Increase menu text size
2024-10-30 14:02:12 -07:00
John Studnicka
5332446609 Increase menu text size 2024-10-24 16:39:33 -07:00
Unknown
c1dbb230e8 Update shop.html 2024-10-15 16:06:58 -07:00
Unknown
a1adbb5c38
Merge pull request #22 from EndlessEevee/main
Main
2024-10-15 15:07:44 -07:00
Unknown
e458605a05
Merge branch 'TeamParadise:main' into Pull-request-branch 2024-10-15 14:52:39 -07:00
Unknown
90f0e993c9
Update jekyll-gh-pages.yml 2024-10-15 14:52:23 -07:00
Unknown
b7b4f7787c
Merge branch 'TeamParadise:main' into main 2024-10-15 14:51:04 -07:00
Unknown
ed9dc5f7bc
Merge pull request #29 from EndlessEevee/Pull-request-branch
Updated Officers
2024-10-07 14:56:13 -07:00
Unknown
03807dae3d Updated Officers 2024-10-07 14:55:27 -07:00
Unknown
a0d2c529da Updated Officers 2024-10-07 14:53:15 -07:00
Unknown
e15fd53ba8 aston please make it work 2024-09-19 13:40:03 -07:00
Unknown
f568ea8494 Shop testing 2024-09-19 10:07:02 -07:00
Unknown
d03a75ef16 Added Shop 2024-09-19 09:56:01 -07:00
Unknown
d1ba889726 Shop tetsing 2024-09-16 11:46:35 -07:00
Unknown
414d0c13a4 Merge remote-tracking branch 'upstream/main' 2024-09-13 11:58:49 -07:00
Unknown
449be9f012
Merge pull request #27 from ComputerCraftr/cal-navbar-tailwind
Add new calendar and navbar using Tailwind CSS
2024-09-06 16:24:41 -07:00
John Studnicka
df9781c9eb Improve display for small viewports 2024-08-28 10:27:26 -07:00
John Studnicka
26a3ad932b Add new calendar and navbar using Tailwind CSS 2024-08-28 09:48:15 -07:00
Unknown
352877c1e9
Merge pull request #26 from EndlessEevee/Pull-request-branch
Update index.html
2024-08-23 16:56:08 -07:00
Unknown
16468df970 Update index.html 2024-08-23 16:54:53 -07:00
Unknown
82201f8ef4 Update index.html 2024-08-23 16:48:19 -07:00
Unknown
cf5a8dbd77
Update CNAME 2024-08-15 17:52:07 -07:00
Unknown
5794070e8c
Update jekyll-gh-pages.yml 2024-08-15 17:51:05 -07:00
Unknown
d52af76649
Merge pull request #25 from EndlessEevee/sponsorship-packet-update
Update sponsors.html
2024-07-13 15:59:15 -07:00
Unknown
6399616091 Update sponsors.html 2024-07-13 15:58:47 -07:00
Unknown
2e947598cc
Merge pull request #24 from TeamParadise/sponsor-fix
Fixed list not lining up with our packet
2024-06-10 15:23:06 -07:00
Unknown
503375a722 Fixed list not lining up with our packet 2024-06-10 15:22:11 -07:00
Unknown
3e127ecf6f
Merge pull request #23 from EndlessEevee/main
Upated about us
2024-05-18 11:40:36 -07:00