Commits · d94fdd0617057f17a677e7e409f65021afc9d124 · Ilja / pleroma-fe

Apr 29, 2019
- Merge branch '220-import-export-blocks-mutes' into 'develop' · d94fdd06
  HJ authored 5 years ago
  
  Allow import/export of blocks See merge request pleroma/pleroma-fe!717
  d94fdd06
- Merge branch '509' into 'develop' · 6d1d09bc
  HJ authored 5 years ago
  
  Show ellipsis for long user name and screen name Closes #509 See merge request pleroma/pleroma-fe!775
  6d1d09bc
- remove & · 5b16e368
  Tae Hoon authored 5 years ago
  
  5b16e368
- add a comment · a7938355
  Tae Hoon authored 5 years ago
  
  a7938355
- show ellipsis for long user name and screen name · b1f8221a
  Tae Hoon authored 5 years ago
  
  b1f8221a
Apr 27, 2019
- refactoring · ab19669b
  Tae Hoon authored 6 years ago
  
  ab19669b
- add “export blocks” feature · 95bc2d72
  Tae Hoon authored 6 years ago
  
  95bc2d72
- fix wrong function binding · 13abe64f
  Tae Hoon authored 6 years ago
  
  13abe64f
- make reusable Exporter component · 08eaf9bd
  Tae Hoon authored 6 years ago
  
  08eaf9bd
- add “block import” feature · 0ab2f9df
  Tae Hoon authored 6 years ago
  
  0ab2f9df
- change api function name · 6ea41540
  Tae Hoon authored 6 years ago
  
  6ea41540
- make Importer component reusable · 6d0e98a1
  Tae Hoon authored 6 years ago
  
  6d0e98a1
- add uploading icon css · 18bb209a
  Tae Hoon authored 6 years ago
  
  18bb209a
- move formData generating logic to api.service · 903bce40
  Tae Hoon authored 6 years ago
  
  903bce40
- split out follow’s importer as a separate component · 562120ae
  Tae Hoon authored 6 years ago
  
  562120ae
- Merge branch 'bugfix/in-reply-to-account-acct' into 'develop' · 9e2fa50b
  HJ authored 5 years ago
  
  entity normalizer: hook up in_reply_to_account_acct See merge request pleroma/pleroma-fe!773
  9e2fa50b
- entity normalizer: hook up in_reply_to_account_acct · f4420cbf
  kaniini authored 5 years ago
  
  f4420cbf
Apr 26, 2019
- Merge branch 'strings/bbcode' into 'develop' · 8575f658
  kaniini authored 5 years ago
  
  add BBCode strings See merge request pleroma/pleroma-fe!772
  8575f658
- add BBCode strings · 55823b8d
  kaniini authored 5 years ago
  
  55823b8d
Apr 25, 2019

Merge branch '492' into 'develop' · e351f863

HJ authored 5 years ago

Fix Follow/Mute/Block not functional issue in the user search page

Closes #492

See merge request pleroma/pleroma-fe!754

e351f863

Apr 22, 2019
- fix follow button not updating bug in follow-card · 445b54c5
  Tae Hoon authored 5 years ago
  
  445b54c5
- refer searched user objects from the global user rep · f2f3fa81
  Tae Hoon authored 5 years ago
  
  f2f3fa81
- Merge branch '500' into 'develop' · c8f967d5
  Shpuld Shpludson authored 5 years ago
  
  Set max-width of textarea in settings page Closes #500 See merge request pleroma/pleroma-fe!761
  c8f967d5
- Merge branch '487' into 'develop' · 4b173b51
  Shpuld Shpludson authored 5 years ago
  
  Fix broken Follow Export Closes #487 See merge request pleroma/pleroma-fe!762
  4b173b51
- Merge branch 'develop' into 'develop' · ffecbc2e
  Shpuld Shpludson authored 5 years ago
  
  [i18n] Update for Occitan language See merge request pleroma/pleroma-fe!765
  ffecbc2e
- Merge branch '501' into 'develop' · 98742979
  Shpuld Shpludson authored 5 years ago
  
  Remove space in the timeline setting copy Closes #501 See merge request pleroma/pleroma-fe!763
  98742979
- Merge branch 'change-pencil-to-wrentch' into 'develop' · 9183c9e8
  Shpuld Shpludson authored 5 years ago
  
  Change pencil icon to wrentch See merge request pleroma/pleroma-fe!764
  9183c9e8
- Merge branch 'bugfix/user-card-emojis-2' into 'develop' · b7c16ad6
  Shpuld Shpludson authored 5 years ago
  
  user_card.vue: Fix .emoji to apply to img See merge request pleroma/pleroma-fe!766
  b7c16ad6
Apr 21, 2019
- set max-width of textarea in settings page · f7baa6e1
  Tae Hoon authored 5 years ago
  
  f7baa6e1
- Remove space in the timeline setting copy · aefd4551
  Tae Hoon authored 5 years ago
  
  aefd4551
Apr 20, 2019
- user_card.vue: Fix .emoji to apply to img · 14d50615
  Haelwenn authored 5 years ago
  
  Verified
  
  14d50615
- Update oc.json · ed9aa8df
  Exilat authored 5 years ago
  
  ed9aa8df
- Update oc.json · 213891ac
  Exilat authored 5 years ago
  
  213891ac
- Update oc.json · 69468c7c
  Exilat authored 5 years ago
  
  69468c7c
- Update oc.json · 44f18caf
  Exilat authored 5 years ago
  
  44f18caf
Apr 19, 2019

replace pencil with wrench icon · 6aee2ed6
Brenden Bice authored 5 years ago and Tae Hoon committed 5 years ago
```
# Conflicts:
#	src/components/user_card/user_card.vue
```
6aee2ed6

rebuild fontello with wrench icon added · d6be4fd9

Brenden Bice authored 5 years ago and

Tae Hoon committed 5 years ago

# Conflicts:
#	static/font/css/fontello-codes.css
#	static/font/css/fontello-embedded.css
#	static/font/css/fontello-ie7-codes.css
#	static/font/css/fontello-ie7.css
#	static/font/css/fontello.css
#	static/font/demo.html
#	static/font/font/fontello.eot
#	static/font/font/fontello.svg
#	static/font/font/fontello.ttf
#	static/font/font/fontello.woff
#	static/font/font/fontello.woff2

d6be4fd9

fetch all friends using pagination · 3565b187
Tae Hoon authored 5 years ago

3565b187

Apr 18, 2019
- Merge branch '497' into 'develop' · 61d04b88
  HJ authored 5 years ago
  
  Stop fetching user relationship when user is unauthorized Closes #497 See merge request pleroma/pleroma-fe!759
  61d04b88
- stop fetching user relationship when user is unauthorized · 992c8e1f
  Tae Hoon authored 5 years ago
  
  992c8e1f