| Age | Commit message (Collapse) | Author |
|
# Conflicts:
# src/constants/strings.ts
|
|
|
|
# Conflicts:
# src/services/UserProfileService.ts
# src/types/types.ts
|
|
|
|
[TMA-698] api/profile
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/components/search/SearchBar.tsx
|
|
|
|
|
|
|
|
[TMA-622] Add friends from contacts
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/components/search/SearchCategories.tsx
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/components/search/SearchResultCell.tsx
# src/components/search/SearchResultList.tsx
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Ivan Chen <ivan.if.chen@gmail.com>
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/components/taggs/SocialMediaInfo.tsx
|
|
TMA-663-Updated Search Results
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
|
|
|