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

• 7a6ac8499c fix merge Clayton Wilson 2019-11-05 17:38:11 -05:00
• 6149e15b35 Profile page kinda works on mobile Clayton Wilson 2019-11-05 17:35:16 -05:00
• 80670d054e Main layout of profile page Clayton Wilson 2019-11-05 16:32:16 -05:00
• 947e5b01a4 Converted tabs back to spaces Clayton Wilson 2019-10-29 23:02:36 -04:00
• 7cc8a3f11f Fixing up profile UI Clayton Wilson 2019-10-28 23:25:12 -04:00
• 7476833f0a Main layout of profile page Clayton Wilson 2019-11-05 16:32:16 -05:00
• a2ed627f2b Back-end for getting all the DMs for a user Clayton Wilson 2019-11-04 13:21:47 -05:00
• bbbfc4b750 Editprofile move button positions Clayton Wilson 2019-11-03 21:10:57 -05:00
• 38df4ef087 Added styles and spaced cards Clayton Wilson 2019-11-03 15:29:39 -05:00
• 2bd1c08c2c Writing_Microblogs to Material-UI and UI improvements Clayton Wilson 2019-11-03 15:17:14 -05:00
• 6924af58a7 progress for admin delete Danny Voltz 2019-11-01 15:40:26 -05:00
• 903ea35662 Fix indents Clayton Wilson 2019-11-01 16:19:54 -04:00
• 49ce28109b Improved Fonts frontEnd shobhitm23 2019-11-01 16:15:45 -04:00
• e644498108 Merge pull request #67 from ClaytonWWilson/verify-profile Clayton Wilson 2019-11-01 16:11:53 -04:00
• 97bc9c4fb1 Verify users front-end Clayton Wilson 2019-11-01 16:11:02 -04:00
• 1846165c85 Improving Login Page ImprovingUI shobhitm23 2019-11-01 15:59:24 -04:00
• f2dac314e5 Merge pull request #74 from ClaytonWWilson/Beautify Shobhit Makhija 2019-11-01 15:39:57 -04:00
• b01aa92f96 Add post id Clayton Wilson 2019-11-01 15:39:08 -04:00
• 3f24d90fef Merge branch 'Beautify' shobhitm23 2019-11-01 15:37:54 -04:00
• d3bfd8b5f3 Fixing UI Beautify shobhitm23 2019-11-01 15:36:22 -04:00
• d6876eab0b Fix .then() must return Clayton Wilson 2019-11-01 14:28:49 -04:00
• f4bedea2c7 Merge branch 'master' into verify-profile Clayton Wilson 2019-11-01 13:40:30 -04:00
• d4ea00d2e9 Merge pull request #72 from ClaytonWWilson/fix-delete Clayton Wilson 2019-11-01 13:26:25 -04:00
• acd33d6a96 Merge branch 'master' into fix-delete Clayton Wilson 2019-11-01 13:26:11 -04:00
• cc20e30990 work Aditya Sankaran 2019-11-01 13:20:34 -04:00
• 3fa4cd7033 Changing writing microblogs to Material-UI Clayton Wilson 2019-11-01 13:02:37 -04:00
• ab07d45205 Fix loading on image upload, so it waits for new image Clayton Wilson 2019-11-01 10:12:54 -04:00
• 6dbca16ace connecting Aditya Sankaran 2019-11-01 04:42:44 -04:00
• f1e4362205 Change imageFileName from const to let Clayton Wilson 2019-11-01 00:37:49 -04:00
• 1e4b2d16ef Fix edge case Clayton Wilson 2019-11-01 00:29:22 -04:00
• e8e69cec31 Delete removes all data now Clayton Wilson 2019-11-01 00:26:01 -04:00
• ae89e3d63b Merge pull request #69 from ClaytonWWilson/search_page Leon Liang 2019-10-31 16:57:38 -04:00
• f60c045483 Merge branch 'master' into search_page Leon Liang 2019-10-31 16:57:22 -04:00
• 1842eef2f8 added search page Leon Liang 2019-10-31 16:54:34 -04:00
• 56323801aa Merge pull request #65 from ClaytonWWilson/auth-backend-3 Clayton Wilson 2019-10-31 16:14:22 -04:00
• ce984df437 Merge branch 'master' into auth-backend-3 Clayton Wilson 2019-10-31 16:09:17 -04:00
• b45fc3640c changed putPost function to see postID filteredPosts shobhitm23 2019-10-31 15:46:40 -04:00
• 112988c8fb Add '@' to profile handle Clayton Wilson 2019-10-31 15:46:33 -04:00
• 51fc965a90 changed variable name to postId shobhitm23 2019-10-31 15:29:54 -04:00
• 325d37f0de Back-end for verifying users Clayton Wilson 2019-10-31 15:12:22 -04:00
• 35e5cf8e9d revert changes that I f ed up Leon Liang 2019-10-31 15:11:16 -04:00
• 649b9b4a69 Merge pull request #68 from ClaytonWWilson/delete_topic Leon Liang 2019-10-31 14:44:41 -04:00
• e73b2d02f3 Merge branch 'master' into delete_topic Leon Liang 2019-10-31 14:44:03 -04:00
• 50bc73870b delete topic fully works Leon Liang 2019-10-31 14:32:54 -04:00
• a4b7f7a107 Added post.id in backend to display posts shobhitm23 2019-10-31 14:15:40 -04:00
• ca1d86acf1 Users can be verified and have a check mark displayed on their profiles Clayton Wilson 2019-10-31 13:56:40 -04:00
• 12938e8e9a comment out redux Aditya Sankaran 2019-10-30 21:55:48 -04:00
• 84ad61b954 liking and quoting work Aditya Sankaran 2019-10-30 18:31:55 -04:00
• da14700987 Fixed a small bug with the Delete Account button Aaron Sun 2019-10-30 18:15:01 -04:00
• 26afabe709 All posts from db can now show on home page timeline Aaron Sun 2019-10-30 18:04:35 -04:00
• a61c296ddf Made the posts look prettier Aaron Sun 2019-10-30 16:12:53 -04:00
• 1337071bec UI can now display all features of a post Aaron Sun 2019-10-30 15:07:19 -04:00
• cd19364efc Can now display post body on profile page Aaron Sun 2019-10-30 11:40:44 -04:00
• 3c31db9bf5 Converted tabs back to spaces Clayton Wilson 2019-10-29 23:02:36 -04:00
• 8438ce27cf Get user's posts works now Aaron Sun 2019-10-29 22:25:38 -04:00
• 6db14e3868 Improved the profile page format Aaron Sun 2019-10-29 19:39:11 -04:00
• c96c77cd9f Debugging upload issues Clayton Wilson 2019-10-29 15:00:21 -04:00
• 16567e2373 Merge pull request #63 from ClaytonWWilson/auth-backend-3 DreamCoder23 2019-10-29 14:40:02 -04:00
• 7341de742e Fixing some issues with retrieving posts Clayton Wilson 2019-10-29 14:28:53 -04:00
• d3a77afe43 Pulled and merged the latest code from master Aaron Sun 2019-10-29 14:02:56 -04:00
• 2fc37e3e34 Added link in index.js shobhitm23 2019-10-29 13:45:36 -04:00
• fb6c1e3d98 Image upload edit some return messages Clayton Wilson 2019-10-29 12:40:38 -04:00
• 42b73632c0 Delete user's posts fully works now Aaron Sun 2019-10-29 10:34:09 -04:00
• 3d875e2bde Fixing up profile UI Clayton Wilson 2019-10-28 23:25:12 -04:00
• b20408c144 delete topic Leon Liang 2019-10-28 21:38:32 -04:00
• c482f56762 Invalid credential message displays after non-exisitng email is passed in Aaron Sun 2019-10-28 20:14:38 -04:00
• 9525ff7d0a Delete post works in Postman but not in actual database Aaron Sun 2019-10-28 17:57:03 -04:00
• 3f3a93be8c Added getAllPosts shobhitm23 2019-10-28 14:02:55 -04:00
• f602b8251f Merge pull request #61 from ClaytonWWilson/filteredPosts Shobhit Makhija 2019-10-28 01:34:43 -04:00
• d6a0b0b1bc Displaying posts with image, time and content shobhitm23 2019-10-28 01:33:20 -04:00
• 70a12dcca4 Arrow-callback warning shobhitm23 2019-10-28 00:21:29 -04:00
• 3001ec0b38 Merge branch 'master' into edit-profile-image-upload Clayton Wilson 2019-10-27 23:46:15 -04:00
• e8a403f575 Delete old profile image Clayton Wilson 2019-10-27 23:43:35 -04:00
• 657277bcad Username and user id now show in post data Aaron Sun 2019-10-27 23:11:24 -04:00
• d69828ef7f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 into auth-backend-3 Aaron Sun 2019-10-27 20:48:15 -04:00
• 44d3450b10 Profile image upload frontend and backend finished Clayton Wilson 2019-10-27 18:06:47 -04:00
• 5fa4caf0a3 Log in with username fully works now Aaron Sun 2019-10-27 17:47:04 -04:00
• fd226b454e Delete users fully works now Aaron Sun 2019-10-27 14:46:31 -04:00
• 97998a8f09 merge changes Leon Liang 2019-10-27 13:24:53 -04:00
• 13a1401759 Reformat code Leon Liang 2019-10-27 02:53:12 -04:00
• 0bbc453d54 Merge pull request #55 from ClaytonWWilson/delete_topic Leon Liang 2019-10-27 00:10:56 -04:00
• e236ceeb4b Merge branch 'master' into delete_topic Leon Liang 2019-10-27 00:10:38 -04:00
• 1c81ae1663 show user's profile image Leon Liang 2019-10-27 00:09:17 -04:00
• c356dd18fa added UI allowing topic creation Leon Liang 2019-10-27 00:08:38 -04:00
• 19780a1395 made userline not hardcoded Aditya Sankaran 2019-10-26 17:06:42 -04:00
• 981795b288 writing microblogs not hardcoded anymore Aditya Sankaran 2019-10-26 16:57:25 -04:00
• ec041732d9 reformat Leon Liang 2019-10-25 23:14:25 -04:00
• eb3766edb2 Merge pull request #54 from ClaytonWWilson/delete_topic Leon Liang 2019-10-25 23:13:27 -04:00
• d9f6fb5d8e added function to delete topic Leon Liang 2019-10-25 23:04:09 -04:00
• b31a571b29 Add followedTopics array on signup Clayton Wilson 2019-10-25 19:27:45 -04:00
• 637c4205af Revert "Status working page" shobhit shobhitm23 2019-10-25 18:16:07 -04:00
• 60f83da514 Merge pull request #47 from ClaytonWWilson/block_topics Clayton Wilson 2019-10-25 15:31:12 -04:00
• 41bcc78c3a Fix login page loop bug Clayton Wilson 2019-10-25 15:20:10 -04:00
• f82f9984c6 Comment out axios.defaults.baseUrl Clayton Wilson 2019-10-25 14:33:23 -04:00
• 6335690046 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aditya Sankaran 2019-10-25 13:15:53 -04:00
• 9d1f987ac1 added userID property for posts Aditya Sankaran 2019-10-25 13:15:17 -04:00
• b255006f7a Merge pull request #45 from ClaytonWWilson/display_topic Leon Liang 2019-10-25 01:57:14 -04:00
• f13580c727 display topics under profile Leon Liang 2019-10-25 01:56:07 -04:00
• 4ec560de75 made logo background transparent Leon Liang 2019-10-25 00:00:43 -04:00
• 65ac1c7384 Merge pull request #43 from ClaytonWWilson/add_topic_user Leon Liang 2019-10-24 23:13:39 -04:00