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

9c0dac507f Light blue color scheme Leon Liang 2019-10-02 23:29:05 -0400
5168de65c1 Merge branch 'master' into profile_display Leon Liang 2019-10-02 23:24:21 -0400
2536547c63 Theming Leon Liang 2019-10-02 23:21:30 -0400
42a07ffa5e resolved merge conflict in app.css Leon Liang 2019-10-02 23:10:12 -0400
7558602a90 Added post card Leon Liang 2019-10-02 23:08:34 -0400
8de496826a Testing login backend Clayton Wilson 2019-10-02 22:53:31 -0400
3b682bae18 Revert "Can successfully register and login in UI" Aditya Sankaran 2019-10-02 21:38:23 -0400
5acc7a64e0 Revert "Modified code for posts in homes" Aditya Sankaran 2019-10-02 21:35:23 -0400
bf0c4c78ee Added basic backend implementation to get posts based on topics remotes/origin/posts shobhitm23 2019-10-02 21:11:11 -0400
51fb554133 Adding Single Post shobhitm23 2019-10-02 21:02:51 -0400
71b6965830 Modified code for posts in homes Aaron Sun 2019-10-02 20:45:45 -0400
893cad7e7e Can successfully register and login in UI Aaron Sun 2019-10-02 20:40:46 -0400
2e17e36ef6 Can successfully register and log in on UI Aaron Sun 2019-10-02 20:24:03 -0400
5f629f901b Renamed UI diretory back to twistter-frontend Aaron Sun 2019-10-02 20:18:47 -0400
b1f5ddaa49 Ran npm install to get all deps from package.json shobhitm23 2019-10-02 20:15:44 -0400
8f949f14be Fix caseSensitive error and moment import Clayton Wilson 2019-10-02 18:00:29 -0400
5df28e0e77 Still working on Auth State Clayton Wilson 2019-10-02 17:53:20 -0400
39098e917f pull Danny Voltz 2019-10-02 16:37:10 -0500
29c07a9b14 commit Danny Voltz 2019-10-02 16:24:01 -0500
eed67326f1 Pulled most up-to-date version from master Aaron Sun 2019-10-02 15:39:19 -0400
15f106ed1a added theme.js Leon Liang 2019-10-02 15:10:02 -0400
e110bdd47a

Merge pull request #21 from ClaytonWWilson/user-line-posts asankaran35 2019-10-02 15:01:00 -0400
b7f0eba7a9 finished rendering userline for user and changed character limit for writing microblogs Aditya Sankaran 2019-10-02 14:59:18 -0400
dcd03d7888 Login frontend complete Clayton Wilson 2019-10-02 00:49:51 -0400
878bb28a71

Merge pull request #20 from ClaytonWWilson/edit-profile-frontend Clayton Wilson 2019-10-01 21:01:29 -0400
88310714b2

Merge branch 'master' into edit-profile-frontend Clayton Wilson 2019-10-01 21:01:02 -0400
c218081759 Making everything look pretty Clayton Wilson 2019-10-01 20:39:21 -0400
16973fb340

Merge pull request #19 from ClaytonWWilson/user-line asankaran35 2019-10-01 19:16:02 -0400
9d4f175a49 added entering topics field and database call for adding topics when writing microblog Aditya Sankaran 2019-10-01 19:07:57 -0400
f627b91543 change case sensitive file name Leon Liang 2019-10-01 19:04:03 -0400
ec6e41d16f

Merge pull request #18 from ClaytonWWilson/file_org Leon Liang 2019-10-01 19:00:40 -0400
2e157b9088

Merge branch 'master' into file_org Leon Liang 2019-10-01 19:00:19 -0400
89e8942624 file organization for twistter frontend Leon Liang 2019-10-01 18:54:26 -0400
b9909c1616 move home.js and so on into according folders Leon Liang 2019-10-01 18:44:49 -0400
fadb0f0399 added logout support Danny Voltz 2019-10-01 17:34:19 -0500
931929061f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Danny Voltz 2019-10-01 17:30:39 -0500
8eb0872d16 logout ui Danny Voltz 2019-10-01 17:27:52 -0500
585a0c1022 Changed variable names Aaron Sun 2019-10-01 17:55:17 -0400
a25d022f49 Changed proxy src Aaron Sun 2019-10-01 17:44:08 -0400
07e9271132 Removing hard-coded user info. Clayton Wilson 2019-10-01 17:30:18 -0400
3aeb1ac53b Reconciled with Git master again Aaron Sun 2019-10-01 17:07:36 -0400
724adc9b0b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Clayton Wilson 2019-10-01 17:02:05 -0400
b711521b4b Fix unnecessary escape deploy error. Clayton Wilson 2019-10-01 17:01:59 -0400
a1e2d79c67 Renamed frontend directory Aaron Sun 2019-10-01 16:59:01 -0400
6d67dcb485 Pulled from master Aaron Sun 2019-10-01 16:58:14 -0400
967e66313b

Merge pull request #17 from ClaytonWWilson/edit-profile-frontend Clayton Wilson 2019-10-01 16:56:58 -0400
76caf4de12

Merge branch 'master' into edit-profile-frontend Clayton Wilson 2019-10-01 16:54:13 -0400
eb945fa0cf Finished fixing login and signup backend. Clayton Wilson 2019-10-01 16:31:37 -0400
c5bec46b52 Fix fbAuth function not extracting 'Bearer ' Clayton Wilson 2019-10-01 16:08:53 -0400
cc98fa7884 Fixed index.js and refactored it. Clayton Wilson 2019-10-01 15:27:24 -0400
101d9918e5 Changes to navigation bar Leon Liang 2019-10-01 14:43:41 -0400
5116a705bc Save before trying to fix master. Clayton Wilson 2019-10-01 14:32:27 -0400
51d45c0736 Updated UI to communicate with backend Aaron Sun 2019-10-01 14:12:10 -0400
311e8b3716 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aditya Sankaran 2019-10-01 14:03:37 -0400
754c2f2d75 added get request userline function Aditya Sankaran 2019-10-01 14:03:15 -0400
13b57eedc6 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aaron Sun 2019-10-01 13:57:44 -0400
60d1d76839 Added nav bar Leon Liang 2019-10-01 12:56:34 -0400
e273b1474b Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 added Navigation bar Leon Liang 2019-10-01 12:45:10 -0400
022f440cb9 added Navigation bar to home page Leon Liang 2019-10-01 12:44:47 -0400
721aeeb350 Edit Profile front-end finished and connected to back-end Clayton Wilson 2019-09-30 23:39:35 -0400
4517bc6756 Reconciled with new pull from master Aaron Sun 2019-09-30 23:22:09 -0400
201f5d8949 Reconciled my code with master Aaron Sun 2019-09-30 23:04:37 -0400
696b00e304 Edit profile front-end almost finished. Clayton Wilson 2019-09-30 22:30:29 -0400
b1cfcda948 Clean baseline Aaron Sun 2019-09-30 22:26:28 -0400
7969d3b10b

Merge pull request #16 from ClaytonWWilson/userline asankaran35 2019-09-30 18:23:36 -0400
d298843268

Merge branch 'master' into userline asankaran35 2019-09-30 18:23:21 -0400
55dc62e57e connected backend to frontend for writing microblogs Aditya Sankaran 2019-09-30 18:06:23 -0400
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 -0400
0f127521ca Added edit page. Clayton Wilson 2019-09-29 23:31:33 -0400
90442fe3cd Fixing 'firebase deploy' errors and warnings Clayton Wilson 2019-09-29 23:59:36 -0400
2dc89b99b6 Added edit page. Clayton Wilson 2019-09-29 23:31:33 -0400
5176f0250c

Merge pull request #15 from ClaytonWWilson/edit-profile-frontend Clayton Wilson 2019-09-29 22:07:25 -0400
929216c05e Changed naming from FBAuth to fbAuth Clayton Wilson 2019-09-29 22:06:51 -0400
dc498a3a1d

Add comments to fbAuth.js Clayton Wilson 2019-09-29 21:56:59 -0400
f4ef1ee8e1

Wrong filename Clayton Wilson 2019-09-29 21:52:25 -0400
ce8ee36354

Fixed missing bracket Clayton Wilson 2019-09-29 21:46:18 -0400
13fcd9b3ab

Merge pull request #14 from ClaytonWWilson/edit-profile-info Clayton Wilson 2019-09-29 21:35:54 -0400
7f2d6a3a1e

Merge branch 'master' into edit-profile-info Clayton Wilson 2019-09-29 21:33:41 -0400
d05f87c7a7 Made edit profile data validation more robust. Clayton Wilson 2019-09-29 21:01:06 -0400
b1faacd312 backend and frontend connect in progress Aditya Sankaran 2019-09-29 19:07:35 -0400
15f976398a Code refactoring Clayton Wilson 2019-09-29 01:35:06 -0400
262e59df65 Disabled the feed route rewrite and small fixes. Clayton Wilson 2019-09-28 22:42:26 -0400
971d58b9be router page for writing microblogs write_microblogs Aditya Sankaran 2019-09-28 14:17:58 -0400
cbf9b94248 added home router page Aditya Sankaran 2019-09-28 14:07:52 -0400
6cb3441ad7

Merge pull request #13 from ClaytonWWilson/profile_display Leon Liang 2019-09-27 22:04:16 -0400
015f1c1e9f change the location of logo.png so that it displays correctly Leon Liang 2019-09-27 21:59:57 -0400
2d00090988

Merge pull request #12 from ClaytonWWilson/user_subscription Leon Liang 2019-09-27 21:42:22 -0400
cc1ce1bfc9

Merge branch 'master' into user_subscription Leon Liang 2019-09-27 21:40:39 -0400
1306c1654a restructure files Leon Liang 2019-09-27 19:35:33 -0400
5caea0871e Modularize code and added NavBar component Leon Liang 2019-09-27 19:34:42 -0400
5642b685bc Finished functionality of backend edit profile functions Clayton Wilson 2019-09-27 16:28:00 -0400
8a5b115666

Merge pull request #11 from ClaytonWWilson/write_microblogs asankaran35 2019-09-27 12:52:05 -0400
56b9bf86db writing and posting microblog Aditya Sankaran 2019-09-27 12:50:45 -0400
e961379e3f added new files for structural purpose Leon Liang 2019-09-26 13:59:39 -0400
d703843277 added Navbar, profile and post skeleton Leon Liang 2019-09-26 13:58:26 -0400
70037a5342 added folders to organize files Leon Liang 2019-09-26 01:54:51 -0400
8fa03700b1 Refactored and organized files based on functionality Leon Liang 2019-09-26 01:49:19 -0400
a930353d79 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aaron Sun 2019-09-24 14:52:25 -0400
e2883a04c5 In the process of linking backend and UI Aaron Sun 2019-09-24 14:38:13 -0400
6f94623d0c Modified the code structure for the auth UI Aaron Sun 2019-09-24 08:38:02 -0400