Commit Graph

99 Commits

Author SHA1 Message Date
Shpuld Shpludson
9183c9e845 Merge branch 'change-pencil-to-wrentch' into 'develop'
Change pencil icon to wrentch

See merge request pleroma/pleroma-fe!764
2019-04-22 13:11:14 +00:00
Haelwenn (lanodan) Monnier
14d506154e
user_card.vue: Fix .emoji to apply to img 2019-04-20 21:12:56 +02:00
Brenden Bice
6aee2ed63f replace pencil with wrench icon
# Conflicts:
#	src/components/user_card/user_card.vue
2019-04-19 13:24:35 -04:00
eugenijm
6b6878bde0 Added moderation menu 2019-04-01 23:30:06 +03:00
taehoon
302310a653 Remove old muting logic 2019-03-21 16:19:09 -04:00
taehoon
3255950b0e Add mute/unmute featrue and mutes management tab 2019-03-21 16:19:03 -04:00
dave
07b8115a37 #444 - show remote follow button when logged out 2019-03-19 14:36:27 -04:00
HJ
9364964b01 Merge branch 'mastoapi/user-stuff' into 'develop'
Transition to MastoAPI: user data

See merge request pleroma/pleroma-fe!655
2019-03-15 13:14:41 +00:00
taehoon
d8e938bb5e Update user settings icon to pencil 2019-03-11 11:52:49 -04:00
Haelwenn (lanodan) Monnier
d0e78df220
user_card.vue: Copy over .status-content img styling 2019-03-11 05:14:49 +01:00
Haelwenn (lanodan) Monnier
07a46f7736
user_card.vue: Set img.emoji to 32×32px
Related to https://git.pleroma.social/pleroma/pleroma/merge_requests/792
2019-03-10 01:56:51 +01:00
Henry Jameson
ee49409049 Partially transitioned user data to MastoAPI. Added support for fetching
relationship data. Upgraded code to be more resilient to nulls caused by missing
data in either APIs
2019-03-08 00:35:30 +02:00
Shpuld Shpludson
09736691ea Merge branch '420-redo-user-card-content' into 'develop'
Re-do UserCardContent Component CSS

Closes #420

See merge request pleroma/pleroma-fe!642
2019-03-07 16:38:45 +00:00
taehoon
5f51fe897d Revert modifier class notation 2019-03-05 21:52:04 -05:00
taehoon
7bceabb5bd Rename UserCardContent to UserCard 2019-03-05 14:01:49 -05:00
taehoon
0d283c3f17 Remove UserCard 2019-02-28 12:41:20 -05:00
shpuld
e801d78e9d Take over branch and fix some issues 2019-02-17 18:54:22 +02:00
Edijs
5d0e51cae3 Fix styling 2019-02-12 09:00:09 -07:00
Edijs
9f3f1ee7cb Fix UI of followers list 2019-02-11 11:03:01 -07:00
dave
4b18989fef #332 - add follow/not follow button to follow list 2019-02-09 23:05:23 -05:00
Edijs
52f5ffa862 Fix avatar link in search result 2019-02-05 15:11:17 -07:00
shpuld
54e7e0e31b merge develop and fix conflicts AGAIN 2019-02-04 19:49:23 +02:00
taehoon
4833f79cc2 Fix class ordering issues related to avatar 2019-02-02 15:50:25 -05:00
shpuld
dbb16d56e2 follows/followers pagination ready for review 2019-02-02 22:29:10 +02:00
taehoon
d607e4195a Migrate StillImage to UserAvatar for avatars 2019-02-02 14:23:52 -05:00
Lambda
f35dbaf064 Treat reserved users like external users in the frontend. 2018-12-26 14:50:48 +01:00
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
Henry Jameson
23d434c40c collateral fixes for user-card: use still-image, styles for custom emoji 2018-12-17 19:17:03 +03:00
Maxim Filippov
ea6977cd4d Move userProfile link to methods 2018-12-17 02:52:27 +03:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
ValD
e2f825266a added condition to check for logined user 2018-12-13 23:20:59 +05:30
Maxim Filippov
e4a34cc4d4 Use 'userProfileLink' to generate user-profile link 2018-12-13 19:57:11 +03:00
Maxim Filippov
6532462b95 Move old routes to /p, use /nickname for user profiles 2018-12-06 22:09:54 +03:00
Maxim Filippov
bee6a0273b Route user to the correct profile URL 2018-11-28 19:24:50 +03:00
Henry Jameson
d6240c25cf small fix 2018-08-31 17:24:46 +03:00
eal
876f7633fe Use serverside html rendering in usernames and bios if available. 2018-08-09 12:52:34 +03:00
William Pitcock
7389f07115 follow requests: refactor to properly leverage vuex 2018-06-07 01:24:31 +00:00
William Pitcock
f3a27764aa add follow requests UI 2018-06-07 00:58:44 +00:00
Henry Jameson
38d366f9aa some more improvements. changed the way user-card is layout, but should look the
same, except that longer user names should be properly ellipsis-ed.
2018-04-08 04:23:43 +03:00
Henry Jameson
529643d35a indents 2018-04-07 19:30:27 +03:00
Henry Jameson
33b1d85921 border-radii moved to variables, made rgbo colors use theme data, customizable
from settings screen.
2018-04-07 16:40:08 +03:00
Henry Jameson
acdb5e5c7a cleanup. added fallback mechanism for IE11 and unsupported browsers. 2018-04-07 16:36:35 +03:00
Henry Jameson
aa0564406a getting rid of baseXX, some small fixes. Seems to be usable. 2018-04-07 16:34:11 +03:00
eal
05f053219b Fixed width usercards in follow lists. 2017-12-07 19:11:42 +02:00
shpuld
592c1cfd78 Fix padding at user card bottom, mismatching border-radii. Sneak in fixes for attachment previews. 2017-11-21 10:30:30 +02:00
shpuld
95cbd19254 Unhide completions, strengthen shadows a bit, force the 0.1 shade to always span the full height, make usercard use correct borders. 2017-11-20 13:03:02 +02:00
Roger Braun
7516cd859f Prepare for i18n. 2017-11-07 15:14:37 +01:00
Shpuld Shpuldson
bf61592b56 Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict. 2017-08-23 20:33:20 +03:00
eal
ccfc2e57d0 Add follower and following views 2017-08-23 19:14:06 +03:00