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

• 8eb0872d16 logout ui Danny Voltz 2019-10-01 17:27:52 -05:00
• 07e9271132 Removing hard-coded user info. Clayton Wilson 2019-10-01 17:30:18 -04:00
• 724adc9b0b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Clayton Wilson 2019-10-01 17:02:05 -04:00
• b711521b4b Fix unnecessary escape deploy error. Clayton Wilson 2019-10-01 17:01:59 -04:00
• 967e66313b Merge pull request #17 from ClaytonWWilson/edit-profile-frontend Clayton Wilson 2019-10-01 16:56:58 -04:00
• 76caf4de12 Merge branch 'master' into edit-profile-frontend Clayton Wilson 2019-10-01 16:54:13 -04:00
• eb945fa0cf Finished fixing login and signup backend. Clayton Wilson 2019-10-01 16:31:37 -04:00
• c5bec46b52 Fix fbAuth function not extracting 'Bearer ' Clayton Wilson 2019-10-01 16:08:53 -04:00
• cc98fa7884 Fixed index.js and refactored it. Clayton Wilson 2019-10-01 15:27:24 -04:00
• 101d9918e5 Changes to navigation bar Leon Liang 2019-10-01 14:43:41 -04:00
• 5116a705bc Save before trying to fix master. Clayton Wilson 2019-10-01 14:32:27 -04:00
• 311e8b3716 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aditya Sankaran 2019-10-01 14:03:37 -04:00
• 754c2f2d75 added get request userline function Aditya Sankaran 2019-10-01 14:03:15 -04:00
• 13b57eedc6 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aaron Sun 2019-10-01 13:57:44 -04:00
• 60d1d76839 Added nav bar Leon Liang 2019-10-01 12:56:34 -04:00
• e273b1474b Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 added Navigation bar Leon Liang 2019-10-01 12:45:10 -04:00
• 022f440cb9 added Navigation bar to home page Leon Liang 2019-10-01 12:44:47 -04:00
• 721aeeb350 Edit Profile front-end finished and connected to back-end Clayton Wilson 2019-09-30 23:39:35 -04:00
• 4517bc6756 Reconciled with new pull from master Aaron Sun 2019-09-30 23:22:09 -04:00
• 201f5d8949 Reconciled my code with master Aaron Sun 2019-09-30 23:04:37 -04:00
• 696b00e304 Edit profile front-end almost finished. Clayton Wilson 2019-09-30 22:30:29 -04:00
• b1cfcda948 Clean baseline Aaron Sun 2019-09-30 22:26:28 -04:00
• 7969d3b10b Merge pull request #16 from ClaytonWWilson/userline asankaran35 2019-09-30 18:23:36 -04:00
• d298843268 Merge branch 'master' into userline asankaran35 2019-09-30 18:23:21 -04:00
• 55dc62e57e connected backend to frontend for writing microblogs Aditya Sankaran 2019-09-30 18:06:23 -04:00
• d255a301a3 Merge branch 'edit-profile-frontend' of https://github.com/ClaytonWWilson/CS307-Team24 into edit-profile-frontend Clayton Wilson 2019-09-30 00:04:23 -04:00
• 0f127521ca Added edit page. Clayton Wilson 2019-09-29 23:31:33 -04:00
• 90442fe3cd Fixing 'firebase deploy' errors and warnings Clayton Wilson 2019-09-29 23:59:36 -04:00
• 2dc89b99b6 Added edit page. Clayton Wilson 2019-09-29 23:31:33 -04:00
• 5176f0250c Merge pull request #15 from ClaytonWWilson/edit-profile-frontend Clayton Wilson 2019-09-29 22:07:25 -04:00
• 929216c05e Changed naming from FBAuth to fbAuth Clayton Wilson 2019-09-29 22:06:51 -04:00
• dc498a3a1d Add comments to fbAuth.js Clayton Wilson 2019-09-29 21:56:59 -04:00
• f4ef1ee8e1 Wrong filename Clayton Wilson 2019-09-29 21:52:25 -04:00
• ce8ee36354 Fixed missing bracket Clayton Wilson 2019-09-29 21:46:18 -04:00
• 13fcd9b3ab Merge pull request #14 from ClaytonWWilson/edit-profile-info Clayton Wilson 2019-09-29 21:35:54 -04:00
• 7f2d6a3a1e Merge branch 'master' into edit-profile-info Clayton Wilson 2019-09-29 21:33:41 -04:00
• d05f87c7a7 Made edit profile data validation more robust. Clayton Wilson 2019-09-29 21:01:06 -04:00
• b1faacd312 backend and frontend connect in progress Aditya Sankaran 2019-09-29 19:07:35 -04:00
• 15f976398a Code refactoring Clayton Wilson 2019-09-29 01:35:06 -04:00
• 262e59df65 Disabled the feed route rewrite and small fixes. Clayton Wilson 2019-09-28 22:42:26 -04:00
• 971d58b9be router page for writing microblogs write_microblogs Aditya Sankaran 2019-09-28 14:17:58 -04:00
• cbf9b94248 added home router page Aditya Sankaran 2019-09-28 14:07:52 -04:00
• 6cb3441ad7 Merge pull request #13 from ClaytonWWilson/profile_display Leon Liang 2019-09-27 22:04:16 -04:00
• 015f1c1e9f change the location of logo.png so that it displays correctly Leon Liang 2019-09-27 21:59:57 -04:00
• 2d00090988 Merge pull request #12 from ClaytonWWilson/user_subscription Leon Liang 2019-09-27 21:42:22 -04:00
• cc1ce1bfc9 Merge branch 'master' into user_subscription Leon Liang 2019-09-27 21:40:39 -04:00
• 1306c1654a restructure files Leon Liang 2019-09-27 19:35:33 -04:00
• 5caea0871e Modularize code and added NavBar component Leon Liang 2019-09-27 19:34:42 -04:00
• 5642b685bc Finished functionality of backend edit profile functions Clayton Wilson 2019-09-27 16:28:00 -04:00
• 8a5b115666 Merge pull request #11 from ClaytonWWilson/write_microblogs asankaran35 2019-09-27 12:52:05 -04:00
• 56b9bf86db writing and posting microblog Aditya Sankaran 2019-09-27 12:50:45 -04:00
• e961379e3f added new files for structural purpose Leon Liang 2019-09-26 13:59:39 -04:00
• d703843277 added Navbar, profile and post skeleton Leon Liang 2019-09-26 13:58:26 -04:00
• 70037a5342 added folders to organize files Leon Liang 2019-09-26 01:54:51 -04:00
• 8fa03700b1 Refactored and organized files based on functionality Leon Liang 2019-09-26 01:49:19 -04:00
• a930353d79 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aaron Sun 2019-09-24 14:52:25 -04:00
• e2883a04c5 In the process of linking backend and UI Aaron Sun 2019-09-24 14:38:13 -04:00
• 6f94623d0c Modified the code structure for the auth UI Aaron Sun 2019-09-24 08:38:02 -04:00
• bcdd452aa8 Start of the edit profile functions. Clayton Wilson 2019-09-23 22:58:06 -04:00
• 4fbacaf822 Merge pull request #10 from ClaytonWWilson/edit-profile-info Clayton Wilson 2019-09-23 21:20:05 -04:00
• 709af8007d Added the FBAuth middleman function for authentication. Clayton Wilson 2019-09-23 21:18:33 -04:00
• be45b7f005 Merge pull request #9 from ClaytonWWilson/user_subscription Leon Liang 2019-09-19 15:43:10 -04:00
• 0c08eb8f78 Set up Express for API calls. Leon Liang 2019-09-19 15:41:38 -04:00
• 6341100061 Added frontend Aaron Sun 2019-09-19 14:30:02 -04:00
• ff2a83d4a0 Merge pull request #6 from ClaytonWWilson/login Leon Liang 2019-09-12 16:26:06 -04:00
• c716d47254 Added functions Helloworld and getUsername for testing Leon Liang 2019-09-12 16:23:45 -04:00
• d0b32835ac Firebase Init files ClaytonWWilson 2019-09-12 14:33:13 -04:00
• 3c803d8eb4 Initial commit Clayton Wilson 2019-08-27 15:34:02 -04:00