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

• de72bd9223 added alert to user's page Leon Liang 2019-12-05 13:45:58 -0500
• b85bee7cba Fix merge issue Clayton Wilson 2019-12-05 13:41:24 -0500
• 76330fd234
  Merge pull request #108 from ClaytonWWilson/send-microblog-loading Clayton Wilson 2019-12-05 13:38:53 -0500
• 23f1114cc5 Dark Mode implementation impDarkTheme shobhitm23 2019-12-05 13:38:06 -0500
• b007666317
  Merge branch 'master' into send-microblog-loading Clayton Wilson 2019-12-05 13:38:04 -0500
• a0d2532c22 Add circular progress to home page Clayton Wilson 2019-12-05 13:35:19 -0500
• 739b1cc92a Add circular progress to other user page Clayton Wilson 2019-12-05 13:22:29 -0500
• 57087a5ea3 Add circular progress to user page Clayton Wilson 2019-12-05 13:08:59 -0500
• 3424a7d34f
  Merge pull request #107 from ClaytonWWilson/finalfix Leon Liang 2019-12-05 13:02:52 -0500
• 1aff5ba99b Add circular progress to writing_microblogs Clayton Wilson 2019-12-05 12:56:05 -0500
• 2bcf6bfcb3 filter by followed user Leon Liang 2019-12-05 12:48:26 -0500
• bae2947003 Merge branch 'admin-delete' of https://github.com/ClaytonWWilson/CS307-Team24 into admin-delete:x Danny Voltz 2019-12-05 12:25:19 -0500
• 96423cee8a Admin User Stories Danny Voltz 2019-12-05 12:12:25 -0500
• f9a45ffe07
  Merge pull request #84 from ClaytonWWilson/dms Clayton Wilson 2019-12-04 22:47:50 -0500
• 17c7e989ef cleared modal for quoting when hitting cancel button Aditya Sankaran 2019-12-04 19:37:53 -0500
• efecf3b02a fixed stuff Aditya Sankaran 2019-12-04 18:48:08 -0500
• 8b4c32b81f syntax error Aditya Sankaran 2019-12-04 18:20:28 -0500
• 323cb5bcee Revert "module fuse and syntax errors fixed" Aditya Sankaran 2019-12-04 18:15:37 -0500
• 4a4733f593 module fuse and syntax errors fixed Aditya Sankaran 2019-12-04 18:09:36 -0500
• 35cec7abf3
  Merge pull request #106 from ClaytonWWilson/likes asankaran35 2019-12-04 17:42:03 -0500
• 6989091fb1
  Merge branch 'master' into likes asankaran35 2019-12-04 17:41:28 -0500
• 699ea23750 quoting fix Aditya Sankaran 2019-12-04 17:16:41 -0500
• 0bcfdcdd6c Fix deploy error Clayton Wilson 2019-12-04 17:10:26 -0500
• 4e5b100968 Fix merge issues and change layout of NavBar Clayton Wilson 2019-12-04 16:57:56 -0500
• 374c4d45b0
  Merge branch 'master' into dms Clayton Wilson 2019-12-04 15:56:42 -0500
• 7efed257f2
  Merge pull request #105 from ClaytonWWilson/display-profile-images-on-posts Clayton Wilson 2019-12-04 15:37:59 -0500
• 99ffbe52a4 Posts on Home now display profile images Clayton Wilson 2019-12-04 15:37:09 -0500
• 856cb8630e readded post.js. got deleted for some reason Aditya Sankaran 2019-12-04 14:42:43 -0500
• 0776728e73
  Merge pull request #60 from ClaytonWWilson/edit-profile-image-upload Clayton Wilson 2019-12-04 00:31:07 -0500
• 77a3ba9f69 Fix merge issues Clayton Wilson 2019-12-04 00:30:23 -0500
• 7a0a5725b7
  Merge branch 'master' into edit-profile-image-upload Clayton Wilson 2019-12-04 00:02:03 -0500
• 79051f2243 Error checking and deleting old profile image Clayton Wilson 2019-12-03 23:46:04 -0500
• 94db3f451d
  Merge pull request #104 from ClaytonWWilson/fix-warnings Clayton Wilson 2019-12-03 20:55:55 -0500
• fd1718a1f4 Fixing more errors Clayton Wilson 2019-12-03 20:54:54 -0500
• 7fd976d4cb
  Merge branch 'master' into fix-warnings Clayton Wilson 2019-12-03 20:34:08 -0500
• 72d099e05e Fixing errors and warnings Clayton Wilson 2019-12-03 20:26:31 -0500
• f3fcd5ee8d
  Merge pull request #103 from ClaytonWWilson/others_topic Leon Liang 2019-12-03 19:16:17 -0500
• 7141bf9000 changed color if user is following the same topic Leon Liang 2019-12-03 19:15:23 -0500
• ebca5192e0 Change storageBucket to variable Clayton Wilson 2019-12-03 18:20:20 -0500
• acecf704dc
  Merge pull request #102 from ClaytonWWilson/otheruser_posts Leon Liang 2019-12-03 18:14:40 -0500
• 56e836451d display posts on other user's page Leon Liang 2019-12-03 18:11:10 -0500
• 1747a29c2e Fix not image not uploading when deployed Clayton Wilson 2019-12-03 17:47:09 -0500
• 041e53c36f
  Merge pull request #101 from ClaytonWWilson/confirm-delete Clayton Wilson 2019-12-03 16:40:00 -0500
• 2d426840c0 Add @ next to handle on editProfile Clayton Wilson 2019-12-03 16:37:57 -0500
• 5b5e785142 Changed the path of the editProfile page Clayton Wilson 2019-12-03 16:37:04 -0500
• a4cce0b75e Circular progress when the editProfile page is loading Clayton Wilson 2019-12-03 16:26:54 -0500
• 825c126c6c Delete asks you to confirm Clayton Wilson 2019-12-03 16:26:16 -0500
• 49a4d55f1e Rename edit class to editProfile to be more descriptive Clayton Wilson 2019-12-03 14:04:40 -0500
• b4f4dec9ca
  Merge pull request #93 from ClaytonWWilson/fix-login-loading Clayton Wilson 2019-12-03 13:50:55 -0500
• f0c4a2974f Fix mismatched parenthesis Clayton Wilson 2019-12-03 13:49:37 -0500
• c26ff21b20
  Merge branch 'master' into fix-login-loading Clayton Wilson 2019-12-03 13:44:12 -0500
• 3092fabfd2
  Merge pull request #85 from ClaytonWWilson/microblogs-material-ui Clayton Wilson 2019-12-03 13:35:27 -0500
• 1a6aae6545
  Fixed mismatched parenthesis Clayton Wilson 2019-12-03 13:33:48 -0500
• 4abaa13b09
  Merge branch 'master' into microblogs-material-ui Clayton Wilson 2019-12-03 13:24:36 -0500
• 09a3ccd12d
  Merge branch 'master' into dms Clayton Wilson 2019-12-03 13:21:30 -0500
• f7058a520d
  Merge pull request #99 from ClaytonWWilson/improve-search Clayton Wilson 2019-12-03 13:19:53 -0500
• 1a02b53d0f Improved speed of search and made it fuzzy search Clayton Wilson 2019-12-03 00:54:06 -0500
• e4ea325fb8 Liking posts with Redux and Material UI Clayton Wilson 2019-12-02 20:18:44 -0500
• 6e32b25861
  Merge pull request #98 from ClaytonWWilson/fix_follow Leon Liang 2019-12-02 18:39:09 -0500
• 684ccd1a85
  Merge branch 'master' into fix_follow Leon Liang 2019-12-02 18:38:54 -0500
• f0ddaa30b1 add topics when publish new post Leon Liang 2019-12-02 18:31:33 -0500
• 8244631d4d Fix some code after merge Clayton Wilson 2019-12-02 16:40:22 -0500
• 4d97afcb09
  Merge branch 'master' into microblogs-material-ui Clayton Wilson 2019-12-02 16:29:52 -0500
• 88064c55a3
  Merge branch 'master' into dms Clayton Wilson 2019-12-02 16:21:26 -0500
• 7c7256acbd Fixed having multiple return statements in post.js Clayton Wilson 2019-12-02 15:47:26 -0500
• cff0fd4e05 DMs are deleted when the delete function runs Clayton Wilson 2019-12-02 15:46:13 -0500
• e218708e0a
  Merge pull request #95 from ClaytonWWilson/fix_follow Leon Liang 2019-12-02 00:08:07 -0500
• 445c8b39de allow delete without refreshing page Leon Liang 2019-12-02 00:00:25 -0500
• 6e8b7f410a saved liked posts Aditya Sankaran 2019-12-01 15:55:53 -0500
• 07a8f0b7bb userline frontend shows quoted posts Aditya Sankaran 2019-11-30 18:23:46 -0500
• 54cd1c44a7 edited userline database function Aditya Sankaran 2019-11-30 18:11:33 -0500
• ca7f793d4c likeCount updating auto Aditya Sankaran 2019-11-30 16:50:20 -0500
• a36212c23d quoting mblogs userline Aditya Sankaran 2019-11-30 12:16:30 -0500
• e3593e2f29 Left-aligned the text in posts Aaron Sun 2019-11-29 21:11:10 -0800
• 4b440d28de Fixed a small bug in sorting userline posts Aaron Sun 2019-11-29 20:17:21 -0800
• 81593cee52 Posts are now sorted by date Aaron Sun 2019-11-29 20:02:13 -0800
• b83eb0c897 saved states of post for each user Aditya Sankaran 2019-11-29 20:18:51 -0500
• fee2225745 Disable or enable Direct Messages Clayton Wilson 2019-11-27 23:06:25 -0500
• 0d8850c45d Comment out logging in fbAuth.js Clayton Wilson 2019-11-27 21:53:02 -0500
• f7ef0cb333 Fix DM message content overflowing Clayton Wilson 2019-11-27 21:52:14 -0500
• 731e01c552 Comment out some lines in users.js that were throwing errors Clayton Wilson 2019-11-27 21:51:16 -0500
• 0c9778949a
  Merge pull request #94 from ClaytonWWilson/engage_microblog asankaran35 2019-11-27 21:09:32 -0500
• 1a2af4e9bb
  Merge branch 'master' into engage_microblog engage_microblog asankaran35 2019-11-27 21:08:55 -0500
• c34f06f130 formatted feed and userline Aditya Sankaran 2019-11-27 20:57:42 -0500
• 3814377817 Display loading icon when the user logs in or signs up Clayton Wilson 2019-11-25 13:55:03 -0500
• 1482830131 Pulled latest version from master and fixed all conflicts Aaron Sun 2019-11-24 17:08:13 -0800
• 9fff6ed81c changed status code for follow/unfollow Leon Liang 2019-11-22 18:23:49 -0500
• 445687cc54 Automatically display new Direct Messages Clayton Wilson 2019-11-22 18:21:52 -0500
• 331509da7f Direct Messages sending DMs Clayton Wilson 2019-11-22 16:44:53 -0500
• 64cc9bd156
  Merge pull request #91 from ClaytonWWilson/fix_profile Leon Liang 2019-11-21 20:21:24 -0500
• 6a78d74930 simplified backend get/remove topic function Leon Liang 2019-11-21 20:20:54 -0500
• 4e817c9647 integrated backend change, added pointer cursor Leon Liang 2019-11-21 20:09:47 -0500
• 7976110e2b modified function to add/delete topic only from user Leon Liang 2019-11-21 19:59:04 -0500
• 3da2449050 change topic display to user-specific topics Leon Liang 2019-11-21 18:10:44 -0500
• 607ea3fd55
  Merge pull request #83 from ClaytonWWilson/edit-profile-linking Leon Liang 2019-11-21 17:58:56 -0500
• ad0b21e629 Tested likes and shares via hardcode Aaron Sun 2019-11-21 17:13:33 -0500
• e8110d643f finished quoting microblogs Aditya Sankaran 2019-11-21 15:42:43 -0500
• e06cc614cb Dynamic front-end adding new DM channels Clayton Wilson 2019-11-20 20:48:49 -0500
• 709df1492d Changed how back-end DMs worked Clayton Wilson 2019-11-20 20:32:11 -0500
• e1343d503c Made the date in posts look prettier Aaron Sun 2019-11-19 23:32:37 -0500