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

• 024f5f00b0 Bump minimist, mkdirp and react-scripts in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/minimist-and-mkdirp-and-react-scripts-1.2.8 dependabot[bot] 2023-03-03 20:16:01 +00:00
• 74cbf124b3 Bump minimist and mkdirp in /functions dependabot/npm_and_yarn/functions/minimist-and-mkdirp-1.2.8 dependabot[bot] 2023-03-03 20:13:42 +00:00
• dfdbc21755 Bump jsonwebtoken, firebase-admin and firebase-functions in /functions dependabot/npm_and_yarn/functions/jsonwebtoken-and-firebase-admin-and-firebase-functions-9.0.0 dependabot[bot] 2023-01-09 12:37:55 +00:00
• 3dd24ae54d Bump json5 and react-scripts in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/json5-and-react-scripts-2.2.3 dependabot[bot] 2023-01-06 07:48:01 +00:00
• 5e8309c57b Bump express from 4.17.1 to 4.18.2 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/express-4.18.2 dependabot[bot] 2022-12-13 16:42:25 +00:00
• d8c701bb71 Bump express from 4.17.1 to 4.18.2 in /functions dependabot/npm_and_yarn/functions/express-4.18.2 dependabot[bot] 2022-12-13 16:42:16 +00:00
• 2407639682 Bump qs and express in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/qs-and-qs-and-express-6.5.3 dependabot[bot] 2022-12-11 20:33:25 +00:00
• 3f4dc62179 Bump qs and express in /functions dependabot/npm_and_yarn/functions/qs-and-express-6.11.0 dependabot[bot] 2022-12-08 04:39:33 +00:00
• d569877edf Bump decode-uri-component from 0.2.0 to 0.2.2 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/decode-uri-component-0.2.2 dependabot[bot] 2022-12-07 00:56:37 +00:00
• e9000ba252 Bump minimatch from 3.0.4 to 3.1.2 in /functions dependabot/npm_and_yarn/functions/minimatch-3.1.2 dependabot[bot] 2022-11-10 01:38:56 +00:00
• d1f42aa5cd Update README.md master Clayton Wilson 2022-03-06 11:12:16 -05:00
• f118ed76d1 Added screenshots Clayton Wilson 2022-03-06 10:09:02 -06:00
• 4ff93b0b87 Bump url-parse from 1.4.7 to 1.5.10 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/url-parse-1.5.10 dependabot[bot] 2022-02-27 10:23:24 +00:00
• b45e670564 Bump ajv from 6.10.2 to 6.12.6 in /functions dependabot/npm_and_yarn/functions/ajv-6.12.6 dependabot[bot] 2022-02-13 20:02:03 +00:00
• c0df7c7752 Bump tmpl from 1.0.4 to 1.0.5 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/tmpl-1.0.5 dependabot[bot] 2021-09-22 03:01:13 +00:00
• f9ce30e72e Bump path-parse from 1.0.6 to 1.0.7 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/path-parse-1.0.7 dependabot[bot] 2021-08-12 22:04:14 +00:00
• 06b3f5a34e Bump lodash from 4.17.15 to 4.17.21 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/lodash-4.17.21 dependabot[bot] 2021-05-11 22:56:14 +00:00
• aae2ccd6c4 Bump lodash from 4.17.15 to 4.17.21 in /functions dependabot/npm_and_yarn/functions/lodash-4.17.21 dependabot[bot] 2021-05-11 22:50:43 +00:00
• 858bdcce1a Bump hosted-git-info from 2.8.4 to 2.8.9 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/hosted-git-info-2.8.9 dependabot[bot] 2021-05-11 22:37:05 +00:00
• bee64895d2 Bump handlebars from 4.3.1 to 4.7.7 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/handlebars-4.7.7 dependabot[bot] 2021-05-09 08:51:36 +00:00
• 47319308e3 Bump sockjs from 0.3.19 to 0.3.21 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/sockjs-0.3.21 dependabot[bot] 2021-04-21 23:47:51 +00:00
• 2d8ae3e301 Bump y18n from 3.2.1 to 3.2.2 in /functions dependabot/npm_and_yarn/functions/y18n-3.2.2 dependabot[bot] 2021-03-31 16:51:27 +00:00
• 3138f0480b Bump y18n from 3.2.1 to 3.2.2 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/y18n-3.2.2 dependabot[bot] 2021-03-31 16:40:57 +00:00
• ee2a081b41 Bump axios from 0.19.0 to 0.21.1 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/axios-0.21.1 dependabot[bot] 2021-01-06 09:51:51 +00:00
• 5eb7f63d3c Bump axios from 0.19.0 to 0.21.1 in /functions dependabot/npm_and_yarn/functions/axios-0.21.1 dependabot[bot] 2021-01-06 09:50:23 +00:00
• bde1930b48 Bump http-proxy from 1.17.0 to 1.18.1 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/http-proxy-1.18.1 dependabot[bot] 2020-10-12 07:19:06 +00:00
• 6e06f46c7a Bump websocket-extensions from 0.1.3 to 0.1.4 in /twistter-frontend dependabot/npm_and_yarn/twistter-frontend/websocket-extensions-0.1.4 dependabot[bot] 2020-10-12 07:17:53 +00:00
• b9cbd610a9 Update README.md DreamCoder23 2020-10-11 23:17:34 -07:00
• 5a7f80ab34 PROJECT COMPLETED!!!!! branch-692 Aaron Sun 2019-12-10 23:42:36 -05:00
• db6b147c40 PROJECT COMPLETED!!!!! Aaron Sun 2019-12-10 23:41:50 -05:00
• daabbf80f6 Actually fix deploy error Clayton Wilson 2019-12-06 14:58:51 -05:00
• f9acefaafb Fixed deploy error Clayton Wilson 2019-12-06 14:55:01 -05:00
• 948eff32c2 Fix Clayton Wilson 2019-12-06 14:26:42 -05:00
• 6de219505a Fix admin alert posts displaying Clayton Wilson 2019-12-06 14:25:05 -05:00
• 7132a2ab45 Fix error in getOtherUsersPosts Clayton Wilson 2019-12-06 14:10:17 -05:00
• 5474543af4 add catch in addSubscription Clayton Wilson 2019-12-06 13:56:48 -05:00
• 6f77d03e2d Add back verify button for Admin lastfix Clayton Wilson 2019-12-06 13:51:21 -05:00
• da6e7436ea Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Clayton Wilson 2019-12-06 13:35:32 -05:00
• e7afac9a19 Fix post topics being added to followed topics list Clayton Wilson 2019-12-06 13:35:28 -05:00
• 9449d3544b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aditya Sankaran 2019-12-06 13:06:52 -05:00
• 4f2e07756d tell the user if they aren't following anybody Clayton Wilson 2019-12-06 13:04:59 -05:00
• f2cf7542a8 fix Aditya Sankaran 2019-12-06 13:04:43 -05:00
• ff7677bfb3 Merge pull request #113 from ClaytonWWilson/admin-delete Clayton Wilson 2019-12-06 12:56:40 -05:00
• 978af53a74 Merge pull request #114 from ClaytonWWilson/temp-branch Clayton Wilson 2019-12-06 12:53:57 -05:00
• a0a522f1d2 Display disabled DMs as red and fix errors in login and signup Clayton Wilson 2019-12-06 12:53:27 -05:00
• 988c807af2 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aditya Sankaran 2019-12-06 12:27:00 -05:00
• 01b449d01d separated list of topics by comma and space Aditya Sankaran 2019-12-06 12:26:29 -05:00
• f30a9ae27c Fix merge errors, but posts are not displaying on home.js admin-delete Clayton Wilson 2019-12-06 12:07:36 -05:00
• a459e6581e Merge branch 'master' into admin-delete Clayton Wilson 2019-12-06 11:45:50 -05:00
• b769ab930a Merge pull request #112 from ClaytonWWilson/fix_unfollow Leon Liang 2019-12-06 02:28:42 -05:00
• 116f97bf64 fixed topic.id bug Leon Liang 2019-12-06 02:26:01 -05:00
• a4efc15d58 allow follow topic only when following user Leon Liang 2019-12-06 02:23:28 -05:00
• 39613584e7 fixed unfollow user and topics Leon Liang 2019-12-06 02:17:52 -05:00
• a1f9a4bef3 Fixing errors on the otherUsers page Clayton Wilson 2019-12-05 21:39:38 -05:00
• c85eeccd4c Display formatted time on otherUser page Clayton Wilson 2019-12-05 21:16:46 -05:00
• bb50e0fa5d Merge pull request #111 from ClaytonWWilson/filter_timeli Leon Liang 2019-12-05 19:25:44 -05:00
• f111553827 fixed up add subscription method Leon Liang 2019-12-05 19:24:50 -05:00
• 5e935f3508 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aditya Sankaran 2019-12-05 19:20:50 -05:00
• 80a2e1894c sorted posts chronologically everywhere Aditya Sankaran 2019-12-05 19:20:05 -05:00
• 8acd29e842 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Clayton Wilson 2019-12-05 19:14:47 -05:00
• b402c96864 Fixing DMs with users who have them disabled Clayton Wilson 2019-12-05 19:13:00 -05:00
• 76792148cd Merge pull request #110 from ClaytonWWilson/chronological asankaran35 2019-12-05 18:56:18 -05:00
• a92681451f syntax error Aditya Sankaran 2019-12-05 18:54:43 -05:00
• e3522876d7 can sort posts chronologically in userline and formatted topics listing for each post chronological Aditya Sankaran 2019-12-05 18:50:29 -05:00
• c7859e0f0a Merge pull request #109 from ClaytonWWilson/finalfix Leon Liang 2019-12-05 17:25:53 -05:00
• aad9dc0273 Merge branch 'master' into finalfix Leon Liang 2019-12-05 17:25:19 -05:00
• 30df98343e added user post tuple Leon Liang 2019-12-05 17:22:55 -05:00
• 719294f0ed Fix DM code layout Clayton Wilson 2019-12-05 16:13:56 -05:00
• fc9994d42e fixed circular progress on home Clayton Wilson 2019-12-05 13:47:10 -05:00
• de72bd9223 added alert to user's page Leon Liang 2019-12-05 13:45:58 -05:00
• b85bee7cba Fix merge issue Clayton Wilson 2019-12-05 13:41:24 -05:00
• 76330fd234 Merge pull request #108 from ClaytonWWilson/send-microblog-loading Clayton Wilson 2019-12-05 13:38:53 -05:00
• 23f1114cc5 Dark Mode implementation impDarkTheme shobhitm23 2019-12-05 13:38:06 -05:00
• b007666317 Merge branch 'master' into send-microblog-loading Clayton Wilson 2019-12-05 13:38:04 -05:00
• a0d2532c22 Add circular progress to home page Clayton Wilson 2019-12-05 13:35:19 -05:00
• 739b1cc92a Add circular progress to other user page Clayton Wilson 2019-12-05 13:22:29 -05:00
• 57087a5ea3 Add circular progress to user page Clayton Wilson 2019-12-05 13:08:59 -05:00
• 3424a7d34f Merge pull request #107 from ClaytonWWilson/finalfix Leon Liang 2019-12-05 13:02:52 -05:00
• 1aff5ba99b Add circular progress to writing_microblogs Clayton Wilson 2019-12-05 12:56:05 -05:00
• 2bcf6bfcb3 filter by followed user Leon Liang 2019-12-05 12:48:26 -05:00
• bae2947003 Merge branch 'admin-delete' of https://github.com/ClaytonWWilson/CS307-Team24 into admin-delete:x Danny Voltz 2019-12-05 12:25:19 -05:00
• 96423cee8a Admin User Stories Danny Voltz 2019-12-05 12:12:25 -05:00
• f9a45ffe07 Merge pull request #84 from ClaytonWWilson/dms Clayton Wilson 2019-12-04 22:47:50 -05:00
• 17c7e989ef cleared modal for quoting when hitting cancel button Aditya Sankaran 2019-12-04 19:37:53 -05:00
• efecf3b02a fixed stuff Aditya Sankaran 2019-12-04 18:48:08 -05:00
• 8b4c32b81f syntax error Aditya Sankaran 2019-12-04 18:20:28 -05:00
• 323cb5bcee Revert "module fuse and syntax errors fixed" Aditya Sankaran 2019-12-04 18:15:37 -05:00
• 4a4733f593 module fuse and syntax errors fixed Aditya Sankaran 2019-12-04 18:09:36 -05:00
• 35cec7abf3 Merge pull request #106 from ClaytonWWilson/likes asankaran35 2019-12-04 17:42:03 -05:00
• 6989091fb1 Merge branch 'master' into likes asankaran35 2019-12-04 17:41:28 -05:00
• 699ea23750 quoting fix Aditya Sankaran 2019-12-04 17:16:41 -05:00
• 0bcfdcdd6c Fix deploy error Clayton Wilson 2019-12-04 17:10:26 -05:00
• 4e5b100968 Fix merge issues and change layout of NavBar Clayton Wilson 2019-12-04 16:57:56 -05:00
• 374c4d45b0 Merge branch 'master' into dms Clayton Wilson 2019-12-04 15:56:42 -05:00
• 7efed257f2 Merge pull request #105 from ClaytonWWilson/display-profile-images-on-posts Clayton Wilson 2019-12-04 15:37:59 -05:00
• 99ffbe52a4 Posts on Home now display profile images Clayton Wilson 2019-12-04 15:37:09 -05:00
• 856cb8630e readded post.js. got deleted for some reason Aditya Sankaran 2019-12-04 14:42:43 -05:00
• 0776728e73 Merge pull request #60 from ClaytonWWilson/edit-profile-image-upload Clayton Wilson 2019-12-04 00:31:07 -05:00
• 77a3ba9f69 Fix merge issues Clayton Wilson 2019-12-04 00:30:23 -05:00
• 7a0a5725b7 Merge branch 'master' into edit-profile-image-upload Clayton Wilson 2019-12-04 00:02:03 -05:00