aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-12Merge pull request #298 from ↵Ivan Chen
shravyaramesh/bugfix-mutual-badge-holders-inconsistent-icon [Bugfix] Displaying corresponding icon for badges in modal
2021-03-12users not displayingShravya Ramesh
2021-03-12Displaying corresponding imageShravya Ramesh
2021-03-12Merge pull request #297 from IvanIFChen/hotfix-friend-profile-fixIvan Chen
[HOTFIX] Unable to navigate to profile from friend's list
2021-03-12import the right thingIvan Chen
2021-03-12Merge pull request #296 from shravyaramesh/bug-add-friend-not-workingIvan Chen
[bugfix] add friend not working
2021-03-12add friend now worksShravya Ramesh
2021-03-12Merge pull request #292 from IvanIFChen/tma694-edit-badgesIvan Chen
[TMA-694] Edit Badges
2021-03-12Merge branch 'master' into tma694-edit-badgesIvan Chen
2021-03-12Merge pull request #291 from IvanIFChen/hotfix-badge-name-fixIvan Chen
[HOTFIX] Badge name fix
2021-03-12potential fixIvan Chen
2021-03-12fixed merge issuesIvan Chen
2021-03-12Merge branch 'master' into tma694-edit-badgesIvan Chen
# Conflicts: # src/components/search/SearchCategories.tsx
2021-03-12Merge branch 'master' into hotfix-badge-name-fixIvan Chen
# Conflicts: # src/screens/suggestedPeople/SPBody.tsx
2021-03-12capitalized i and cleaned up codeIvan Chen
2021-03-12Merge pull request #294 from IvanIFChen/tma695-revamp-discover-screenIvan Chen
[TMA-695] Revamp Discover Screen
2021-03-12error message aptShravya Ramesh
2021-03-12fixed layout issue on smaller screensIvan Chen
2021-03-12tappableShravya Ramesh
2021-03-12editing made trueShravya Ramesh
2021-03-12Merge branch 'master' into tma695-revamp-discover-screenIvan Chen
# Conflicts: # src/screens/search/SearchScreen.tsx
2021-03-12loading badges data only if editingShravya Ramesh
2021-03-12Merge pull request #293 from leonyjiang/tma683-dynamic-search-placeholderIvan Chen
[TMA-683] Dynamic Search Suggestions
2021-03-12Merge pull request #295 from shravyaramesh/search-results-style-bugIvan Chen
[bugfix] Search results style bug
2021-03-12Defined specific widthShravya Ramesh
2021-03-12using discover/get_users, updated route params, cleaned up codeIvan Chen
2021-03-12errorShravya Ramesh
2021-03-12comments, removed unused codeShravya Ramesh
2021-03-12styleShravya Ramesh
2021-03-12remove some unwanted console logShravya Ramesh
2021-03-12making call on badge selection to get badgesShravya Ramesh
2021-03-12doneShravya Ramesh
2021-03-11new discover users screenIvan Chen
2021-03-11removed unused store stateIvan Chen
2021-03-11done; except: update state on previous screen;Shravya Ramesh
2021-03-11refactoringShravya Ramesh
2021-03-11removed useless console logShravya Ramesh
2021-03-11basic styling for edit badges buttonShravya Ramesh
2021-03-11Added service and changed border colorShravya Ramesh
2021-03-11Added selectedBadges route propShravya Ramesh
2021-03-11Added new endpointShravya Ramesh
2021-03-11minor syntaxShravya Ramesh
2021-03-10Utilize util to get search suggestions listLeon Jiang
2021-03-10Refactor utilsLeon Jiang
2021-03-10Resolve merge conflictsLeon Jiang
2021-03-10Add simple, non-animated dynamic placeholderLeon Jiang
2021-03-10Add simple, non-animated dynamic placeholderLeon Jiang
2021-03-10Add utils, fix ordering of recent searchesLeon Jiang
2021-03-10renamed param, finished initial routingIvan Chen
2021-03-10Run 'yarn && npx pod-install'Leon Jiang