Merging Thursday Afternoon Material - #4

Open

James-Taylor-JJ wants to merge 84 commits into

ZCW-Spring26:mainfrom

Circus-Circus-data-7-0:Nate-Dev

Commits on Apr 6, 2026

Fixed code so the server can run
dburcat
committed
46c4fdc
set port to 8000
dburcat
committed
fc89bb4
Merge pull request #33 from Circus-Circus-data-7-0/BurDev
dburcat
authored
34779b7
Added comprehension comments
emoyertech
committed
7779317
Messed with flask
emoyertech
committed
bb3da42
fixed problems
dburcat
committed
f754b43
added extra commint
dburcat
committed
f06d7f0
Merge pull request #34 from Circus-Circus-data-7-0/BurDev
dburcat
authored
dd45333
pull
emoyertech
committed
e99f4e4
Merge branch 'main' into emoyertech
emoyertech
committed
4f92e10
want to fix main
dburcat
committed
f76a4f0
To have change back to fix main
dburcat
committed
a9e8b15
Revert "pull"
emoyertech
committed
1c83de8
Merge branch 'main' into BurDev
dburcat
authored
854278a
Merge pull request #35 from Circus-Circus-data-7-0/BurDev
dburcat
authored
ad44ce1
allows running server or local
dburcat
committed
7af051b
Merge pull request #37 from Circus-Circus-data-7-0/BurDev
dburcat
authored
0bf119f

Commits on Apr 8, 2026

added foreignkey user_id
dburcat
committed
254d6ca
Posts + comments
Nate-Ingram-Jr
committed
d039772
worked on subform as own file
dburcat
committed
da74784
__init__ order swapped
Nate-Ingram-Jr
committed
7381cce
relationship to users in class subforum
dburcat
committed
37e05ca
Allows admins to create subforums
dburcat
committed
0964f4d
Debugging why it will not run
Nate-Ingram-Jr
committed
a68f9da
init file is back
Nate-Ingram-Jr
committed
73537e5
can post to forum and view
Nate-Ingram-Jr
committed
6cd0081
fixed Subform.py to subforum.py
dburcat
committed
1a868a3
admin user ability to delete subforum if not one of the initial ones
dburcat
committed
f91cffe

Commits on Apr 9, 2026

Migrated MySQL
emoyertech
committed
365e49c
Added explaination of why and how MySQL setup works.
emoyertech
committed
753b0c7
delete unneeded line
dburcat
committed
8190aba
seperate subforum blueprint
dburcat
committed
9dc1b6e
Reactions.py temporary module created.
James-Taylor-JJ
committed
161b2af
Merge pull request #75 from Circus-Circus-data-7-0/BurDev
dburcat
authored
1991261
fixed pull request for one file
dburcat
committed
af1196c
Merge pull request #76 from Circus-Circus-data-7-0/BurDev
dburcat
authored
bd1df41
IMG and VID not finished but having a stroke
Nate-Ingram-Jr
committed
219fa67
Fixed HTML
emoyertech
committed
39ca89d
IMG and VID finished
Nate-Ingram-Jr
committed
dd45074
Merge branch 'main' into Nate-Dev
James-Taylor-JJ
authored
c219e84
Merge pull request #77 from Circus-Circus-data-7-0/Nate-Dev
James-Taylor-JJ
authored
ac12889
Merge branch 'main' into JamesBranch
James-Taylor-JJ
authored
1be2c33
Merge pull request #79 from Circus-Circus-data-7-0/JamesBranch
James-Taylor-JJ
authored
f395311
merge conflict
dburcat
committed
ab12d8f
Merge pull request #78 from Circus-Circus-data-7-0/emoyertech
dburcat
authored
f745e31
fixed some merge errors
dburcat
committed
c4c4c7f
forums is working, but not all features in yet. Uploads do not work correctly.
dburcat
committed
de67e81
Merge pull request #81 from Circus-Circus-data-7-0/Merge_dev
dburcat
authored
999e031
Post publicity
Nate-Ingram-Jr
committed
cabda6b
redid publicity and fixed file insertion errors
Nate-Ingram-Jr
committed
433d4ad
Final fixes with post
Nate-Ingram-Jr
committed
79019f6

Commits on Apr 10, 2026

Commits on Apr 11, 2026

Deletepost route and button
Nate-Ingram-Jr
committed
537689d
Fixed indent error non type error
dburcat
committed
c53fd3b
Deletepost error fixes
Nate-Ingram-Jr
committed
6e000b0
merge conflicts

dburcat
authored and
Nate-Ingram-Jr
committed
1bb5147
Condensed MySQL migration

emoyertech
authored and
Nate-Ingram-Jr
committed
b9d5a18
deleted unused import and white space

dburcat
authored and
Nate-Ingram-Jr
committed
4154546
Reactions html moved to viewpost.html and deleted from Reactions.py, reactions relationship added to post.py; blueprint registration added to __init__.py

James-Taylor-JJ
authored and
Nate-Ingram-Jr
committed
cb4f1e7
merged reactions

dburcat
authored and
Nate-Ingram-Jr
committed
b9817f8
merged post updates

dburcat
authored and
Nate-Ingram-Jr
committed
10352d5
Login prompt added to html file, unnecessary importing commands removed.

James-Taylor-JJ
authored and
Nate-Ingram-Jr
committed
616794a
Dms.py created, DM class created, routes and blueprint created, sender and recipient relationships established, blueprint

James-Taylor-JJ
authored and
Nate-Ingram-Jr
committed
042f200
fixed some bugs in dms and made dm.html file

dburcat
authored and
Nate-Ingram-Jr
committed
4556b1d
Direct messaging buttons added to front end.

James-Taylor-JJ
authored and
Nate-Ingram-Jr
committed
0f8380e
remove dm.html permanently
Nate-Ingram-Jr
committed
48a36c8
attempt to resolve file problems with commits

dburcat
authored and
Nate-Ingram-Jr
committed
518533b
User class implemented

dburcat
authored and
Nate-Ingram-Jr
committed
2b6ae6c
user routing merged

dburcat
authored and
Nate-Ingram-Jr
committed
27fae19
style coloring frontend

dburcat
authored and
Nate-Ingram-Jr
committed
1f97ccc
remove git ignore

dburcat
authored and
Nate-Ingram-Jr
committed
29bed9e
layout.html updated to incorporate Bianca's frontend design, header.html updated to use her nav bar design, messages page style created to match what already exists, and style.css updated to addre…

James-Taylor-JJ
authored and
Nate-Ingram-Jr
committed
43f7be1
updated layout and subforums html pages to preserve Bianca's frontend design.

James-Taylor-JJ
authored and
Nate-Ingram-Jr
committed
18d335d
brutton fonts and spacing corrected.

James-Taylor-JJ
authored and
Nate-Ingram-Jr
committed
63d2d7a
Change name from schooner to zipchat

dburcat
authored and
Nate-Ingram-Jr
committed
df0c537
Changed logo to be Z not S

dburcat
authored and
Nate-Ingram-Jr
committed
b98e7f8
Deletepost route and button
Nate-Ingram-Jr
committed
7f627a3
permanently remove dm.html
Nate-Ingram-Jr
committed
fca62c3
Wrestled DM, birthed markdowns
Nate-Ingram-Jr
committed
543b841