Merge branch 'master' into 'assignment-3.2'
# Conflicts: # App.js
No related branches found
No related tags found
Showing
- App.js 38 additions, 31 deletionsApp.js
- api/github_api.js 12 additions, 58 deletionsapi/github_api.js
- assets/blank_profile.png 0 additions, 0 deletionsassets/blank_profile.png
- assets/icons/bell.svg 0 additions, 1 deletionassets/icons/bell.svg
- assets/profile_picture.jpg 0 additions, 0 deletionsassets/profile_picture.jpg
- react_components/helper_components/ContentBlock.js 0 additions, 3 deletionsreact_components/helper_components/ContentBlock.js
- react_components/helper_components/ProfilePicture.js 23 additions, 0 deletionsreact_components/helper_components/ProfilePicture.js
- react_components/page_components/FollowUser.js 0 additions, 13 deletionsreact_components/page_components/FollowUser.js
- react_components/page_components/Followers.js 4 additions, 3 deletionsreact_components/page_components/Followers.js
- react_components/page_components/Following.js 7 additions, 5 deletionsreact_components/page_components/Following.js
- react_components/page_components/Notifications.js 0 additions, 38 deletionsreact_components/page_components/Notifications.js
- react_components/page_components/Profile.js 9 additions, 33 deletionsreact_components/page_components/Profile.js
- react_components/page_components/Repositories.js 4 additions, 3 deletionsreact_components/page_components/Repositories.js
- react_components/page_components/StarRepo.js 0 additions, 15 deletionsreact_components/page_components/StarRepo.js
- react_components/page_components/UnfollowUser.js 0 additions, 13 deletionsreact_components/page_components/UnfollowUser.js
- react_components/page_components/UnstarRepo.js 0 additions, 15 deletionsreact_components/page_components/UnstarRepo.js
assets/blank_profile.png
deleted
100644 → 0
21.6 KiB
assets/icons/bell.svg
deleted
100644 → 0
assets/profile_picture.jpg
0 → 100644
37.4 KiB