Commit Graph

Select branches

Hide Pull Requests

Beautify

ImprovingUI

aditya

admin-delete

branch-692

chronological

danny

dependabot/npm_and_yarn/functions/ajv-6.12.6

dependabot/npm_and_yarn/functions/axios-0.21.1

dependabot/npm_and_yarn/functions/express-4.18.2

dependabot/npm_and_yarn/functions/jsonwebtoken-and-firebase-admin-and-firebase-functions-9.0.0

dependabot/npm_and_yarn/functions/lodash-4.17.21

dependabot/npm_and_yarn/functions/minimatch-3.1.2

dependabot/npm_and_yarn/functions/minimist-and-mkdirp-1.2.8

dependabot/npm_and_yarn/functions/qs-and-express-6.11.0

dependabot/npm_and_yarn/functions/y18n-3.2.2

dependabot/npm_and_yarn/twistter-frontend/axios-0.21.1

dependabot/npm_and_yarn/twistter-frontend/decode-uri-component-0.2.2

dependabot/npm_and_yarn/twistter-frontend/express-4.18.2

dependabot/npm_and_yarn/twistter-frontend/handlebars-4.7.7

dependabot/npm_and_yarn/twistter-frontend/hosted-git-info-2.8.9

dependabot/npm_and_yarn/twistter-frontend/http-proxy-1.18.1

dependabot/npm_and_yarn/twistter-frontend/json5-and-react-scripts-2.2.3

dependabot/npm_and_yarn/twistter-frontend/lodash-4.17.21

dependabot/npm_and_yarn/twistter-frontend/minimist-and-mkdirp-and-react-scripts-1.2.8

dependabot/npm_and_yarn/twistter-frontend/path-parse-1.0.7

dependabot/npm_and_yarn/twistter-frontend/qs-and-qs-and-express-6.5.3

dependabot/npm_and_yarn/twistter-frontend/sockjs-0.3.21

dependabot/npm_and_yarn/twistter-frontend/tmpl-1.0.5

dependabot/npm_and_yarn/twistter-frontend/url-parse-1.5.10

dependabot/npm_and_yarn/twistter-frontend/websocket-extensions-0.1.4

dependabot/npm_and_yarn/twistter-frontend/y18n-3.2.2

engage_microblog

filteredPosts

filteredPostsWithTopics

fix

frontEnd

impDarkTheme

lastfix

master

remotes/origin/posts

shobhit

write_microblogs

#10

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#115

#116

#117

#117

#118

#119

#119

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#130

#130

#131

#132

#132

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#140

#140

#141

#142

#142

#143

#143

#144

#144

#145

#145

#15

#16

#17

#18

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#33

#34

#35

#39

#42

#43

#45

#47

#54

#55

#59

#6

#60

#61

#62

#63

#64

#65

#67

#68

#69

#72

#74

#75

#76

#83

#84

#85

#86

#87

#88

#9

#90

#91

#92

#93

#94

#95

#97

#98

#99

Mono Color

• 79051f2243 Error checking and deleting old profile image Clayton Wilson 2019-12-03 23:46:04 -05:00
• 94db3f451d Merge pull request #104 from ClaytonWWilson/fix-warnings Clayton Wilson 2019-12-03 20:55:55 -05:00
• fd1718a1f4 Fixing more errors Clayton Wilson 2019-12-03 20:54:54 -05:00
• 7fd976d4cb Merge branch 'master' into fix-warnings Clayton Wilson 2019-12-03 20:34:08 -05:00
• 72d099e05e Fixing errors and warnings Clayton Wilson 2019-12-03 20:26:31 -05:00
• f3fcd5ee8d Merge pull request #103 from ClaytonWWilson/others_topic Leon Liang 2019-12-03 19:16:17 -05:00
• 7141bf9000 changed color if user is following the same topic Leon Liang 2019-12-03 19:15:23 -05:00
• ebca5192e0 Change storageBucket to variable Clayton Wilson 2019-12-03 18:20:20 -05:00
• acecf704dc Merge pull request #102 from ClaytonWWilson/otheruser_posts Leon Liang 2019-12-03 18:14:40 -05:00
• 56e836451d display posts on other user's page Leon Liang 2019-12-03 18:11:10 -05:00
• 1747a29c2e Fix not image not uploading when deployed Clayton Wilson 2019-12-03 17:47:09 -05:00
• 041e53c36f Merge pull request #101 from ClaytonWWilson/confirm-delete Clayton Wilson 2019-12-03 16:40:00 -05:00
• 2d426840c0 Add @ next to handle on editProfile Clayton Wilson 2019-12-03 16:37:57 -05:00
• 5b5e785142 Changed the path of the editProfile page Clayton Wilson 2019-12-03 16:37:04 -05:00
• a4cce0b75e Circular progress when the editProfile page is loading Clayton Wilson 2019-12-03 16:26:54 -05:00
• 825c126c6c Delete asks you to confirm Clayton Wilson 2019-12-03 16:26:16 -05:00
• 49a4d55f1e Rename edit class to editProfile to be more descriptive Clayton Wilson 2019-12-03 14:04:40 -05:00
• b4f4dec9ca Merge pull request #93 from ClaytonWWilson/fix-login-loading Clayton Wilson 2019-12-03 13:50:55 -05:00
• f0c4a2974f Fix mismatched parenthesis Clayton Wilson 2019-12-03 13:49:37 -05:00
• c26ff21b20 Merge branch 'master' into fix-login-loading Clayton Wilson 2019-12-03 13:44:12 -05:00
• 3092fabfd2 Merge pull request #85 from ClaytonWWilson/microblogs-material-ui Clayton Wilson 2019-12-03 13:35:27 -05:00
• 1a6aae6545 Fixed mismatched parenthesis Clayton Wilson 2019-12-03 13:33:48 -05:00
• 4abaa13b09 Merge branch 'master' into microblogs-material-ui Clayton Wilson 2019-12-03 13:24:36 -05:00
• 09a3ccd12d Merge branch 'master' into dms Clayton Wilson 2019-12-03 13:21:30 -05:00
• f7058a520d Merge pull request #99 from ClaytonWWilson/improve-search Clayton Wilson 2019-12-03 13:19:53 -05:00
• 1a02b53d0f Improved speed of search and made it fuzzy search Clayton Wilson 2019-12-03 00:54:06 -05:00
• e4ea325fb8 Liking posts with Redux and Material UI Clayton Wilson 2019-12-02 20:18:44 -05:00
• 6e32b25861 Merge pull request #98 from ClaytonWWilson/fix_follow Leon Liang 2019-12-02 18:39:09 -05:00
• 684ccd1a85 Merge branch 'master' into fix_follow Leon Liang 2019-12-02 18:38:54 -05:00
• f0ddaa30b1 add topics when publish new post Leon Liang 2019-12-02 18:31:33 -05:00
• 8244631d4d Fix some code after merge Clayton Wilson 2019-12-02 16:40:22 -05:00
• 4d97afcb09 Merge branch 'master' into microblogs-material-ui Clayton Wilson 2019-12-02 16:29:52 -05:00
• 88064c55a3 Merge branch 'master' into dms Clayton Wilson 2019-12-02 16:21:26 -05:00
• 7c7256acbd Fixed having multiple return statements in post.js Clayton Wilson 2019-12-02 15:47:26 -05:00
• cff0fd4e05 DMs are deleted when the delete function runs Clayton Wilson 2019-12-02 15:46:13 -05:00
• e218708e0a Merge pull request #95 from ClaytonWWilson/fix_follow Leon Liang 2019-12-02 00:08:07 -05:00
• 445c8b39de allow delete without refreshing page Leon Liang 2019-12-02 00:00:25 -05:00
• 6e8b7f410a saved liked posts Aditya Sankaran 2019-12-01 15:55:53 -05:00
• 07a8f0b7bb userline frontend shows quoted posts Aditya Sankaran 2019-11-30 18:23:46 -05:00
• 54cd1c44a7 edited userline database function Aditya Sankaran 2019-11-30 18:11:33 -05:00
• ca7f793d4c likeCount updating auto Aditya Sankaran 2019-11-30 16:50:20 -05:00
• a36212c23d quoting mblogs userline Aditya Sankaran 2019-11-30 12:16:30 -05:00
• e3593e2f29 Left-aligned the text in posts Aaron Sun 2019-11-29 21:11:10 -08:00
• 4b440d28de Fixed a small bug in sorting userline posts Aaron Sun 2019-11-29 20:17:21 -08:00
• 81593cee52 Posts are now sorted by date Aaron Sun 2019-11-29 20:02:13 -08:00
• b83eb0c897 saved states of post for each user Aditya Sankaran 2019-11-29 20:18:51 -05:00
• fee2225745 Disable or enable Direct Messages Clayton Wilson 2019-11-27 23:06:25 -05:00
• 0d8850c45d Comment out logging in fbAuth.js Clayton Wilson 2019-11-27 21:53:02 -05:00
• f7ef0cb333 Fix DM message content overflowing Clayton Wilson 2019-11-27 21:52:14 -05:00
• 731e01c552 Comment out some lines in users.js that were throwing errors Clayton Wilson 2019-11-27 21:51:16 -05:00
• 0c9778949a Merge pull request #94 from ClaytonWWilson/engage_microblog asankaran35 2019-11-27 21:09:32 -05:00
• 1a2af4e9bb Merge branch 'master' into engage_microblog engage_microblog asankaran35 2019-11-27 21:08:55 -05:00
• c34f06f130 formatted feed and userline Aditya Sankaran 2019-11-27 20:57:42 -05:00
• 3814377817 Display loading icon when the user logs in or signs up Clayton Wilson 2019-11-25 13:55:03 -05:00
• 1482830131 Pulled latest version from master and fixed all conflicts Aaron Sun 2019-11-24 17:08:13 -08:00
• 9fff6ed81c changed status code for follow/unfollow Leon Liang 2019-11-22 18:23:49 -05:00
• 445687cc54 Automatically display new Direct Messages Clayton Wilson 2019-11-22 18:21:52 -05:00
• 331509da7f Direct Messages sending DMs Clayton Wilson 2019-11-22 16:44:53 -05:00
• 64cc9bd156 Merge pull request #91 from ClaytonWWilson/fix_profile Leon Liang 2019-11-21 20:21:24 -05:00
• 6a78d74930 simplified backend get/remove topic function Leon Liang 2019-11-21 20:20:54 -05:00
• 4e817c9647 integrated backend change, added pointer cursor Leon Liang 2019-11-21 20:09:47 -05:00
• 7976110e2b modified function to add/delete topic only from user Leon Liang 2019-11-21 19:59:04 -05:00
• 3da2449050 change topic display to user-specific topics Leon Liang 2019-11-21 18:10:44 -05:00
• 607ea3fd55 Merge pull request #83 from ClaytonWWilson/edit-profile-linking Leon Liang 2019-11-21 17:58:56 -05:00
• ad0b21e629 Tested likes and shares via hardcode Aaron Sun 2019-11-21 17:13:33 -05:00
• e8110d643f finished quoting microblogs Aditya Sankaran 2019-11-21 15:42:43 -05:00
• e06cc614cb Dynamic front-end adding new DM channels Clayton Wilson 2019-11-20 20:48:49 -05:00
• 709df1492d Changed how back-end DMs worked Clayton Wilson 2019-11-20 20:32:11 -05:00
• e1343d503c Made the date in posts look prettier Aaron Sun 2019-11-19 23:32:37 -05:00
• c3091cc10a Merge pull request #90 from ClaytonWWilson/auto_complete Leon Liang 2019-11-19 22:31:52 -05:00
• 81749c19ce completed search page and redirect to user profile page Leon Liang 2019-11-19 22:30:15 -05:00
• 1ccc195036 liking and unliking work Aditya Sankaran 2019-11-19 21:09:07 -05:00
• 0aaa9014b9 Merge pull request #88 from ClaytonWWilson/user_page Leon Liang 2019-11-19 19:22:48 -05:00
• 3d9266778d Direct Messages can use redux for creating new DM channels Clayton Wilson 2019-11-19 19:04:25 -05:00
• 2de3da928a added UI for follow and unfollow other user Leon Liang 2019-11-19 19:03:28 -05:00
• 297619cacb Tweaking DM back-end functions Clayton Wilson 2019-11-19 19:02:13 -05:00
• 42c53fdbc4 Add profile image, topics for other user page Leon Liang 2019-11-19 15:56:39 -05:00
• c8aa1fd050 Added page to display other users' profile Leon Liang 2019-11-19 13:57:24 -05:00
• 54ba36abeb All done with only showing posts user is interested in Aaron Sun 2019-11-19 12:25:55 -05:00
• a59c2feb4a Fix sorting so empty DM channels go to the bottom of the list Clayton Wilson 2019-11-19 01:30:00 -05:00
• 0f1cfe0393 Front-end layout mostly completed Clayton Wilson 2019-11-19 01:18:20 -05:00
• 953d58ea12 Can filter posts via subcollection iteration but from only 1 user Aaron Sun 2019-11-18 23:45:14 -05:00
• b9ca0dc492 Modified code structure for filter posts Aaron Sun 2019-11-18 22:17:33 -05:00
• 4d4b085a2b Can filter posts via hardcoded topics Aaron Sun 2019-11-18 22:01:28 -05:00
• 1a2f269466 Filtered timeline posts to only followers Aaron Sun 2019-11-17 22:36:52 -05:00
• 6184a22607 Fixed conflicts with Sprint 2 checkpoint and the most up-to-date version Aaron Sun 2019-11-17 10:32:59 -05:00
• c6022dbc38 Merge pull request #86 from ClaytonWWilson/subscribe Leon Liang 2019-11-15 17:49:59 -05:00
• 1d26eb97ad Added function to follow and unfollow users Leon Liang 2019-11-15 17:47:47 -05:00
• 63e917f54c Fixed the sorting of messages Clayton Wilson 2019-11-15 15:20:39 -05:00
• 2f5ec1c5ac Basic style for direct messages Clayton Wilson 2019-11-12 23:50:53 -05:00
• f08db94f0d before npm rebuild filteredPostsWithTopics shobhitm23 2019-11-12 14:48:58 -05:00
• 5ad28dc254 Basic logic shobhitm23 2019-11-12 14:12:18 -05:00
• 19f8f70bf2 Fixing DMList errors Clayton Wilson 2019-11-08 18:48:00 -05:00
• 4958723a42 Filtering just with topics shobhitm23 2019-11-08 18:08:28 -05:00
• 02197ee940 Sending Direct Messages Clayton Wilson 2019-11-08 17:54:56 -05:00
• 83052f0a80 user Feed aditya Aditya Sankaran 2019-11-08 17:09:57 -05:00
• 5507247a7f Create a new DM channel between two users Clayton Wilson 2019-11-08 11:42:46 -05:00
• 5560b6e13c Refactor DM enabled checking to make it re-usable Clayton Wilson 2019-11-06 01:01:50 -05:00
• 19d78596b5 Check for DMs enabled or disabled Clayton Wilson 2019-11-05 22:43:29 -05:00
• 9372a092ad Fix edit profile button link Clayton Wilson 2019-11-05 17:43:19 -05:00