pleroma-fe/src/components/user_card_content
Henry Jameson 81c83566cd Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
* upstream/develop: (24 commits)
  Feature/bigger icons for mobile / #211
  Fix oauth url
  Make user profile page cleaner
  Redirect to /main/all
  Move userProfile link to methods
  Fix user profile test
  Add temporary redirects
  Add local profile test
  Implement user_profile.spec.js
  Use babel polyfill in karma
  Use 'userProfileLink' to generate user-profile link
  Rollback disableDotRule
  Use "-1" in indexOf
  Add generateProfileLink
  Use "~" as a route namespace symbol
  Disable dot rule
  Pass userName instead of userId
  Typo in tests
  Fix redirect paths
  Fix typo
  ...
2018-12-18 22:43:26 +03:00
..
user_card_content.js Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
user_card_content.vue Merge remote-tracking branch 'upstream/develop' into user-profile-overhault 2018-12-18 22:43:26 +03:00