Commit graph

232 commits

Author SHA1 Message Date
Unknown
c5b1807dcc Merge branch 'Pull-request-branch' into development 2024-10-30 11:22:44 -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
6c10fa4355
Update CNAME 2024-08-15 17:47:30 -07:00
Unknown
ebee53ff62
Update CNAME 2024-08-15 11:40:18 -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
b98236de6e added google api 2024-06-28 16:06:41 -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
d2c5777f95 o 2024-06-07 22:06:44 -07:00
Unknown
46de2d5e7f Delete upload.js 2024-06-04 14:08:45 -07:00
Unknown
f549737b3f Update upload.html 2024-06-03 11:33:28 -07:00
Unknown
1ade8d4340 Merge branch 'main' into development 2024-06-03 11:33:20 -07:00
Unknown
dcd928f4ff Merge branch 'development' into okokok 2024-06-03 11:20:08 -07:00
Unknown
d6a28ddabf Merge branch 'main' into okokok 2024-06-03 11:20:03 -07:00
Unknown
850a0f33d7 Merge branch 'main' into development 2024-05-24 13:31:09 -07:00
Unknown
c29f8d44d6 Merge branch 'main' of https://github.com/EndlessEevee/endlesseevee.github.io 2024-05-24 13:20:07 -07:00
Unknown
c3407eaf3b Update Callback.html 2024-05-21 14:40:15 -07:00
Unknown
373116f6ce a 2024-05-20 09:38:08 -07:00
Unknown
3e127ecf6f
Merge pull request #23 from EndlessEevee/main
Upated about us
2024-05-18 11:40:36 -07:00
Unknown
cec8f0a60b Update index.html 2024-05-18 11:39:47 -07:00
Unknown
7168a981bd access token test pls 2024-05-14 15:13:51 -07:00
Unknown
d5543e91ab k 2024-05-14 08:51:41 -07:00
Unknown
113534abda k 2024-05-14 08:26:34 -07:00
iiooasd
5dc528c7ce Make mason's work not look like trash
Did some css work and make things to buttons.
2024-05-13 19:52:35 -07:00
Unknown
ceae21a5da Merge branch 'okokok' into Made-for-Jaden 2024-05-13 19:28:23 -07:00
Unknown
e7a8e8c97d Update upload.html 2024-05-13 19:28:08 -07:00
Unknown
ae24fef213 Merge branch 'okokok' into Made-for-Jaden 2024-05-13 19:27:47 -07:00
Unknown
bf9311f943 a 2024-05-13 19:27:29 -07:00
Unknown
f798dcc49c Merge branch 'okokok' into Made-for-Jaden 2024-05-13 19:19:52 -07:00