Commit graph

4578 commits

Author SHA1 Message Date
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
Shpuld Shpludson
dcef84363f Merge branch 'muting-fixes' into 'develop'
Properly detect thread-muted posts and set `with_muted` when fetching notifications

See merge request pleroma/pleroma-fe!941
2019-09-20 15:23:13 +00:00
rinpatch
1306fac38f Merge branch 'develop' into 'muting-fixes'
# Conflicts:
#   src/components/status/status.js
2019-09-16 11:38:37 +00:00
Shpuld Shpludson
9b163d2816 Merge branch '656' into 'develop'
Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page

Closes #656

See merge request pleroma/pleroma-fe!953
2019-09-16 07:27:06 +00:00
HJ
3cd23ae2d4 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-16 07:23:56 +00:00
Henry Jameson
c933f5edfc changelog 2019-09-15 17:22:14 +03:00
HJ
c78c7e7734 Update docs/USER_GUIDE.md 2019-09-15 13:43:42 +00:00
Henry Jameson
f961ce0f98 docs update 2019-09-15 16:41:14 +03:00
Henry Jameson
db961af3c8 unit test for emoji input, for now covering only insertion mechanism 2019-09-15 16:01:57 +03: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
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
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
Shpuld Shpludson
2bb053dd71 Merge branch 'develop' into 'develop'
Develop

See merge request pleroma/pleroma-fe!950
2019-09-12 06:58:19 +00:00
davidyin
a8cddecd41 fix some translation about blocks 2019-09-11 22:37:19 -07: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
Shpuld Shpludson
a4a4c46fe7 Merge branch '648-2' into 'develop'
Fix wrong body css while toggling visibility

Closes #648

See merge request pleroma/pleroma-fe!930
2019-09-09 19:22:11 +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
tarteka
5026d3719a fix some translates 2019-09-07 09:07:34 +02:00
tarteka
17a97ee6f5 fix some translates 2019-09-07 09:00:25 +02:00
taehoon
ea5b36a597 refactor toggling body visibility using class 2019-09-06 11:17:29 -04:00
taehoon
9727009147 update prop name 2019-09-06 11:17:05 -04:00
taehoon
482cd52f77 stop fetching whole conversation when change highlighted status 2019-09-06 11:17:04 -04:00
taehoon
c1f3b0dc75 refactoring 2019-09-06 11:17:04 -04:00
taehoon
214ab22c4c update prop binding 2019-09-06 11:17:04 -04:00
taehoon
d7c68d408f accept status id instead of status obj as statusoid prop 2019-09-06 11:17:04 -04:00