Merge dev - #7

Closed

dburcat wants to merge 95 commits into

ZCW-Spring26:mainfrom

Circus-Circus-data-7-0:Merge_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

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
Post images having a stroke fixed once more (I pray)
Nate-Ingram-Jr
committed
7de88bf
Merge branch 'Nate-Dev' into Merge_dev
dburcat
committed
bc5ae06
Login prompt added to html file, unnecessary importing commands removed.
James-Taylor-JJ
committed
79c2d2f
Login prompt added to html file, unnecessary importing commands removed.
James-Taylor-JJ
committed
f738a35
gitignore uploads on commits and pushes
Nate-Ingram-Jr
committed
102aa0f
Merge branch 'Nate-Dev' into Merge_dev
dburcat
committed
696ddd0

Commits on Apr 11, 2026

Dms.py created, DM class created, routes and blueprint created, sender and recipient relationships established, blueprint
James-Taylor-JJ
committed
8f24578
fixed some bugs in dms and made dm.html file
dburcat
committed
51e6dc4
Direct messaging buttons added to front end.
James-Taylor-JJ
committed
f94cd2d
DM buttons added
James-Taylor-JJ
committed
306b086
Sort by sender functionality added to messaging page. Sending to nonxistent users outlawed.
James-Taylor-JJ
committed
0c7f31d
Dropdown menu created.
James-Taylor-JJ
committed
c9d861c
Fix filename case sensitivity: dm.html
dburcat
committed
6542a5c
Remove dm.html (case sensitivity issue resolved)
James-Taylor-JJ
committed
e347a70
attempt to resolve file problems with commits
dburcat
committed
9209ba8
Merge branch 'JamesBranch' into Merge_dev
dburcat
committed
f0b9f41
User class implemented
dburcat
committed
948ae3e
user routing merged
dburcat
committed
e4f279e
style coloring frontend
dburcat
committed
84c2623
remove git ignore
dburcat
committed
3a8aefe
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
dburcat
committed
d3aaf36
updated layout and subforums html pages to preserve Bianca's frontend design.

James-Taylor-JJ
authored and
dburcat
committed
69a8a19
brutton fonts and spacing corrected.

James-Taylor-JJ
authored and
dburcat
committed
942de0e
Change name from schooner to zipchat
dburcat
committed
3439eae
Changed logo to be Z not S
dburcat
committed
54c23bf
Deletepost route and button

Nate-Ingram-Jr
authored and
dburcat
committed
37612d5
Fixed indent error non type error
dburcat
committed
b0762b6
Deletepost error fixes

Nate-Ingram-Jr
authored and
dburcat
committed
510a8d3
fixed import users in post
dburcat
committed
882f9ba
fix import errors
dburcat
committed
b92539b