moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,056 Commits 70 Branches 19 Tags 22 MiB
Commit Graph

3056 Commits

Author SHA1 Message Date
HJ 6d1d09bcc0 Merge branch '509' into 'develop' 
Show ellipsis for long user name and screen name

Closes #509

See merge request pleroma/pleroma-fe!775
 2019-04-29 18:11:07 +00:00
taehoon 5b16e36828 remove & 2019-04-29 13:57:44 -04:00
taehoon a793835566 add a comment 2019-04-29 13:53:21 -04:00
taehoon b1f8221a0a show ellipsis for long user name and screen name 2019-04-29 13:27:10 -04:00
Henry Jameson 1387589ac9 fixed build speed 2019-04-28 22:03:03 +03:00
Henry Jameson 3e68514981 fix tests 2019-04-28 20:46:01 +03:00
Henry Jameson 75bc508fae attempt 2 2019-04-28 20:30:26 +03:00
taehoon 3665c86d70 use default_scope parameter 2019-04-27 21:51:17 -04:00
taehoon 904a64de89 use json content type 2019-04-27 14:20:32 -04:00
taehoon 2c4af6693a clean up 2019-04-27 14:04:30 -04:00
taehoon ab19669bf1 refactoring 2019-04-27 08:31:06 -04:00
taehoon 95bc2d727b add “export blocks” feature 2019-04-27 08:31:06 -04:00
taehoon 13abe64f87 fix wrong function binding 2019-04-27 08:31:06 -04:00
taehoon 08eaf9bd33 make reusable Exporter component 2019-04-27 08:31:06 -04:00
taehoon 0ab2f9dfa5 add “block import” feature 2019-04-27 08:31:06 -04:00
taehoon 6ea4154084 change api function name 2019-04-27 08:31:06 -04:00
taehoon 6d0e98a1c2 make Importer component reusable 2019-04-27 08:31:06 -04:00
taehoon 18bb209ace add uploading icon css 2019-04-27 08:31:06 -04:00
taehoon 903bce40c3 move formData generating logic to api.service 2019-04-27 08:31:06 -04:00
taehoon 562120ae48 split out follow’s importer as a separate component 2019-04-27 08:31:06 -04:00
taehoon ac0b45fa14 Update avatar uploading 2019-04-27 08:30:08 -04:00
taehoon e14720419f Switch to mastoapi for updating user profile 2019-04-27 08:30:08 -04:00
taehoon 909d11825d Switch to mastoapi for updating banner 2019-04-27 08:30:08 -04:00
taehoon 808e1ac11c Switch to mastoapi for updating avatar 
# Conflicts:
#	src/services/api/api.service.js
 2019-04-27 08:30:08 -04:00
Henry Jameson e0247e21f6 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass 
* upstream/develop: (126 commits)
  entity normalizer: hook up in_reply_to_account_acct
  add BBCode strings
  fix follow button not updating bug in follow-card
  refer searched user objects from the global user rep
  set max-width of textarea in settings page
  Remove space in the timeline setting copy
  user_card.vue: Fix .emoji to apply to img
  Update oc.json
  Update oc.json
  Update oc.json
  Update oc.json
  replace pencil with wrench icon
  rebuild fontello with wrench icon added
  fetch all friends using pagination
  stop fetching user relationship when user is unauthorized
  Revert "recover border between basic-user-card using list component"
  remove extra spacing
  code readability
  fix typos
  clean up
  ...
 2019-04-27 12:26:17 +03:00
HJ 9e2fa50b74 Merge branch 'bugfix/in-reply-to-account-acct' into 'develop' 
entity normalizer: hook up in_reply_to_account_acct

See merge request pleroma/pleroma-fe!773
 2019-04-27 07:19:16 +00:00
William Pitcock f4420cbf9f entity normalizer: hook up in_reply_to_account_acct 2019-04-27 04:52:11 +00:00
kaniini 8575f65852 Merge branch 'strings/bbcode' into 'develop' 
add BBCode strings

See merge request pleroma/pleroma-fe!772
 2019-04-26 22:52:27 +00:00
William Pitcock 55823b8d67 add BBCode strings 2019-04-26 22:48:21 +00:00
HJ e351f8630c Merge branch '492' into 'develop' 
Fix Follow/Mute/Block not functional issue in the user search page

Closes #492

See merge request pleroma/pleroma-fe!754
 2019-04-25 12:32:29 +00:00
Henry Jameson 2b5cf61a8f firefox 2019-04-24 21:53:51 +03:00
shpuld 8af8f719e4 fix i18n 2019-04-22 21:37:27 +03:00
shpuld 3e23b34168 fix overflow behavior 2019-04-22 21:07:29 +03:00
taehoon 445b54c553 fix follow button not updating bug in follow-card 2019-04-22 11:17:01 -04:00
taehoon f2f3fa81d8 refer searched user objects from the global user rep 2019-04-22 11:17:01 -04:00
shpuld d417945427 Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users 2019-04-22 17:24:35 +03:00
Shpuld Shpludson c8f967d5c0 Merge branch '500' into 'develop' 
Set max-width of textarea in settings page

Closes #500

See merge request pleroma/pleroma-fe!761
 2019-04-22 14:00:09 +00:00
Shpuld Shpludson 4b173b5182 Merge branch '487' into 'develop' 
Fix broken Follow Export

Closes #487

See merge request pleroma/pleroma-fe!762
 2019-04-22 13:59:12 +00:00
Shpuld Shpludson ffecbc2e79 Merge branch 'develop' into 'develop' 
[i18n] Update for Occitan language

See merge request pleroma/pleroma-fe!765
 2019-04-22 13:20:13 +00:00
Shpuld Shpludson 98742979c8 Merge branch '501' into 'develop' 
Remove space in the timeline setting copy

Closes #501

See merge request pleroma/pleroma-fe!763
 2019-04-22 13:15:07 +00:00
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
Shpuld Shpludson b7c16ad68e Merge branch 'bugfix/user-card-emojis-2' into 'develop' 
user_card.vue: Fix .emoji to apply to img

See merge request pleroma/pleroma-fe!766
 2019-04-22 13:06:15 +00:00
taehoon f7baa6e190 set max-width of textarea in settings page 2019-04-21 14:06:32 -04:00
taehoon aefd4551a3 Remove space in the timeline setting copy 2019-04-21 14:06:10 -04:00
Haelwenn (lanodan) Monnier 14d506154e
user_card.vue: Fix .emoji to apply to img 2019-04-20 21:12:56 +02:00
Exilat ed9aa8df76 Update oc.json 2019-04-20 14:44:43 +00:00
Exilat 213891ac71 Update oc.json 2019-04-20 14:38:04 +00:00
Exilat 69468c7c41 Update oc.json 2019-04-20 14:35:14 +00:00
Exilat 44f18caf4d Update oc.json 2019-04-20 14:29:04 +00: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