Commit Graph

3243 Commits

Author SHA1 Message Date
taehoon 85c897403a migrate Popper to v-popover 2019-10-24 15:15:33 -04:00
taehoon 2f7f6967fd fix popper go behind the top bar 2019-10-24 15:15:33 -04:00
taehoon e834b9d88b fix eslint warnings 2019-10-24 15:15:33 -04:00
taehoon 1504b272d2 reset font-size to normal text size using rem 2019-10-24 15:15:33 -04:00
taehoon 0f65280e20 use top placement by default 2019-10-24 15:15:33 -04:00
taehoon 72fe385ec4 hide status preview popper when hover popper content 2019-10-24 15:15:33 -04:00
taehoon 498d7bcb5e use better name 2019-10-24 15:15:33 -04:00
taehoon 5d6fcb3bb3 css cleanup 2019-10-24 15:15:33 -04:00
taehoon a26ec64b3b fix minor css issues in status preview 2019-10-24 15:15:33 -04:00
taehoon 565d53812b reposition popper after fetching status 2019-10-24 15:15:33 -04:00
taehoon 5faafdb428 use popper for status preview 2019-10-24 15:15:32 -04:00
Henry Jameson da3094eab7 fix scrolling to attachments bottom 2019-10-22 23:53:23 +03:00
taehoon d76b83efc8 set flex-shrink and flex-basis explicitly 2019-10-22 14:47:21 -04:00
taehoon b9c281c553 set flex amount correctly 2019-10-22 07:17:02 -04:00
taehoon ad04522206 update flex-grow calculation logic 2019-10-22 07:17:02 -04:00
taehoon 0396c6f29d keep image natural ratio in gallery row 2019-10-22 07:17:02 -04:00
taehoon 6c4d23714a populate gallery row height without getting width 2019-10-22 07:17:01 -04:00
taehoon eb695fd61d refactor using Set 2019-10-21 20:57:36 -04:00
taehoon d3a6c030f8 clean up 2019-10-21 20:53:34 -04:00
taehoon 6084a5b6fe update event name 2019-10-21 20:52:31 -04:00
taehoon c23a87d8ff update condition 2019-10-21 15:56:16 -04:00
taehoon 2cadeeb724 move modal animation keyframes definition 2019-10-21 15:37:14 -04:00
taehoon c217483640 migrate viewClass prop to class attribute 2019-10-21 15:36:03 -04:00
taehoon b3699a7c7c fix eslint errors 2019-10-18 12:39:54 -04:00
taehoon 5eeded5675 fix message input not auto-focusing bug 2019-10-18 12:24:03 -04:00
taehoon 95ad5ccaf1 revert changes to render modal into portal 2019-10-18 12:22:12 -04:00
taehoon d69b8794b0 use higher css specificity 2019-10-18 12:13:11 -04:00
Your New SJW Waifu f883a8875d Merge remote-tracking branch 'upstream/develop' into develop 2019-10-18 11:07:50 -05:00
taehoon a302ec1f08 fix eslint warnings 2019-10-18 11:57:54 -04:00
taehoon 215232cc30 remove needless ref definition 2019-10-18 11:54:42 -04:00
taehoon a41ffea146 render modals into the “modal” portal 2019-10-18 11:53:38 -04:00
taehoon d502baaffc remove needless console.log 2019-10-18 07:28:59 -04:00
taehoon 9709075476 remove needless importing 2019-10-18 07:28:29 -04:00
taehoon 2231025c41 fix eslint warning 2019-10-18 07:08:34 -04:00
taehoon 0df0876cf1 move modal css into the correct place 2019-10-18 07:07:16 -04:00
taehoon 348d6664eb refactor all kind of modals using the modal component 2019-10-18 07:05:01 -04:00
taehoon 07ec18fe11 add reusable modal component 2019-10-18 07:04:24 -04:00
taehoon 093d785fbf handle multiple body scroll lockers 2019-10-17 16:03:41 -04:00
taehoon 8db1fa506c lock body scroll when user reporting modal is open 2019-10-17 16:00:19 -04:00
taehoon 776f0ef774 lock body scroll when post status modal is open 2019-10-17 15:43:59 -04:00
HJ 051e6ea5ca Merge branch 'issue/684' into 'develop'
[#684] updated FollowCard component

See merge request pleroma/pleroma-fe!972
2019-10-17 19:03:07 +00:00
Maksim Pechnikov b3f590ceb3 clear code 2019-10-17 20:29:18 +03:00
eal 1287836eee Fix reply arrow highlighting in some accessibility tools
The cursor style needs to be "pointer" even before hovering, since
keyboard-driven browsing never hovers over the elements.
2019-10-17 16:44:22 +03:00
Maksim Pechnikov 60828f119c updated FollowCard component 2019-10-17 16:19:52 +03:00
Maxim Filippov 37be781312 Require password reset 2019-10-16 10:00:26 +00:00
HJ d2feba1487 Merge branch 'feature/following_reblogs' into 'develop'
[#664]  implementes to hide/show reblogs from a specific user.

See merge request pleroma/pleroma-fe!956
2019-10-15 06:26:12 +00:00
Henry Jameson 6266148745 Reserve space for emoji picker button in emoji input 2019-10-14 19:56:46 +03:00
Your New SJW Waifu 7813ad4086 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-11 11:59:54 -05:00
Maksim Pechnikov d53e7e3125 fix orders of a buttons 2019-10-11 16:54:25 +03:00
Maksim Pechnikov b8d8d02384 revert lint autofix 2019-10-11 16:41:59 +03:00
Maksim Pechnikov b497882e0e fix position account actions 2019-10-11 14:25:59 +03:00
HJ 8b2d873057 Merge branch 'es-translate' into 'develop'
[i18n] spanish new strings translations

See merge request pleroma/pleroma-fe!968
2019-10-10 17:02:34 +00:00
Henry Jameson 1400d723f2 fix picker not filling on opening, removed console log 2019-10-10 19:58:00 +03:00
Henry Jameson c000879f2f moved emoji fetching from user to instance since it's its state anyway 2019-10-09 22:50:00 +03:00
Henry Jameson b02de56fcb always preload first batch of emoji to avoid unnecessary UI jumps 2019-10-09 22:33:15 +03:00
Henry Jameson a54c8b994e another missed thing 2019-10-09 21:32:32 +03:00
Maksim Pechnikov 69fb015e9f removed unused code 2019-10-09 16:20:51 +03:00
Maksim Pechnikov e3f6001b3e update css 2019-10-09 15:36:26 +03:00
Maksim Pechnikov a65b328239 remove unused code 2019-10-09 08:30:48 +03:00
Maksim Pechnikov f6c0e06884 Merge branch 'develop' into feature/following_reblogs 2019-10-09 08:15:37 +03:00
Henry Jameson 792eaf5625 fix! i noticed it!! 2019-10-08 23:57:58 +03:00
Your New SJW Waifu ee07fad6e4 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-08 14:13:50 -05:00
Henry Jameson fa4e69ec8c eslint 2019-10-08 21:38:27 +03:00
Henry Jameson 81d86a39fe fixed emoji picker showing up beyond viewport 2019-10-08 21:38:27 +03:00
Henry Jameson bed109ae46 start loading emoji when picker is open 2019-10-08 21:38:27 +03:00
Henry Jameson 37b8490c01 remove the "textbox grows the 'wrong' way" behavior, replace it with more
conditions to scroll to bottom
2019-10-08 21:38:27 +03:00
Henry Jameson 6511a744a2 arbitrary limit with option to overcome it 2019-10-08 21:38:27 +03:00
Henry Jameson 29e6e62e7c emoji picker gradual render 2019-10-08 21:38:27 +03:00
Henry Jameson 91ca1db778 moved emoji stuff away from after-store and into users module since we only need
emoji after login
2019-10-08 21:38:27 +03:00
Your New SJW Waifu 34566e99d9 test 2019-10-08 12:15:33 -05:00
Your New SJW Waifu a0aaedd845 Open in new tab 2019-10-08 12:06:13 -05:00
Your New SJW Waifu 0696b145eb hyperlink fix 2019-10-08 11:49:48 -05:00
Your New SJW Waifu 7db56b0311 Fix imageSrc 2019-10-08 11:26:11 -05:00
Your New SJW Waifu 5df3db9605 maybe this'll fix ii 2019-10-08 11:08:38 -05:00
Your New SJW Waifu 435f825e2e whatever 2019-10-08 11:03:56 -05:00
Your New SJW Waifu 3c866ef350 I think this is the last of the formatting changes 2019-10-08 10:53:24 -05:00
Your New SJW Waifu 3c00fd0e32 Formatting fixes 2019-10-08 10:49:32 -05:00
Your New SJW Waifu 22925bdb1f More formatting fixes 2019-10-08 10:45:06 -05:00
Your New SJW Waifu a28a5c67c4 More whitespace fixes 2019-10-08 10:36:26 -05:00
Your New SJW Waifu a49ca59d34 Fix whitespace 2019-10-08 10:22:48 -05:00
Your New SJW Waifu 6d20a59aba new banner image, automatic banner updates courtesy of @moonman 2019-10-08 10:13:07 -05:00
Maksim Pechnikov 7fede8572d change icon 2019-10-08 17:32:58 +03:00
Maksim Pechnikov 78e8a49f40 fix follow request on search page 2019-10-08 17:07:01 +03:00
Maksim Pechnikov 541a71c3a5 Merge branch 'develop' into feature/following_reblogs 2019-10-08 16:49:03 +03:00
Maksim Pechnikov a26d550137 updated user_card 2019-10-08 16:46:54 +03:00
Maksim Pechnikov 9c305c5f93 Revert "added acccount_actions component"
This reverts commit 188b6f56ed.
2019-10-08 10:21:40 +03:00
tarteka 16c03995cb [i18n] spanish new strings translations
update to translate the latest text strings
2019-10-07 21:21:16 +02:00
Henry Jameson d0800d0bd8 removed unused thing 2019-10-07 20:44:03 +03:00
Henry Jameson e7532464e3 Replaced most trivial checkboxes with Checkbox component 2019-10-07 20:43:23 +03:00
Echedey López Romero 97f9628bea Little fix to "login"/"description" and "register" strings to es.json referenced as verbs. 2019-10-07 12:34:38 +00:00
tarteka 67436ed144 update and fix 2019-10-07 10:22:17 +02:00
Henry Jameson 8ee50f9f16 replace checkboxes in user-settings with Checkbox component 2019-10-07 00:05:21 +03:00
Henry Jameson 0be86304d2 Fix tests, more replacing with mergedConfig 2019-10-06 23:28:30 +03:00
Your New SJW Waifu 62019a14a5 Increase default attachment preview to a more reasonable number 2019-10-05 10:51:29 -05:00
Your New SJW Waifu 1338f85773 Make banner link open in new tab 2019-10-03 13:27:10 -05:00
Your New SJW Waifu 08aa9089ba Whitespace fixes 2019-10-03 13:14:00 -05:00
Your New SJW Waifu fdd4ebea3d Banner fix 2019-10-03 13:06:50 -05:00
Your New SJW Waifu cb05395e38 Better default text 2019-10-03 13:01:21 -05:00
Your New SJW Waifu bb413c3bff Forgot to add new files 2019-10-03 12:56:17 -05:00
Your New SJW Waifu 75ba90a276 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-03 12:52:00 -05:00
Your New SJW Waifu ca7fd49f69 Added spoopy banner 2019-10-03 12:51:11 -05:00
taehoon 33759e4153 update admin url 2019-10-02 13:28:16 -04:00
Your New SJW Waifu ee500fe4fb Merge remote-tracking branch 'upstream/develop' into develop 2019-10-01 13:07:02 -05:00
taehoon 7e5a3fa09f update copy 2019-10-01 07:36:42 -04:00
taehoon 503f086487 add trailing slash to admin url 2019-10-01 07:36:42 -04:00
taehoon d9b01643e2 open in a new tab 2019-10-01 07:36:42 -04:00
taehoon 093fcee902 add admin link to the side drawer 2019-10-01 07:36:41 -04:00
taehoon 4f75ad9905 add admin link to nav 2019-10-01 07:36:41 -04:00
kaniini f3fdc92f15 Merge branch 'fix-regex-normalizer' into 'develop'
fix regex shortcode problem

Closes #675

See merge request pleroma/pleroma-fe!963
2019-10-01 06:29:31 +00:00
Henry Jameson a2923570c3 fix regex shortcode problem 2019-09-30 23:45:03 +03:00
Your New SJW Waifu ec7526e0b3 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-30 14:45:56 -05:00
Maksim Pechnikov 188b6f56ed added acccount_actions component 2019-09-30 20:36:14 +03:00
Hakaba Hitoyo 194979783e i18n/Update Pedantic Japanese Messages 2019-09-30 05:09:05 +00:00
Hakaba Hitoyo 087a5b612d i18n/Update Japanese Messages 2019-09-30 05:07:57 +00:00
Henry Jameson 20fc259350 fixed default values for multi-choice configurations, should also fix warnings 2019-09-30 00:04:43 +03:00
Henry Jameson 39b71e5dd6 Removed all whole mess of manual watch/data declaration, now fully automatic 2019-09-29 23:47:26 +03:00
Henry Jameson 979e170bd6 created mergedConfig getter to avoid obnoxious checks for undefined everywhere 2019-09-29 22:33:15 +03:00
taehoon 50d9ed0007 reset post status form only when reply user is changed 2019-09-28 16:35:39 -04:00
Your New SJW Waifu b9814a2afd Merge remote-tracking branch 'upstream/develop' into develop 2019-09-27 07:32:43 -05:00
Hakaba Hitoyo bc17839e52 Small refactoring in who to follow page 2019-09-26 22:32:39 +00:00
Hakaba Hitoyo 194dd88118 Feature/Add _Allow user discovery services_ preference 2019-09-26 22:31:28 +00:00
kaniini 4369ce6f1b Merge branch 'hide-followers-follows-count' into 'develop'
Added a setting to hide follow/follower count from the user profile

See merge request pleroma/pleroma-fe!951
2019-09-26 22:20:01 +00:00
Maksim Pechnikov 19cb98b85f Merge branch 'develop' into feature/following_reblogs 2019-09-26 21:14:31 +03:00
Your New SJW Waifu 4319a9f7f8 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-26 05:52:11 -05:00
Your New SJW Waifu f271d4417c Resolved merge conflict with index.html 2019-09-25 16:09:13 -05:00
Henry Jameson a3305799c7 Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (42 commits)
  Fix formatting in oc.json
  avoid using global class
  fix logo moving bug when lightbox is open
  Reserve scrollbar gap when body scroll is locked
  setting display: initial makes trouble, instead, toggle display: none using classname
  lock body scroll
  add body-scroll-lock directive
  install body-scroll-lock
  wire up props with PostStatusModal
  rename component
  recover autofocusing behavior
  refactor MobilePostStatusModal using new PostStatusModal
  add new module and modal to post new status
  remove needless condition
  add mention button
  wire up user state with global store
  collapse fav/repeat notifications from muted users
  do not collapse thread muted posts in conversation
  detect thread-muted posts
  do not change word based muting logic
  ...
2019-09-25 20:26:49 +03:00
Henry Jameson 2f26e8acc5 eslint 2019-09-25 20:23:55 +03:00
Henry Jameson e6d2cf77af fix emoji inputs in user-settings, styles update 2019-09-25 20:11:06 +03:00
Henry Jameson 0b300e1708 bump z-index so that picker/suggest doesn't get overlapped by mobile button 2019-09-25 20:01:06 +03:00
Henry Jameson e805303d3a Scroll emoji picker into view if it's obstructed 2019-09-25 19:58:15 +03:00
Henry Jameson e3ceae0989 very important fix 2019-09-25 19:32:30 +03:00
Henry Jameson 0d6a9f5a62 comment, cleanup and improve autoresize/autoscroll 2019-09-25 19:30:55 +03:00
Shpuld Shpuldson e55645aec1 Fix formatting in oc.json 2019-09-25 10:25:44 +03:00
Shpuld Shpludson 170372b2bc Merge branch '616' into 'develop'
Lock body scroll when lightbox is open

Closes #616

See merge request pleroma/pleroma-fe!886
2019-09-25 07:16:23 +00:00
Shpuld Shpludson 49ea63ddf3 Merge branch 'develop' into 'develop'
[i18n] Update for the Occitan language file

See merge request pleroma/pleroma-fe!901
2019-09-25 07:12:34 +00:00
Shpuld Shpludson 7a1081aa66 Merge branch 'es-translate' into 'develop'
[i18n] Update es translate

See merge request pleroma/pleroma-fe!944
2019-09-25 07:10:11 +00:00
Shpuld Shpludson 4c55e0d1be Merge branch 'eu-translate' into 'develop'
[i18n] update eu translate

See merge request pleroma/pleroma-fe!943
2019-09-25 07:09:57 +00:00
Shpuld Shpludson ccba92a27c Merge branch '639-2' into 'develop'
Add "Mention user" button to user card

Closes #639

See merge request pleroma/pleroma-fe!955
2019-09-25 06:41:26 +00:00
Henry Jameson 0f55359b49 fix 2019-09-25 08:43:02 +03:00
Henry Jameson 4f563e6efb account for parent padding, too 2019-09-25 08:36:30 +03:00
Henry Jameson daa0e284c3 forgotten file 2019-09-25 00:21:55 +03:00
Henry Jameson ca92e29401 WIP: fixed autoscroll, restructured Post Status Form's resize method "a bit" 2019-09-25 00:17:04 +03:00
Henry Jameson 2154152d08 fix some bugs 2019-09-24 00:06:53 +03:00
Henry Jameson 6f0257cd7d autoscroll post form on typing + some minor improvements 2019-09-23 22:12:25 +03:00
Henry Jameson 7b4cb38734 split spam mode into two separate options (one in settings page) 2019-09-23 20:36:49 +03:00
eugenijm aafb29c589 Added a setting to hide follow/follower count from the user profile 2019-09-23 16:19:21 +03:00
Maksim Pechnikov f0b9f5d29c use `repeats` intead `boosts` 2019-09-22 14:45:42 +03:00
Your New SJW Waifu 4cbc11bf10 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-21 10:58:13 -05:00
Maksim Pechnikov 8721fb57fc added support hide\show reblogs from a specific user 2019-09-21 16:24:47 +03:00
taehoon 7fe6ba2401 avoid using global class 2019-09-20 11:35:47 -04:00
taehoon 37ae0fd92c fix logo moving bug when lightbox is open 2019-09-20 11:35:47 -04:00
taehoon 92be5a6877 Reserve scrollbar gap when body scroll is locked 2019-09-20 11:35:47 -04:00
taehoon ae70439447 setting display: initial makes trouble, instead, toggle display: none using classname 2019-09-20 11:35:47 -04:00
taehoon ad504768fe lock body scroll 2019-09-20 11:35:47 -04:00
taehoon 8b321f6f1f add body-scroll-lock directive 2019-09-20 11:35:47 -04:00
taehoon c8a18f387c wire up props with PostStatusModal 2019-09-20 11:29:31 -04:00
taehoon d6a941a128 rename component 2019-09-20 11:29:29 -04:00
taehoon 0c8038d4f6 recover autofocusing behavior 2019-09-20 11:29:27 -04:00
taehoon a9f33272a8 refactor MobilePostStatusModal using new PostStatusModal 2019-09-20 11:29:26 -04:00
taehoon f4bbf1d4e2 add new module and modal to post new status 2019-09-20 11:29:24 -04:00
taehoon 90981dcce6 remove needless condition 2019-09-20 11:29:23 -04:00
taehoon 5ff899b455 add mention button 2019-09-20 11:29:21 -04:00
taehoon f8139e369c wire up user state with global store 2019-09-20 11:25:00 -04:00
taehoon 8618857aa3 collapse fav/repeat notifications from muted users 2019-09-20 11:25:00 -04:00
Your New SJW Waifu bd19971311 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-16 11:09:25 -05:00
rinpatch 1306fac38f Merge branch 'develop' into 'muting-fixes'
# Conflicts:
#   src/components/status/status.js
2019-09-16 11:38:37 +00:00
HJ 3cd23ae2d4 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-16 07:23:56 +00:00
Henry Jameson 312e2aa14f fix bottom-left icons being too damn wide 2019-09-15 12:51:39 +03:00
Henry Jameson a1ed1b9b53 improved post form's icons at bottom display 2019-09-15 12:30:07 +03:00
Henry Jameson e366adbb6c updated logic for padding with spaces, improved spam mode 2019-09-15 12:30:02 +03:00
Henry Jameson d2fe797821 update status/user card to use same gradient mask fading effect instead of
background hack
2019-09-15 02:14:40 +03:00
Henry Jameson f0cb6fe03f Fixed scrollability not being obvious, added fade effect 2019-09-15 01:16:54 +03:00
taehoon baebf08d20 do not collapse thread muted posts in conversation 2019-09-13 22:59:45 -04:00
taehoon 6a3f283256 detect thread-muted posts 2019-09-13 22:59:24 -04:00
Your New SJW Waifu 5ab5ef8764 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-13 17:15:28 -05:00
taehoon 2f79a7b4a0 do not change word based muting logic 2019-09-13 16:55:17 -04:00
taehoon b10558f721 do not collapse muted user's posts on muted user's media timeline 2019-09-13 16:17:51 -04:00
taehoon 09deb69bc7 do not collapse muted user's posts on muted user's profile page 2019-09-13 15:38:04 -04:00
Shpuld Shpludson 09db4ceb1a Merge branch 'fix/italics-not-selectable' into 'develop'
fix italics not being selectable

See merge request pleroma/pleroma-fe!952
2019-09-13 17:21:15 +00:00
Shpuld Shpuldson 794481d76c fix italics not being selectable 2019-09-13 20:16:05 +03:00
Henry Jameson 3505e53756 review/naming + bugfix for stickers 2019-09-12 20:36:43 +03:00
Henry Jameson 9bd0ed7912 updated logic for hiding picker and also added ability to hide suggestions with
esc key
2019-09-12 20:25:11 +03:00
Henry Jameson 0d8b68632b Remove emoji zoom 2019-09-12 20:25:11 +03:00
Your New SJW Waifu 16650ede23 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-12 09:45:37 -05:00
Shpuld Shpludson 4a469d7fe3 Merge branch 'fix/follow-request-detection' into 'develop'
Utilize `user.requested` to display follow request status on user card

Closes #635

See merge request pleroma/pleroma-fe!942
2019-09-12 07:02:11 +00:00
davidyin a8cddecd41 fix some translation about blocks 2019-09-11 22:37:19 -07:00
Your New SJW Waifu 118bbc385d Merge remote-tracking branch 'upstream/develop' into develop 2019-09-11 11:19:05 -05:00
davidyin d0fc509ad1 Complete the Chinese language file based on the version 0.9.999 2019-09-10 19:50:06 -07:00
HJ 4f0195b05c Apply suggestion to src/components/emoji_picker/emoji_picker.vue 2019-09-10 18:39:45 +00:00
tarteka 6217ef4718 fix some translates 2019-09-10 10:09:07 +02:00
Shpuld Shpludson 753d15ed37 Merge branch '651' into 'develop'
Fix "Needless context api requests when click timeago in conversation page"

Closes #651

See merge request pleroma/pleroma-fe!934
2019-09-09 19:47:58 +00:00
HJ 9651293956 Apply suggestion to src/components/emoji_picker/emoji_picker.js 2019-09-09 19:42:33 +00:00
Henry Jameson 9146bee7aa better hitbox for status emoji 2019-09-08 21:18:52 +03:00
Henry Jameson 7360a4d9ef fix aspect 2019-09-08 17:11:45 +03:00
HJ 2237da0151 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-08 14:08:39 +00:00
Henry Jameson 4f88bb4ea1 scale emoji on hover 2019-09-08 17:01:28 +03:00
Henry Jameson 83f45167b6 added emoji zoom for picker 2019-09-08 16:56:54 +03:00
Henry Jameson 94afc5ee19 fixed scroll when switching back to emoji 2019-09-08 15:57:49 +03:00
Henry Jameson 14df84d89b fixed some bugs, added spam mode, minor collateral fixes 2019-09-08 15:51:17 +03:00
Henry Jameson db086fe1fd Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (116 commits)
  Password reset page
  add a comment
  force img updating immediately
  Fixed "sequimiento" to "seguimiento".
  Replace `/api/externalprofile/show.json` with a MastoAPI equialent
  Use mastodon api in follow requests
  "Optional" in lowercase.
  Update es.json
  fix pin/unpin status logic
  rename a mutation
  update
  fix user avatar fallback logic
  remove dead code
  Corrected "Media Proxy" translation.
  Update es.json
  make bio textarea resizable vertically only
  remove dead code
  Make image orientation consistent on FF, fix videos w/ modal
  remove dead code
  fix crazy watch logic in conversation
  ...
2019-09-08 13:44:29 +03:00