|
|
1aff5ba99b
|
Add circular progress to writing_microblogs
|
2019-12-05 12:56:05 -05:00 |
|
Leon Liang
|
2bcf6bfcb3
|
filter by followed user
|
2019-12-05 12:48:26 -05:00 |
|
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 |
|
|
|
f9a45ffe07
|
Merge pull request #84 from ClaytonWWilson/dms
Direct Messages
|
2019-12-04 22:47:50 -05:00 |
|
Aditya Sankaran
|
17c7e989ef
|
cleared modal for quoting when hitting cancel button
|
2019-12-04 19:37:53 -05:00 |
|
Aditya Sankaran
|
efecf3b02a
|
fixed stuff
|
2019-12-04 18:48:08 -05:00 |
|
Aditya Sankaran
|
8b4c32b81f
|
syntax error
|
2019-12-04 18:20:28 -05:00 |
|
Aditya Sankaran
|
323cb5bcee
|
Revert "module fuse and syntax errors fixed"
This reverts commit 4a4733f593.
|
2019-12-04 18:15:37 -05:00 |
|
Aditya Sankaran
|
4a4733f593
|
module fuse and syntax errors fixed
|
2019-12-04 18:09:36 -05:00 |
|
asankaran35
|
35cec7abf3
|
Merge pull request #106 from ClaytonWWilson/likes
Likes
|
2019-12-04 17:42:03 -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 |
|
|
|
0bcfdcdd6c
|
Fix deploy error
|
2019-12-04 17:10:26 -05:00 |
|
|
|
4e5b100968
|
Fix merge issues and change layout of NavBar
|
2019-12-04 16:57:56 -05:00 |
|
|
|
374c4d45b0
|
Merge branch 'master' into dms
|
2019-12-04 15:56:42 -05:00 |
|
|
|
7efed257f2
|
Merge pull request #105 from ClaytonWWilson/display-profile-images-on-posts
Posts on Home now display profile images
|
2019-12-04 15:37:59 -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 |
|
|
|
0776728e73
|
Merge pull request #60 from ClaytonWWilson/edit-profile-image-upload
Edit profile image upload
|
2019-12-04 00:31:07 -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 |
|
|
|
94db3f451d
|
Merge pull request #104 from ClaytonWWilson/fix-warnings
Fix warnings
|
2019-12-03 20:55:55 -05:00 |
|
|
|
fd1718a1f4
|
Fixing more errors
|
2019-12-03 20:54:54 -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 |
|
Leon Liang
|
f3fcd5ee8d
|
Merge pull request #103 from ClaytonWWilson/others_topic
changed color if user is following the same topic
|
2019-12-03 19:16:17 -05:00 |
|
Leon Liang
|
7141bf9000
|
changed color if user is following the same topic
|
2019-12-03 19:15:23 -05:00 |
|
|
|
ebca5192e0
|
Change storageBucket to variable
|
2019-12-03 18:20:20 -05:00 |
|
Leon Liang
|
acecf704dc
|
Merge pull request #102 from ClaytonWWilson/otheruser_posts
display posts on other user's page
|
2019-12-03 18:14:40 -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 |
|
|
|
041e53c36f
|
Merge pull request #101 from ClaytonWWilson/confirm-delete
Confirm delete
|
2019-12-03 16:40:00 -05:00 |
|
|
|
2d426840c0
|
Add @ next to handle on editProfile
|
2019-12-03 16:37:57 -05:00 |
|
|
|
5b5e785142
|
Changed the path of the editProfile page
|
2019-12-03 16:37:04 -05:00 |
|
|
|
a4cce0b75e
|
Circular progress when the editProfile page is loading
|
2019-12-03 16:26:54 -05:00 |
|
|
|
825c126c6c
|
Delete asks you to confirm
|
2019-12-03 16:26:16 -05:00 |
|
|
|
49a4d55f1e
|
Rename edit class to editProfile to be more descriptive
|
2019-12-03 14:04:40 -05:00 |
|
|
|
b4f4dec9ca
|
Merge pull request #93 from ClaytonWWilson/fix-login-loading
Display loading icon when the user logs in or signs up
|
2019-12-03 13:50:55 -05:00 |
|
|
|
f0c4a2974f
|
Fix mismatched parenthesis
|
2019-12-03 13:49:37 -05:00 |
|
|
|
c26ff21b20
|
Merge branch 'master' into fix-login-loading
|
2019-12-03 13:44:12 -05:00 |
|
|
|
3092fabfd2
|
Merge pull request #85 from ClaytonWWilson/microblogs-material-ui
Changing Writing_Microblogs to Material-UI and other UI tweaks
|
2019-12-03 13:35:27 -05:00 |
|
|
|
1a6aae6545
|
Fixed mismatched parenthesis
|
2019-12-03 13:33:48 -05:00 |
|
|
|
4abaa13b09
|
Merge branch 'master' into microblogs-material-ui
|
2019-12-03 13:24:36 -05:00 |
|
|
|
09a3ccd12d
|
Merge branch 'master' into dms
|
2019-12-03 13:21:30 -05:00 |
|
|
|
f7058a520d
|
Merge pull request #99 from ClaytonWWilson/improve-search
Improved speed of search and made it fuzzy search
|
2019-12-03 13:19:53 -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 |
|
Leon Liang
|
6e32b25861
|
Merge pull request #98 from ClaytonWWilson/fix_follow
add topics when publish new post
|
2019-12-02 18:39:09 -05:00 |
|
