Commit Graph

70 Commits

Author SHA1 Message Date
a459e6581e
Merge branch 'master' into admin-delete 2019-12-06 11:45:50 -05:00
Leon Liang
30df98343e added user post tuple 2019-12-05 17:22:55 -05:00
Leon Liang
de72bd9223 added alert to user's page 2019-12-05 13:45:58 -05:00
Danny Voltz
96423cee8a Admin User Stories 2019-12-05 12:12:25 -05:00
f9a45ffe07
Merge pull request #84 from ClaytonWWilson/dms
Direct Messages
2019-12-04 22:47:50 -05:00
Aditya Sankaran
efecf3b02a fixed stuff 2019-12-04 18:48:08 -05:00
asankaran35
6989091fb1
Merge branch 'master' into likes 2019-12-04 17:41:28 -05:00
374c4d45b0
Merge branch 'master' into dms 2019-12-04 15:56:42 -05:00
7a0a5725b7
Merge branch 'master' into edit-profile-image-upload 2019-12-04 00:02:03 -05:00
Leon Liang
56e836451d display posts on other user's page 2019-12-03 18:11:10 -05:00
09a3ccd12d
Merge branch 'master' into dms 2019-12-03 13:21:30 -05:00
1a02b53d0f Improved speed of search and made it fuzzy search 2019-12-03 00:54:06 -05:00
e4ea325fb8 Liking posts with Redux and Material UI 2019-12-02 20:18:44 -05:00
88064c55a3
Merge branch 'master' into dms 2019-12-02 16:21:26 -05:00
Aditya Sankaran
b83eb0c897 saved states of post for each user 2019-11-29 20:18:51 -05:00
fee2225745 Disable or enable Direct Messages 2019-11-27 23:06:25 -05:00
asankaran35
1a2af4e9bb
Merge branch 'master' into engage_microblog 2019-11-27 21:08:55 -05:00
Leon Liang
7976110e2b modified function to add/delete topic only from user 2019-11-21 19:59:04 -05:00
Aditya Sankaran
e8110d643f finished quoting microblogs 2019-11-21 15:42:43 -05:00
Leon Liang
81749c19ce completed search page and redirect to user profile page 2019-11-19 22:30:15 -05:00
Aditya Sankaran
1ccc195036 liking and unliking work 2019-11-19 21:09:07 -05:00
Leon Liang
2de3da928a added UI for follow and unfollow other user 2019-11-19 19:03:28 -05:00
297619cacb Tweaking DM back-end functions 2019-11-19 19:02:13 -05:00
Leon Liang
42c53fdbc4 Add profile image, topics for other user page 2019-11-19 15:56:39 -05:00
Leon Liang
1d26eb97ad Added function to follow and unfollow users 2019-11-15 17:47:47 -05:00
19d78596b5 Check for DMs enabled or disabled 2019-11-05 22:43:29 -05:00
a2ed627f2b Back-end for getting all the DMs for a user 2019-11-04 13:21:47 -05:00
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
3001ec0b38
Merge branch 'master' into edit-profile-image-upload 2019-10-27 23:46:15 -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
44d3450b10 Profile image upload frontend and backend finished 2019-10-27 18:06:47 -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