Commit Graph

120 Commits

Author SHA1 Message Date
Danny Voltz
bae2947003 Merge branch 'admin-delete' of https://github.com/ClaytonWWilson/CS307-Team24 into admin-delete:x 2019-12-05 12:25:19 -05:00
Danny Voltz
96423cee8a Admin User Stories 2019-12-05 12:12:25 -05:00
asankaran35
6989091fb1
Merge branch 'master' into likes 2019-12-04 17:41:28 -05:00
Aditya Sankaran
699ea23750 quoting fix 2019-12-04 17:16:41 -05:00
99ffbe52a4 Posts on Home now display profile images 2019-12-04 15:37:09 -05:00
Aditya Sankaran
856cb8630e readded post.js. got deleted for some reason 2019-12-04 14:42:43 -05:00
77a3ba9f69 Fix merge issues 2019-12-04 00:30:23 -05:00
7a0a5725b7
Merge branch 'master' into edit-profile-image-upload 2019-12-04 00:02:03 -05:00
79051f2243 Error checking and deleting old profile image 2019-12-03 23:46:04 -05:00
7fd976d4cb
Merge branch 'master' into fix-warnings 2019-12-03 20:34:08 -05:00
72d099e05e Fixing errors and warnings 2019-12-03 20:26:31 -05:00
ebca5192e0 Change storageBucket to variable 2019-12-03 18:20:20 -05:00
Leon Liang
56e836451d display posts on other user's page 2019-12-03 18:11:10 -05:00
1747a29c2e Fix not image not uploading when deployed 2019-12-03 17:47:09 -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
7c7256acbd Fixed having multiple return statements in post.js 2019-12-02 15:47:26 -05:00
cff0fd4e05 DMs are deleted when the delete function runs 2019-12-02 15:46:13 -05:00
Leon Liang
e218708e0a
Merge pull request #95 from ClaytonWWilson/fix_follow
Fix follow
2019-12-02 00:08:07 -05:00
Aditya Sankaran
54cd1c44a7 edited userline database function 2019-11-30 18:11:33 -05:00
Aditya Sankaran
a36212c23d quoting mblogs userline 2019-11-30 12:16:30 -05:00
Aditya Sankaran
b83eb0c897 saved states of post for each user 2019-11-29 20:18:51 -05:00
asankaran35
1a2af4e9bb
Merge branch 'master' into engage_microblog 2019-11-27 21:08:55 -05:00
Aditya Sankaran
c34f06f130 formatted feed and userline 2019-11-27 20:57:42 -05:00
Leon Liang
9fff6ed81c changed status code for follow/unfollow 2019-11-22 18:23:49 -05:00
Leon Liang
6a78d74930 simplified backend get/remove topic function 2019-11-21 20:20:54 -05:00
Leon Liang
4e817c9647 integrated backend change, added pointer cursor 2019-11-21 20:09:47 -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
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
Danny Voltz
6924af58a7 progress for admin delete 2019-11-01 15:40:26 -05:00
e644498108
Merge pull request #67 from ClaytonWWilson/verify-profile
Users can be verified and have a check mark displayed on their profiles
2019-11-01 16:11:53 -04:00
97bc9c4fb1 Verify users front-end 2019-11-01 16:11:02 -04:00
b01aa92f96
Add post id 2019-11-01 15:39:08 -04:00
d6876eab0b
Fix .then() must return 2019-11-01 14:28:49 -04:00
f4bedea2c7
Merge branch 'master' into verify-profile 2019-11-01 13:40:30 -04:00
acd33d6a96
Merge branch 'master' into fix-delete 2019-11-01 13:26:11 -04:00
f1e4362205 Change imageFileName from const to let 2019-11-01 00:37:49 -04:00
1e4b2d16ef Fix edge case 2019-11-01 00:29:22 -04:00
e8e69cec31 Delete removes all data now 2019-11-01 00:26:01 -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
Leon Liang
50bc73870b delete topic fully works 2019-10-31 14:32:54 -04:00