Commit Graph

228 Commits

Author SHA1 Message Date
88310714b2
Merge branch 'master' into edit-profile-frontend 2019-10-01 21:01:02 -04:00
c218081759 Making everything look pretty 2019-10-01 20:39:21 -04:00
asankaran35
16973fb340
Merge pull request #19 from ClaytonWWilson/user-line
added entering topics field and database call for adding topics when …
2019-10-01 19:16:02 -04:00
Aditya Sankaran
9d4f175a49 added entering topics field and database call for adding topics when writing microblog 2019-10-01 19:07:57 -04:00
Leon Liang
f627b91543 change case sensitive file name 2019-10-01 19:04:03 -04:00
Leon Liang
ec6e41d16f
Merge pull request #18 from ClaytonWWilson/file_org
File org for twistter-frontend js files
2019-10-01 19:00:40 -04:00
Leon Liang
2e157b9088
Merge branch 'master' into file_org 2019-10-01 19:00:19 -04:00
Leon Liang
89e8942624 file organization for twistter frontend 2019-10-01 18:54:26 -04:00
Leon Liang
b9909c1616 move home.js and so on into according folders 2019-10-01 18:44:49 -04:00
Danny Voltz
fadb0f0399 added logout support 2019-10-01 17:34:19 -05:00
Danny Voltz
931929061f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 17:30:39 -05:00
Danny Voltz
8eb0872d16 logout ui 2019-10-01 17:27:52 -05:00
07e9271132 Removing hard-coded user info. 2019-10-01 17:30:18 -04:00
724adc9b0b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 17:02:05 -04:00
b711521b4b Fix unnecessary escape deploy error. 2019-10-01 17:01:59 -04:00
967e66313b
Merge pull request #17 from ClaytonWWilson/edit-profile-frontend
Edit profile frontend
2019-10-01 16:56:58 -04:00
76caf4de12
Merge branch 'master' into edit-profile-frontend 2019-10-01 16:54:13 -04:00
eb945fa0cf Finished fixing login and signup backend. 2019-10-01 16:31:37 -04:00
c5bec46b52 Fix fbAuth function not extracting 'Bearer ' 2019-10-01 16:08:53 -04:00
cc98fa7884 Fixed index.js and refactored it. 2019-10-01 15:27:24 -04:00
Leon Liang
101d9918e5 Changes to navigation bar 2019-10-01 14:43:41 -04:00
5116a705bc Save before trying to fix master. 2019-10-01 14:32:27 -04:00
Aditya Sankaran
311e8b3716 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 14:03:37 -04:00
Aditya Sankaran
754c2f2d75 added get request userline function 2019-10-01 14:03:15 -04:00
Aaron Sun
13b57eedc6 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 13:57:44 -04:00
Leon Liang
60d1d76839 Added nav bar 2019-10-01 12:56:34 -04:00
Leon Liang
e273b1474b Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24
added Navigation bar
2019-10-01 12:45:10 -04:00
Leon Liang
022f440cb9 added Navigation bar to home page 2019-10-01 12:44:47 -04:00
721aeeb350 Edit Profile front-end finished and connected to back-end 2019-09-30 23:39:35 -04:00
Aaron Sun
4517bc6756 Reconciled with new pull from master 2019-09-30 23:22:09 -04:00
Aaron Sun
201f5d8949 Reconciled my code with master 2019-09-30 23:04:37 -04:00
696b00e304 Edit profile front-end almost finished. 2019-09-30 22:30:29 -04:00
Aaron Sun
b1cfcda948 Clean baseline 2019-09-30 22:26:28 -04:00
asankaran35
7969d3b10b
Merge pull request #16 from ClaytonWWilson/userline
Userline
2019-09-30 18:23:36 -04:00
asankaran35
d298843268
Merge branch 'master' into userline 2019-09-30 18:23:21 -04:00
Aditya Sankaran
55dc62e57e connected backend to frontend for writing microblogs 2019-09-30 18:06:23 -04:00
d255a301a3 Merge branch 'edit-profile-frontend' of https://github.com/ClaytonWWilson/CS307-Team24 into edit-profile-frontend 2019-09-30 00:04:23 -04:00
0f127521ca Added edit page. 2019-09-30 00:04:06 -04:00
90442fe3cd Fixing 'firebase deploy' errors and warnings 2019-09-29 23:59:36 -04:00
2dc89b99b6 Added edit page. 2019-09-29 23:31:33 -04:00
5176f0250c
Merge pull request #15 from ClaytonWWilson/edit-profile-frontend
Changed naming from FBAuth to fbAuth
2019-09-29 22:07:25 -04:00
929216c05e Changed naming from FBAuth to fbAuth 2019-09-29 22:06:51 -04:00
dc498a3a1d
Add comments to fbAuth.js 2019-09-29 21:56:59 -04:00
f4ef1ee8e1
Wrong filename 2019-09-29 21:52:25 -04:00
ce8ee36354
Fixed missing bracket 2019-09-29 21:46:18 -04:00
13fcd9b3ab
Merge pull request #14 from ClaytonWWilson/edit-profile-info
Edit profile info
2019-09-29 21:35:54 -04:00
Clayton Wilson
7f2d6a3a1e
Merge branch 'master' into edit-profile-info 2019-09-29 21:33:41 -04:00
d05f87c7a7 Made edit profile data validation more robust. 2019-09-29 21:01:06 -04:00
Aditya Sankaran
b1faacd312 backend and frontend connect in progress 2019-09-29 19:07:35 -04:00
15f976398a Code refactoring 2019-09-29 01:35:06 -04:00