Commit Graph

41 Commits

Author SHA1 Message Date
f4bedea2c7
Merge branch 'master' into verify-profile 2019-11-01 13:40:30 -04:00
Leon Liang
f60c045483
Merge branch 'master' into search_page 2019-10-31 16:57:22 -04:00
Leon Liang
1842eef2f8 added search page 2019-10-31 16:54:34 -04:00
ce984df437
Merge branch 'master' into auth-backend-3 2019-10-31 16:09:17 -04:00
325d37f0de Back-end for verifying users 2019-10-31 15:12:22 -04:00
Leon Liang
e73b2d02f3
Merge branch 'master' into delete_topic 2019-10-31 14:44:03 -04:00
Aaron Sun
26afabe709 All posts from db can now show on home page timeline 2019-10-30 18:04:35 -04:00
Aaron Sun
8438ce27cf Get user's posts works now 2019-10-29 22:25:38 -04:00
Aaron Sun
d69828ef7f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 into auth-backend-3 2019-10-27 20:48:15 -04:00
Aaron Sun
fd226b454e Delete users fully works now 2019-10-27 14:46:31 -04:00
Leon Liang
13a1401759 Reformat code 2019-10-27 02:53:12 -04:00
Leon Liang
d9f6fb5d8e added function to delete topic 2019-10-25 23:04:09 -04:00
Leon Liang
340d3537a6 created functions retrieving all topics 2019-10-24 23:13:03 -04:00
Leon Liang
5405d96150 created function to add topic 2019-10-24 22:42:46 -04:00
Leon Liang
79d23af3fc
Merge branch 'master' into auth-backend-3 2019-10-24 17:09:45 -04:00
Leon Liang
ac28b3e19e getUserDetails is now working 2019-10-24 17:06:44 -04:00
Leon Liang
e524bc2811 pass in fbAuth to getUserDetails 2019-10-24 16:25:19 -04:00
Aaron Sun
1b66f18dd5 Log in with username partially works 2019-10-22 16:50:38 -04:00
f14e8bd970 Redux saves user data on login 2019-10-03 10:58:45 -04:00
c218081759 Making everything look pretty 2019-10-01 20:39:21 -04:00
07e9271132 Removing hard-coded user info. 2019-10-01 17:30:18 -04:00
cc98fa7884 Fixed index.js and refactored it. 2019-10-01 15:27:24 -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
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
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
929216c05e Changed naming from FBAuth to fbAuth 2019-09-29 22:06:51 -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
15f976398a Code refactoring 2019-09-29 01:35:06 -04:00
262e59df65 Disabled the feed route rewrite and small fixes. 2019-09-28 22:42:26 -04:00
Leon Liang
cc1ce1bfc9
Merge branch 'master' into user_subscription 2019-09-27 21:40:39 -04:00
5642b685bc Finished functionality of backend edit profile functions 2019-09-27 16:28:00 -04:00
Leon Liang
8fa03700b1 Refactored and organized files based on functionality 2019-09-26 01:49:19 -04:00
Clayton Wilson
bcdd452aa8 Start of the edit profile functions. 2019-09-23 22:58:06 -04:00
Clayton Wilson
709af8007d Added the FBAuth middleman function for authentication. 2019-09-23 21:18:33 -04:00
Leon Liang
0c08eb8f78 Set up Express for API calls. 2019-09-19 15:41:38 -04:00
Leon Liang
c716d47254 Added functions Helloworld and getUsername for testing 2019-09-12 16:23:45 -04:00
ClaytonWWilson
d0b32835ac Firebase Init files 2019-09-12 14:33:13 -04:00