Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
46c4fdc
Fixed code so the server can run
dburcat Apr 6, 2026
fc89bb4
set port to 8000
dburcat Apr 6, 2026
34779b7
Merge pull request #33 from Circus-Circus-data-7-0/BurDev
dburcat Apr 6, 2026
7779317
Added comprehension comments
emoyertech Apr 6, 2026
bb3da42
Messed with flask
emoyertech Apr 6, 2026
f754b43
fixed problems
dburcat Apr 6, 2026
f06d7f0
added extra commint
dburcat Apr 6, 2026
dd45333
Merge pull request #34 from Circus-Circus-data-7-0/BurDev
dburcat Apr 6, 2026
e99f4e4
pull
emoyertech Apr 6, 2026
4f92e10
Merge branch 'main' into emoyertech
emoyertech Apr 6, 2026
f76a4f0
want to fix main
dburcat Apr 6, 2026
a9e8b15
To have change back to fix main
dburcat Apr 6, 2026
1c83de8
Revert "pull"
emoyertech Apr 6, 2026
854278a
Merge branch 'main' into BurDev
dburcat Apr 6, 2026
ad44ce1
Merge pull request #35 from Circus-Circus-data-7-0/BurDev
dburcat Apr 6, 2026
7af051b
allows running server or local
dburcat Apr 6, 2026
0bf119f
Merge pull request #37 from Circus-Circus-data-7-0/BurDev
dburcat Apr 6, 2026
254d6ca
added foreignkey user_id
dburcat Apr 8, 2026
d039772
Posts + comments
NJIngram Apr 8, 2026
da74784
worked on subform as own file
dburcat Apr 8, 2026
7381cce
__init__ order swapped
NJIngram Apr 8, 2026
37e05ca
relationship to users in class subforum
dburcat Apr 8, 2026
0964f4d
Allows admins to create subforums
dburcat Apr 8, 2026
a68f9da
Debugging why it will not run
NJIngram Apr 8, 2026
73537e5
init file is back
NJIngram Apr 8, 2026
6cd0081
can post to forum and view
NJIngram Apr 8, 2026
1a868a3
fixed Subform.py to subforum.py
dburcat Apr 8, 2026
f91cffe
admin user ability to delete subforum if not one of the initial ones
dburcat Apr 8, 2026
365e49c
Migrated MySQL
emoyertech Apr 9, 2026
753b0c7
Added explaination of why and how MySQL setup works.
emoyertech Apr 9, 2026
8190aba
delete unneeded line
dburcat Apr 9, 2026
9dc1b6e
seperate subforum blueprint
dburcat Apr 9, 2026
161b2af
Reactions.py temporary module created.
James-Taylor-JJ Apr 9, 2026
1991261
Merge pull request #75 from Circus-Circus-data-7-0/BurDev
dburcat Apr 9, 2026
af1196c
fixed pull request for one file
dburcat Apr 9, 2026
bd1df41
Merge pull request #76 from Circus-Circus-data-7-0/BurDev
dburcat Apr 9, 2026
219fa67
IMG and VID not finished but having a stroke
NJIngram Apr 9, 2026
39ca89d
Fixed HTML
emoyertech Apr 9, 2026
dd45074
IMG and VID finished
NJIngram Apr 9, 2026
c219e84
Merge branch 'main' into Nate-Dev
James-Taylor-JJ Apr 9, 2026
ac12889
Merge pull request #77 from Circus-Circus-data-7-0/Nate-Dev
James-Taylor-JJ Apr 9, 2026
1be2c33
Merge branch 'main' into JamesBranch
James-Taylor-JJ Apr 9, 2026
f395311
Merge pull request #79 from Circus-Circus-data-7-0/JamesBranch
James-Taylor-JJ Apr 9, 2026
ab12d8f
merge conflict
dburcat Apr 9, 2026
f745e31
Merge pull request #78 from Circus-Circus-data-7-0/emoyertech
dburcat Apr 9, 2026
c4c4c7f
fixed some merge errors
dburcat Apr 9, 2026
de67e81
forums is working, but not all features in yet. Uploads do not work c…
dburcat Apr 9, 2026
999e031
Merge pull request #81 from Circus-Circus-data-7-0/Merge_dev
dburcat Apr 9, 2026
cabda6b
Post publicity
NJIngram Apr 9, 2026
433d4ad
redid publicity and fixed file insertion errors
NJIngram Apr 9, 2026
79019f6
Final fixes with post
NJIngram Apr 9, 2026
9ffc31e
implemented some copoilt recs
dburcat Apr 10, 2026
80572d5
Merge branch 'main' into Nate-Dev
dburcat Apr 10, 2026
a5bb699
Merge pull request #82 from Circus-Circus-data-7-0/Nate-Dev
dburcat Apr 10, 2026
c6602a9
merge conflicts
dburcat Apr 10, 2026
e3225c0
Post.py now houses its routes
NJIngram Apr 10, 2026
4abbfcf
post_routes.begone
NJIngram Apr 10, 2026
80c1410
Condensed MySQL migration
emoyertech Apr 10, 2026
7a86f35
deleted unused import and white space
dburcat Apr 10, 2026
f0d1e28
Reactions html moved to viewpost.html and deleted from Reactions.py, …
James-Taylor-JJ Apr 10, 2026
f125f44
Merge branch 'JamesBranch' into Merge_dev
dburcat Apr 10, 2026
24e9e2c
merged reactions
dburcat Apr 10, 2026
0491cdf
Merge branch 'Nate-Dev' into Merge_dev
dburcat Apr 10, 2026
b4204b2
merged post updates
dburcat Apr 10, 2026
caee7d0
Merge pull request #85 from Circus-Circus-data-7-0/Merge_dev
dburcat Apr 10, 2026
7de88bf
Post images having a stroke fixed once more (I pray)
NJIngram Apr 10, 2026
bc5ae06
Merge branch 'Nate-Dev' into Merge_dev
dburcat Apr 10, 2026
79c2d2f
Login prompt added to html file, unnecessary importing commands removed.
James-Taylor-JJ Apr 10, 2026
f738a35
Login prompt added to html file, unnecessary importing commands removed.
James-Taylor-JJ Apr 10, 2026
102aa0f
gitignore uploads on commits and pushes
NJIngram Apr 10, 2026
696ddd0
Merge branch 'Nate-Dev' into Merge_dev
dburcat Apr 10, 2026
8f24578
Dms.py created, DM class created, routes and blueprint created, sende…
James-Taylor-JJ Apr 11, 2026
51e6dc4
fixed some bugs in dms and made dm.html file
dburcat Apr 11, 2026
f94cd2d
Direct messaging buttons added to front end.
James-Taylor-JJ Apr 11, 2026
306b086
DM buttons added
James-Taylor-JJ Apr 11, 2026
0c7f31d
Sort by sender functionality added to messaging page. Sending to nonx…
James-Taylor-JJ Apr 11, 2026
c9d861c
Dropdown menu created.
James-Taylor-JJ Apr 11, 2026
6542a5c
Fix filename case sensitivity: dm.html
dburcat Apr 11, 2026
e347a70
Remove dm.html (case sensitivity issue resolved)
James-Taylor-JJ Apr 11, 2026
9209ba8
attempt to resolve file problems with commits
dburcat Apr 11, 2026
f0b9f41
Merge branch 'JamesBranch' into Merge_dev
dburcat Apr 11, 2026
948ae3e
User class implemented
dburcat Apr 11, 2026
e4f279e
user routing merged
dburcat Apr 11, 2026
84c2623
style coloring frontend
dburcat Apr 11, 2026
3a8aefe
remove git ignore
dburcat Apr 11, 2026
d3aaf36
layout.html updated to incorporate Bianca's frontend design, header.h…
James-Taylor-JJ Apr 11, 2026
69a8a19
updated layout and subforums html pages to preserve Bianca's frontend…
James-Taylor-JJ Apr 11, 2026
942de0e
brutton fonts and spacing corrected.
James-Taylor-JJ Apr 11, 2026
3439eae
Change name from schooner to zipchat
dburcat Apr 11, 2026
54c23bf
Changed logo to be Z not S
dburcat Apr 11, 2026
37612d5
Deletepost route and button
NJIngram Apr 11, 2026
b0762b6
Fixed indent error non type error
dburcat Apr 11, 2026
510a8d3
Deletepost error fixes
NJIngram Apr 11, 2026
882f9ba
fixed import users in post
dburcat Apr 11, 2026
b92539b
fix import errors
dburcat Apr 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
venv/
.vscode

# Uploaded user files — kept locally only, not committed
forum/static/uploads/*
!forum/static/uploads/.gitkeep

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
Loading
Loading