CS307-Team24

ClaytonWWilson/CS307-Team24

Fork 0

mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-15 18:08:46 +00:00

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

f602b8251f

Merge pull request #61 from ClaytonWWilson/filteredPosts Shobhit Makhija 2019-10-28 01:34:43 -0400
d6a0b0b1bc Displaying posts with image, time and content shobhitm23 2019-10-28 01:33:20 -0400
70a12dcca4 Arrow-callback warning shobhitm23 2019-10-28 00:21:29 -0400
3001ec0b38

Merge branch 'master' into edit-profile-image-upload Clayton Wilson 2019-10-27 23:46:15 -0400
e8a403f575 Delete old profile image Clayton Wilson 2019-10-27 23:43:35 -0400
657277bcad Username and user id now show in post data Aaron Sun 2019-10-27 23:11:24 -0400
d69828ef7f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 into auth-backend-3 Aaron Sun 2019-10-27 20:48:15 -0400
44d3450b10 Profile image upload frontend and backend finished Clayton Wilson 2019-10-27 18:06:47 -0400
5fa4caf0a3 Log in with username fully works now Aaron Sun 2019-10-27 17:47:04 -0400
fd226b454e Delete users fully works now Aaron Sun 2019-10-27 14:46:31 -0400
97998a8f09 merge changes Leon Liang 2019-10-27 13:24:53 -0400
13a1401759 Reformat code Leon Liang 2019-10-27 02:53:12 -0400
0bbc453d54

Merge pull request #55 from ClaytonWWilson/delete_topic Leon Liang 2019-10-27 00:10:56 -0400
e236ceeb4b

Merge branch 'master' into delete_topic Leon Liang 2019-10-27 00:10:38 -0400
1c81ae1663 show user's profile image Leon Liang 2019-10-27 00:09:17 -0400
c356dd18fa added UI allowing topic creation Leon Liang 2019-10-27 00:08:38 -0400
19780a1395 made userline not hardcoded Aditya Sankaran 2019-10-26 17:06:42 -0400
981795b288 writing microblogs not hardcoded anymore Aditya Sankaran 2019-10-26 16:57:25 -0400
ec041732d9 reformat Leon Liang 2019-10-25 23:14:25 -0400
eb3766edb2

Merge pull request #54 from ClaytonWWilson/delete_topic Leon Liang 2019-10-25 23:13:27 -0400
d9f6fb5d8e added function to delete topic Leon Liang 2019-10-25 23:04:09 -0400
b31a571b29

Add followedTopics array on signup Clayton Wilson 2019-10-25 19:27:45 -0400
637c4205af Revert "Status working page" shobhit shobhitm23 2019-10-25 18:16:07 -0400
60f83da514

Merge pull request #47 from ClaytonWWilson/block_topics Clayton Wilson 2019-10-25 15:31:12 -0400
41bcc78c3a Fix login page loop bug Clayton Wilson 2019-10-25 15:20:10 -0400
f82f9984c6

Comment out axios.defaults.baseUrl Clayton Wilson 2019-10-25 14:33:23 -0400
6335690046 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aditya Sankaran 2019-10-25 13:15:53 -0400
9d1f987ac1 added userID property for posts Aditya Sankaran 2019-10-25 13:15:17 -0400
b255006f7a

Merge pull request #45 from ClaytonWWilson/display_topic Leon Liang 2019-10-25 01:57:14 -0400
f13580c727 display topics under profile Leon Liang 2019-10-25 01:56:07 -0400
4ec560de75 made logo background transparent Leon Liang 2019-10-25 00:00:43 -0400
65ac1c7384

Merge pull request #43 from ClaytonWWilson/add_topic_user Leon Liang 2019-10-24 23:13:39 -0400
340d3537a6 created functions retrieving all topics Leon Liang 2019-10-24 23:13:03 -0400
de44f1eb89 Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 Leon Liang 2019-10-24 22:43:32 -0400
5405d96150 created function to add topic Leon Liang 2019-10-24 22:42:46 -0400
0e6af081fa

Merge pull request #42 from ClaytonWWilson/update-navbar Clayton Wilson 2019-10-24 22:41:04 -0400
021e25de86 Make NavBar display login/signup/logout correctly Clayton Wilson 2019-10-24 22:38:42 -0400
de38339cad

Merge pull request #39 from ClaytonWWilson/profile_display Leon Liang 2019-10-24 22:12:27 -0400
a498b4748f

Merge branch 'master' into profile_display Leon Liang 2019-10-24 22:12:02 -0400
4200c05ca1 added profile display Leon Liang 2019-10-24 22:08:49 -0400
6e9a86e5ce changed getUser Leon Liang 2019-10-24 22:08:28 -0400
97650f6539 added axios baseURL Leon Liang 2019-10-24 22:08:09 -0400
4aa029c649 modified getUserDetails Leon Liang 2019-10-24 19:34:31 -0400
1b3ac4d05a

Merge pull request #35 from ClaytonWWilson/edit-profile-fix Clayton Wilson 2019-10-24 19:32:05 -0400
64c10cd172 Rename variable to make code more concise Clayton Wilson 2019-10-24 19:30:21 -0400
37cce6c828 deleted profile.js Leon Liang 2019-10-24 17:48:39 -0400
bcaf0920a6 deleted staticProfile Leon Liang 2019-10-24 17:45:41 -0400
b16c3eb50f

Merge pull request #33 from ClaytonWWilson/auth-backend-3 Leon Liang 2019-10-24 17:09:58 -0400
79d23af3fc

Merge branch 'master' into auth-backend-3 Leon Liang 2019-10-24 17:09:45 -0400
52bd8eed64 Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 Leon Liang 2019-10-24 17:07:29 -0400
ac28b3e19e getUserDetails is now working Leon Liang 2019-10-24 17:06:44 -0400
570866ff40 getUserDetail returns only user handle Leon Liang 2019-10-24 16:27:22 -0400
bdad36957c package lock Leon Liang 2019-10-24 16:25:29 -0400
e524bc2811 pass in fbAuth to getUserDetails Leon Liang 2019-10-24 16:25:19 -0400
714e6a4e07 new adminsdk Leon Liang 2019-10-24 16:24:56 -0400
cdbf0fcdc6 renew adminsdk Leon Liang 2019-10-24 16:24:33 -0400
8f5020f881 Fixing editProfile bugs and making the database storage more efficient Clayton Wilson 2019-10-24 15:44:53 -0400
eea2f56b49 Code for removing user from db still in progress (commented out) Aaron Sun 2019-10-24 15:27:20 -0400
de4018a6d2

Merge pull request #34 from ClaytonWWilson/edit-profile-fix Clayton Wilson 2019-10-24 13:23:03 -0400
b17fb1f3f0 Update fbAuth so the user data from firebase is stored in req.userData Clayton Wilson 2019-10-23 23:16:43 -0400
a7d34eca09 Status working page shobhitm23 2019-10-23 22:11:52 -0400
45f88861c8 Delete Account works on the UI now Aaron Sun 2019-10-23 18:08:42 -0400
ad853923c8 Delete Account on UI can log the user out Aaron Sun 2019-10-23 17:18:52 -0400
bc0b2549b4 Delete user backend code works Aaron Sun 2019-10-22 20:45:48 -0400
e984afff74 modified profile.js Leon Liang 2019-10-22 18:26:21 -0400
1b66f18dd5 Log in with username partially works Aaron Sun 2019-10-22 16:50:38 -0400
dede04aa8e added dependency Leon Liang 2019-10-22 15:08:38 -0400
bb0343ab30 Remove redundant profile Leon Liang 2019-10-22 15:08:07 -0400
7b8e40c7b0 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aaron Sun 2019-10-22 14:33:46 -0400
c5942a6634

Merge pull request #31 from ClaytonWWilson/login-frontend Clayton Wilson 2019-10-22 13:57:05 -0400
e062ffbb41 Comment out extra /user path declaration Clayton Wilson 2019-10-22 13:17:43 -0400
d476cbc893 Test 2 commit shobhitm23 2019-10-22 00:08:13 -0400
80e01714d8 Test Commit shobhitm23 2019-10-22 00:06:57 -0400
cb4885cadf Switched proxy back to cloud Aaron Sun 2019-10-20 21:49:21 -0400
d2032eef75 Login with username works now Aaron Sun 2019-10-20 21:45:24 -0400
adf3da4bb8

Merge pull request #29 from ClaytonWWilson/login-frontend Clayton Wilson 2019-10-11 18:24:13 -0400
76ef3a6561 Fixing merge conflicts Clayton Wilson 2019-10-11 17:58:55 -0400
b337277aa4 Fix login-frontend merge conflicts Clayton Wilson 2019-10-11 17:46:38 -0400
f4b44c9654 Fix for Redux DevTools not being installed causing a crash Clayton Wilson 2019-10-11 17:35:21 -0400
27efa858d5 Signup is working Clayton Wilson 2019-10-11 17:34:35 -0400
00ed9d64c5 store.js Clayton Wilson 2019-10-10 14:13:04 -0400
d1233e77ed Logout is working now : ) Clayton Wilson 2019-10-09 12:03:57 -0400
bb6c7a07fc Register.js renamed to Signup.js Clayton Wilson 2019-10-07 21:00:52 -0400
9eb4f603df Logout is working ^_^ Clayton Wilson 2019-10-07 20:46:28 -0400
8179b51844 Before finishing authentication Clayton Wilson 2019-10-07 20:24:23 -0400
f1e5c584e1 added alert Danny Voltz 2019-10-03 12:00:58 -0500
c2ef222cf6

Merge pull request #28 from ClaytonWWilson/profile_display Leon Liang 2019-10-03 11:53:31 -0400
3cbcb5054c Modifed user.js using grid displaying Leon Liang 2019-10-03 11:46:50 -0400
6deb15d9d4

Merge pull request #27 from ClaytonWWilson/login-frontend Clayton Wilson 2019-10-03 11:42:10 -0400
4a5c404be3

Merge branch 'master' into login-frontend Clayton Wilson 2019-10-03 11:39:38 -0400
7841fa1798 Fix warning Clayton Wilson 2019-10-03 11:23:28 -0400
bac2cd7719 modified app.css to adjust the app background Leon Liang 2019-10-03 11:06:14 -0400
f14e8bd970 Redux saves user data on login Clayton Wilson 2019-10-03 10:58:45 -0400
c241455c4b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Clayton Wilson 2019-10-03 10:20:12 -0400
14e09d88ea Fixed merge issue danny Danny Voltz 2019-10-03 09:41:47 -0500
3293639fbe Fake commit, don't pull. Clayton Wilson 2019-10-03 09:48:17 -0400
4c1459d890 Renamed edit.js to editProfile.js because it makes more sense Clayton Wilson 2019-10-03 09:47:07 -0400
c14263988e

Merge pull request #25 from ClaytonWWilson/fix asankaran35 2019-10-03 09:31:19 -0400
64657fa3af fixed login and register. working on frontend now fix Aditya Sankaran 2019-10-03 09:29:22 -0400
d072a5ff95

Merge pull request #24 from ClaytonWWilson/profile_display Leon Liang 2019-10-02 23:30:05 -0400