Commit Graph

131 Commits

Author SHA1 Message Date
-anubis-
df4ed9407c Merge pull request #17 from tjsga/2018-19
Hoco Judging
2018-08-20 18:41:48 -04:00
AnubisSQLi
8bb9ee4c80 Hoco Judging 2018-08-20 18:40:21 -04:00
-anubis-
29c29eedc0 Merge pull request #16 from tjsga/2018-19
News Editability, and Calendar Movement
2018-08-18 19:19:18 -04:00
AnubisSQLi
93bea3dc7f News Editability, and Calendar Movement 2018-08-18 19:18:39 -04:00
-anubis-
fe386023b5 Merge pull request #15 from tjsga/2018-19
Added Calendar
2018-08-18 13:35:08 -04:00
AnubisSQLi
144b60e797 Added Calendar 2018-08-18 13:32:50 -04:00
-anubis-
e8b675fcab Merge pull request #14 from tjsga/2018-19
Editing Site is now a possibility
2018-08-08 23:26:57 -04:00
AnubisSQLi
8237dc668d Editing Site is now a possibility 2018-08-08 23:25:51 -04:00
-anubis-
22cd2481f9 Merge pull request #13 from tjsga/2018-19
Contact and News Changes
2018-08-06 20:14:39 -04:00
AnubisSQLi
a4d7908cdb Contact and News Changes 2018-08-06 20:14:24 -04:00
-anubis-
6539509dde Merge pull request #12 from tjsga/2018-19
Changed Officer Photo
2018-08-06 19:06:33 -04:00
AnubisSQLi
2cbcf94789 Changed Officer Photo 2018-08-06 19:06:05 -04:00
-anubis-
1f6b018753 Merge pull request #11 from tjsga/2018-19
Projects Page
2018-08-06 00:22:19 -04:00
AnubisSQLi
68293820d1 Projects Page 2018-08-06 00:21:26 -04:00
-anubis-
067fdf11e1 Merge pull request #10 from tjsga/2018-19
08/05/2018 Push #2: Minor font-size changes
2018-08-05 22:19:58 -04:00
AnubisSQLi
cf11bd9c24 08/05/2018 Push #2: Minor font-size changes 2018-08-05 22:13:14 -04:00
-anubis-
338d23624a Merge pull request #9 from tjsga/2018-19
08/05/2018 Push #1: News on index fix
2018-08-05 22:08:30 -04:00
AnubisSQLi
228c1bcd9e 08/05/2018 Push #1: News on index fix 2018-08-05 22:07:08 -04:00
-anubis-
a0bdc27b18 Merge pull request #8 from tjsga/2018-19
Bug #01: News Article Re-direct | Cleaned
2018-08-05 21:48:31 -04:00
AnubisSQLi
9010ed6f86 Bug #01: News Article Re-direct 2018-08-05 21:47:01 -04:00
-anubis-
1614ddd92c Merge pull request #7 from tjsga/2018-19
Favicon
2018-08-05 21:40:17 -04:00
AnubisSQLi
f1bfaec6f1 favicon 2018-08-05 21:39:07 -04:00
-anubis-
a3c72f2689 Merge pull request #6 from tjsga/2018-19
SEO
2018-08-05 21:15:34 -04:00
AnubisSQLi
0b458531e8 SEO 2018-08-05 21:12:39 -04:00
-anubis-
1ad1fc3994 Merge pull request #5 from tjsga/2018-19
2018-19 Merge #4
2018-06-23 11:50:18 -04:00
AnubisSQLi
ad44f31531 Color Change 2018-06-23 11:48:48 -04:00
-anubis-
f20339e396 Merge pull request #4 from tjsga/2018-19
2018-19 Merge #3
2018-06-21 23:12:21 -04:00
AnubisSQLi
fb44e9779b Minor README changes #3 2018-06-21 23:07:54 -04:00
AnubisSQLi
cfb1d3ca70 Minor README changes #2 2018-06-21 23:07:15 -04:00
AnubisSQLi
19b06f24b8 Minor README changes 2018-06-21 23:05:05 -04:00
-anubis-
1e6fc214bb Merge pull request #3 from tjsga/2018-19
2018-19 Merge #2
2018-06-21 19:22:32 -04:00
AnubisSQLi
79b83e9bc2 Site Version 1 Completed 2018-06-21 19:21:11 -04:00
AnubisSQLi
159179999b 06/18/2018 Commit 2018-06-18 21:56:38 -04:00
-anubis-
62c57c6969 Merge pull request #2 from tjsga/2018-19
2018-19 Merge
2018-06-12 20:33:52 -04:00
AnubisSQLi
7a4c96a49e Under Construction Site Ready 2018-06-12 20:32:09 -04:00
AnubisSQLi
dc540e3338 Edited .gitignore 2018-06-12 18:33:27 -04:00
AnubisSQLi
053909a2fb 2018-19 Inital Commit 2018-06-12 18:29:44 -04:00
willzhang05
c8beb589c0 fix README 2018-06-03 19:01:01 -04:00
willzhang05
61c7358711 update info 2018-06-03 18:59:11 -04:00
willzhang05
e0b4fddc07 remove hr 2018-06-03 18:53:44 -04:00
willzhang05
f907c8a6a0 fix directory for run.sh 2018-06-03 18:48:36 -04:00
willzhang05
8c2ea0b450 make run.sh right 2018-06-03 17:44:01 -04:00
William Zhang
10d0b794c3 Merge pull request #1 from tjsga/rewrite
Move django to production
2018-06-03 17:21:28 -04:00
William Zhang
ca4102d291 merge branches 2018-06-03 17:21:11 -04:00
William Zhang
cc67761741 working templating for about 2018-05-26 18:33:26 -04:00
William Zhang
54acb32241 working about page with templating and clean up formatting 2018-05-26 18:20:42 -04:00
William Zhang
3713afb653 working on making templating work 2018-05-26 13:39:01 -04:00
William Zhang
57a671523b update description 2018-05-10 14:15:41 -04:00
William Zhang
a972d437f3 start templating 2018-05-08 22:30:06 -04:00
William Zhang
167b66a9ab fix urls.py 2018-05-08 21:29:57 -04:00