James branch - #5

Open

James-Taylor-JJ wants to merge 109 commits into

ZCW-Spring26:mainfrom

Circus-Circus-data-7-0:JamesBranch

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

implemented some copoilt recs
dburcat
committed
9ffc31e
Merge branch 'main' into Nate-Dev
dburcat
authored
80572d5
Merge pull request #82 from Circus-Circus-data-7-0/Nate-Dev
dburcat
authored
a5bb699
merge conflicts
dburcat
committed
c6602a9
Post.py now houses its routes
Nate-Ingram-Jr
committed
e3225c0
post_routes.begone
Nate-Ingram-Jr
committed
4abbfcf
Condensed MySQL migration
emoyertech
committed
80c1410
deleted unused import and white space
dburcat
committed
7a86f35
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
committed
f0d1e28
Merge branch 'JamesBranch' into Merge_dev
dburcat
committed
f125f44
merged reactions
dburcat
committed
24e9e2c
Merge branch 'Nate-Dev' into Merge_dev
dburcat
committed
0491cdf
merged post updates
dburcat
committed
b4204b2
Merge pull request #85 from Circus-Circus-data-7-0/Merge_dev
dburcat
authored
caee7d0
Login prompt added to html file, unnecessary importing commands removed.
James-Taylor-JJ
committed
79c2d2f

Commits on Apr 11, 2026

Commits on Apr 12, 2026

Post images having a stroke fixed once more (I pray)

Nate-Ingram-Jr
authored and
James-Taylor-JJ
committed
4550c16
gitignore uploads on commits and pushes

Nate-Ingram-Jr
authored and
James-Taylor-JJ
committed
0cee6f1
User class implemented

dburcat
authored and
James-Taylor-JJ
committed
b8e3714
user routing merged

dburcat
authored and
James-Taylor-JJ
committed
63d7b1f
style coloring frontend

dburcat
authored and
James-Taylor-JJ
committed
88cb1c5
remove git ignore

dburcat
authored and
James-Taylor-JJ
committed
52bc801
Change name from schooner to zipchat

dburcat
authored and
James-Taylor-JJ
committed
37ad4de
Changed logo to be Z not S

dburcat
authored and
James-Taylor-JJ
committed
5c81fec
Deletepost route and button

Nate-Ingram-Jr
authored and
James-Taylor-JJ
committed
3625b54
Fixed indent error non type error

dburcat
authored and
James-Taylor-JJ
committed
b18cf83
Deletepost error fixes

Nate-Ingram-Jr
authored and
James-Taylor-JJ
committed
04b93b8
fixed import users in post

dburcat
authored and
James-Taylor-JJ
committed
a545597
fix import errors

dburcat
authored and
James-Taylor-JJ
committed
c697e90
Login prompt added to html file, unnecessary importing commands removed.
James-Taylor-JJ
committed
677c8eb
User class implemented

dburcat
authored and
James-Taylor-JJ
committed
b270962
style coloring frontend

dburcat
authored and
James-Taylor-JJ
committed
a86d2e0
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
committed
2e1e5e7
updated layout and subforums html pages to preserve Bianca's frontend design.
James-Taylor-JJ
committed
f2cbe00
brutton fonts and spacing corrected.
James-Taylor-JJ
committed
e8fe161
Changed logo to be Z not S

dburcat
authored and
James-Taylor-JJ
committed
536b618
Deletepost route and button

Nate-Ingram-Jr
authored and
James-Taylor-JJ
committed
30bddbc
Fixed indent error non type error

dburcat
authored and
James-Taylor-JJ
committed
888f5e6
Deletepost error fixes

Nate-Ingram-Jr
authored and
James-Taylor-JJ
committed
1edb626
fixed import users in post

dburcat
authored and
James-Taylor-JJ
committed
1d30c5d
fix import errors

dburcat
authored and
James-Taylor-JJ
committed
8262109
user settings created
James-Taylor-JJ
committed
da983a2
Ethan's user settings code migrated to user_settings.py
James-Taylor-JJ
committed
23aba71
user_settings.py updated
James-Taylor-JJ
committed
467171a
orum/post.py Post.private (bool) → Post.visibility (string); addpost passes default_visibility from user settings; viewpost redirects to login instead of error; action_post reads and validates visi…
James-Taylor-JJ
committed
8f511ac
Html restored.
James-Taylor-JJ
committed
75c21db
messages permissions updated to agree with settings.
James-Taylor-JJ
committed
a6ac6ae