Commit Graph

115 Commits

Author SHA1 Message Date
085ec0f0ae last 2021-09-13 11:08:37 -04:00
cd857877dd pep 2021-09-12 22:27:43 -04:00
2d4f8da847 Merge branch 'master' of https://github.com/Blair-SGA-Dev-Team/blazerapp 2021-09-12 22:03:55 -04:00
315fecb9ba slash 2021-09-12 22:03:52 -04:00
emilyliublair
8e02f9904a url change 2021-09-12 22:02:13 -04:00
de057d4039 production deployment in docker 2021-09-12 21:41:09 -04:00
emilyliublair
9547d894ea finished version of app 2021-09-12 21:28:01 -04:00
baf2210dca fixes 2021-09-12 20:42:38 -04:00
f3678b15ea styles 2021-09-12 18:37:39 -04:00
emilyliublair
88ba6e1e77 fixed teacher template 2021-09-12 18:19:34 -04:00
0a826fd381 Merge branch 'master' of https://github.com/Blair-SGA-Dev-Team/blazerapp 2021-09-12 18:15:17 -04:00
5a299db18d teacher fix 2021-09-12 18:15:12 -04:00
emilyliublair
de5dd29daf added home button 2021-09-12 17:51:16 -04:00
6013abf15c fix to redirect 2021-09-12 17:49:52 -04:00
60f40bdd55 Merge branch 'master' of https://github.com/Blair-SGA-Dev-Team/blazerapp 2021-09-12 17:31:33 -04:00
c557bbda77 sotw + todo: add navigation 2021-09-12 17:31:29 -04:00
emilyliublair
a18f1178d8 array with base64 2021-09-12 17:30:56 -04:00
emilyliublair
3eaa975560 templates done (i think) 2021-09-12 17:29:07 -04:00
f20773c49a fixing sslops: todo -> check all form actions and add required to inputs and selects 2021-09-12 17:08:56 -04:00
34f6819f1d ssl opportunities 2021-09-12 17:03:20 -04:00
emilyliublair
cea966010f Merge branch 'master' of https://github.com/Blair-SGA-Dev-Team/blazerapp 2021-09-12 15:08:52 -04:00
emilyliublair
ed59b3f47b templates 2021-09-12 15:08:49 -04:00
0e1bc5602a ye 2021-09-11 18:34:46 -04:00
emilyliublair
4f9a69707c down.sql 2021-09-11 18:16:10 -04:00
4da5834934 callback pls 2021-09-11 18:04:13 -04:00
f9b9cae6eb Merge branch 'master' of https://github.com/Blair-SGA-Dev-Team/blazerapp 2021-09-11 17:49:38 -04:00
c3144df7c7 js 2021-09-11 17:49:27 -04:00
emilyliublair
3c08695e54 stuff 2021-09-11 17:48:17 -04:00
Linkai Wu
1a51323c03 Update cms events page 2021-09-11 14:18:08 -04:00
emilyliublair
bf122af51f updated events 2021-09-10 18:17:44 -04:00
emilyliublair
613429707b push 2021-09-08 23:50:20 -04:00
583b572b09 something 2021-09-08 21:41:34 -04:00
eab9749c72 a 2021-09-06 19:19:39 -04:00
EvilMuffinHa
7c5ca541b0
Merge pull request #2 from Blair-SGA-Dev-Team/deploy
merge new things
2021-09-06 19:18:07 -04:00
c52ff45a82 save 2021-09-01 21:10:14 -04:00
e112f5a33c remove 2021-08-29 22:35:50 -04:00
f081c56c28 ok fixed the pepepga problem 2021-08-29 22:35:32 -04:00
a512542ca5 Merge branch 'deploy' of https://github.com/Blair-SGA-Dev-Team/blazerapp into deploy
merge
2021-08-29 14:59:34 -04:00
5318c59880 why does proc macro not work 2021-08-29 14:59:11 -04:00
emilyliublair
9bdb17cc78 delete unused pngs 2021-08-23 21:46:29 -04:00
Linkai Wu
1f261eb15f Update individual staff page
- add format like SOTW to individual staff pages
- add image, phone, and position values on page (waiting for cms update)
2021-08-21 21:45:20 -04:00
9d6901c499 why login.html pls 2021-08-18 18:47:47 -04:00
a4d7bc4564 first 2021-08-18 18:42:09 -04:00
2afba79e02 first for re-cms 2021-08-18 18:41:20 -04:00
emilyliublair
6fd0056c89 home pg + language 2021-08-17 21:18:32 -04:00
emilyliublair
38d07e8747 calendar pg ui 2021-08-01 22:11:39 -04:00
emilyliublair
0f01056de7 announcements pg ui + small changes 2021-08-01 02:10:38 -04:00
emilyliublair
b5e2e6de3e lunch events & sslopps ui + small changes 2021-07-31 00:26:07 -04:00
emilyliublair
bd2491f3b1 COTW and resources ui 2021-07-30 00:36:45 -04:00
emilyliublair
0d1e240b20 sotw ui 2021-07-29 11:26:38 -04:00