Commit graph

2982 commits

Author SHA1 Message Date
taehoon
d7c68d408f accept status id instead of status obj as statusoid prop 2019-09-06 11:17:04 -04:00
tarteka
1167bafb19 Update es translate 2019-09-06 14:58:20 +02:00
tarteka
f48d12b4bc update eu translate 2019-09-06 14:24:37 +02:00
Shpuld Shpludson
e75ac9ddbc Merge branch 'mastoapi-externalprofile' into 'develop'
Replace `/api/externalprofile/show.json` with a MastoAPI equialent

See merge request pleroma/pleroma-fe!938
2019-09-06 04:13:21 +00:00
Eugenij
8ee5abb1a5 Password reset page 2019-09-05 11:23:28 +00:00
rinpatch
424d4ab57e Utilize user.requested to display follow request status on user card
Closes #635
2019-09-05 11:17:53 +03:00
rinpatch
b33667a743 Avoid iterating over statuses to set thread_muted if the backend does
not support the extension
2019-09-04 22:17:29 +03:00
rinpatch
1a5a7bbebf Set thread_muted for all statuses with the same conversation id on
status mute/unmute
2019-09-04 21:11:13 +03:00
taehoon
d194431642 add a comment 2019-09-04 11:24:24 -04:00
taehoon
cdbb8ca8b9 force img updating immediately 2019-09-04 11:24:24 -04:00
rinpatch
66a34b7ecf Properly detect thread-muted posts and set with_muted when fetching
notifications
2019-09-04 12:20:33 +03:00
Echedey López Romero
d1244e4896 Fixed "sequimiento" to "seguimiento". 2019-09-03 17:51:50 +00:00
rinpatch
457290e81e Replace /api/externalprofile/show.json with a MastoAPI equialent
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
2019-09-03 19:59:28 +03:00
rinpatch
8e3d6f5c28 Use mastodon api in follow requests 2019-09-03 13:50:26 +03:00
Shpuld Shpludson
6238fe3633 Merge branch '652' into 'develop'
Fix "TypeError: Cannot set property 'pinned' of undefined"

Closes #652

See merge request pleroma/pleroma-fe!936
2019-09-03 04:48:24 +00:00
Shpuld Shpludson
c43a5ab992 Merge branch 'patch-1' into 'develop'
Some corrections to the spanish translation

See merge request pleroma/pleroma-fe!929
2019-09-03 04:11:16 +00:00
Shpuld Shpludson
fbfedf0084 Merge branch 'fix/attachment-css' into 'develop'
Make image orientation consistent on FF, fix videos w/ modal

See merge request pleroma/pleroma-fe!926
2019-09-03 04:09:56 +00:00
Echedey López Romero
66e9f17c58 "Optional" in lowercase. 2019-09-02 11:41:30 +00:00
Echedey López Romero
4f82ea0fea Update es.json 2019-09-01 21:57:07 +00:00
taehoon
daf7d4e661 fix pin/unpin status logic 2019-09-01 13:07:43 -04:00
taehoon
13b80b5c7c rename a mutation 2019-09-01 13:07:43 -04:00
Shpuld Shpludson
018a650166 Merge branch 'remove-dead-code' into 'develop'
Remove dead code

See merge request pleroma/pleroma-fe!927
2019-08-29 17:16:57 +00:00
taehoon
9476fbba5a fix user avatar fallback logic 2019-08-28 14:02:04 -04:00
taehoon
c01d2543d5 remove dead code 2019-08-28 13:06:57 -04:00
Echedey López Romero
a15810afc8 Corrected "Media Proxy" translation. 2019-08-27 19:07:07 +00:00
Echedey López Romero
50bf9e633b Update es.json 2019-08-26 21:37:39 +00:00
taehoon
e1c2c5cfed make bio textarea resizable vertically only 2019-08-26 16:00:19 -04:00
taehoon
a0712270aa remove dead code 2019-08-26 14:29:40 -04:00
Shpuld Shpuldson
15c4088a68 Make image orientation consistent on FF, fix videos w/ modal 2019-08-26 14:08:30 +03:00
taehoon
7b5cdab7cd remove dead code 2019-08-25 16:58:13 -04:00
taehoon
9b8bf655e1 fix crazy watch logic in conversation 2019-08-23 13:49:39 -04:00
taehoon
65579796ed show three dot button only if needed 2019-08-20 17:00:28 -04:00
taehoon
92a0c475f7 hide mute conversation button to guests 2019-08-20 16:55:42 -04:00
taehoon
4bedbfea3c update keyBy 2019-08-17 22:10:01 -04:00
taehoon
1146119d6a generate idObj at timeline level 2019-08-17 14:33:32 -04:00
taehoon
4b444708f2 fix pin showing logic in conversation 2019-08-17 14:33:32 -04:00
Sergey Suprunenko
d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before 2019-08-17 08:18:42 +00:00
Shpuld Shpludson
58713e342d Merge branch 'eu-translate' into 'develop'
add Basque translate

See merge request pleroma/pleroma-fe!900
2019-08-17 08:16:45 +00:00
Shpuld Shpludson
84c3403143 Merge branch 'es-translate' into 'develop'
[i18n] Spanish corrections

See merge request pleroma/pleroma-fe!904
2019-08-17 08:15:06 +00:00
Shpuld Shpludson
aef97bc9bc Merge branch 'update-nb' into 'develop'
Update norwegian bokmål translation

See merge request pleroma/pleroma-fe!906
2019-08-17 08:14:47 +00:00
Hakaba Hitoyo
091fb5573c i18n/Update Japanese 2019-08-17 08:14:17 +00:00
Hakaba Hitoyo
fc68c3907d i18n/Update pedantic Japanese 2019-08-17 08:14:00 +00:00
Shpuld Shpludson
e8fad7a460 Merge branch 'telugu-translation' into 'develop'
i18n: Translated to Telugu (44.3%)

See merge request pleroma/pleroma-fe!913
2019-08-17 08:13:29 +00:00
taehoon
7dfcabb543 sync profile tab state with location query 2019-08-15 13:25:38 -04:00
taehoon
e8c22fbfa3 refactor TabSwitcher 2019-08-15 13:25:38 -04:00
taehoon
6e51774ccb use better name of controlled prop 2019-08-15 13:25:38 -04:00
taehoon
eafd53f994 fix potential bug to render active tab in controlled way 2019-08-15 13:25:38 -04:00
taehoon
9dd9ba0205 remove unused param 2019-08-15 13:25:38 -04:00
taehoon
df3e80b7c3 use key prop instead of dataset to identify active tab 2019-08-15 13:25:38 -04:00
taehoon
cd14566a34 remove useless index param of onSwitch 2019-08-15 13:25:38 -04:00
taehoon
539913673f reset error state when load new profile 2019-08-15 13:25:38 -04:00
taehoon
2e0603bdca clear timelines only if load user not viewed previously 2019-08-15 13:25:38 -04:00
Hakaba Hitoyo
dd340bb9e3 Fix/Fix links to external users in Who to follow page 2019-08-15 17:19:49 +00:00
taehoon
9229f28edb rel also accepts list, update rel detection logic 2019-08-13 13:11:37 -04:00
taehoon
5aa2c44487 use hashtag class detection as fallback 2019-08-12 15:22:39 -04:00
taehoon
5e99bad417 detect hashtag using rel instead of class 2019-08-12 14:48:11 -04:00
taehoon
0bce615fe8 hide ISP if the panel content is empty 2019-08-12 14:29:11 -04:00
taehoon
a71d14704f fix user card overflow bug 2019-08-12 13:59:39 -04:00
Henry Jameson
5851f97eb0 fixed a lot of bugs with emoji picker, improved relevant components 2019-08-12 20:03:48 +03:00
Henry Jameson
579b5c9e77 initial attempts at making emoji-picker somewhat extensible 2019-08-12 14:20:08 +03:00
Henry Jameson
036882d27c rename for consistency 2019-08-12 13:51:05 +03:00
shpuld
f1bdbeabf0 fix js error on mute 2019-08-10 15:53:46 +03:00
Joseph Nuthalpati
5e0b4e06ec
i18n: Translated to Telugu (44.3%)
Verified that the translation strings work by running Pleroma-FE locally.

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
2019-08-10 16:50:59 +05:30
HJ
7e2d48a26e Merge branch 'fix/incorrect-follow-request-status' into 'develop'
Fix sent follow request detection

See merge request pleroma/pleroma-fe!910
2019-08-09 12:57:05 +00:00
rinpatch
114b5f6eff Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:26:58 +00:00
rinpatch
5f3ac6625f Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:25:58 +00:00
rinpatch
e83b321ff2 Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:01:57 +00:00
rinpatch
766bcc2a72 Fix sent follow request detection
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
2019-08-09 15:01:13 +03:00
HJ
59f2931361 Merge branch 'fix/text-dont-media-viewer' into 'develop'
fix english settings label regarding how to view videos

See merge request pleroma/pleroma-fe!909
2019-08-09 08:31:02 +00:00
matrixsasuke
3e7f0ecf9b fix english settings label regarding how to view videos 2019-08-09 08:03:21 +02:00
shpuld
d4c366a123 fix extra buttons merge bug 2019-08-08 21:24:40 +03:00
Shpuld Shpludson
a45f258a2c Merge branch '632' into 'develop'
Fix gif image zoom bug on hover

Closes #632

See merge request pleroma/pleroma-fe!905
2019-08-08 10:12:46 +00:00
Shpuld Shpludson
acb788d575 Merge branch '631' into 'develop'
Hide image block in rich media preview in case of broken image

Closes #631

See merge request pleroma/pleroma-fe!902
2019-08-08 10:10:58 +00:00
Shpuld Shpludson
74cf601094 Merge branch '627' into 'develop'
Fix "Post status modal disappearing on mobile landscape mode"

Closes #627

See merge request pleroma/pleroma-fe!899
2019-08-08 10:10:23 +00:00
Shpuld Shpludson
92380652fe Merge branch 'feat/conversation-muting' into 'develop'
Add Conversation/Thread Muting

See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
morguldir
b9fd3bebc5
Update norwegian bokmål translation 2019-08-08 00:47:48 +02:00
taehoon
4d54c67daa make size of gif image and preview equal 2019-08-06 22:41:27 -04:00
taehoon
32b4d4d223 css improvements 2019-08-06 20:53:10 -04:00
taehoon
a13c945143 do not unmount post status modal in desktop 2019-08-06 20:53:09 -04:00
taehoon
bb9cee84a3 hide rich media preview image in case of broken image 2019-08-06 20:52:42 -04:00
Lee Starnes
4fc27414d2 Handle JSONified errors while registering
Closes #617
2019-08-06 18:03:31 +00:00
tarteka
c0e8d1a809 Corrections and semantics changes for Spanish translation 2019-08-05 15:23:39 +02:00
Exilat
39106dc545 Update oc.json 2019-08-03 14:04:49 +00:00
Exilat
920bd05081 Update for Interactions, new search, sticker picker, update copy. 2019-08-03 13:55:05 +00:00
tarteka
5f6456703c add Basque translate 2019-08-01 18:21:32 +02:00
Shpuld Shpludson
0e6489d840 Merge branch 'patch-2' into 'develop'
Update es.json (add sticker)

See merge request pleroma/pleroma-fe!893
2019-07-31 17:46:40 +00:00
Shpuld Shpludson
f031e96334 Merge branch '618' into 'develop'
Ability to enlarge profile picture in profile page

Closes #618

See merge request pleroma/pleroma-fe!890
2019-07-31 17:46:24 +00:00
Eugenij
254648991d Focus on the search input when the search icon is clicked 2019-07-31 17:39:35 +00:00
taehoon
af75791f1b prevent scrolling top when click search input 2019-07-31 12:20:05 -04:00
taehoon
be7a508d89 add zoom-in indication to avatar 2019-07-28 21:05:13 -04:00
taehoon
b2bd128f05 allow zooming avatar in profile panel header 2019-07-28 21:05:13 -04:00
taehoon
5881d92eb7 use $route instead of $router.currentRoute 2019-07-28 21:05:13 -04:00
taehoon
7c2982064e enlarge avatar in profile page 2019-07-28 21:05:13 -04:00
Henry Jameson
fd66afe1e5 linting 2019-07-29 00:10:43 +03:00
Henry Jameson
03c2f29b0a cleanup and appropriation for new emoji-input component API, styles updates 2019-07-28 16:07:01 +03:00
Henry Jameson
4c78fdb393 rename emoji-selector to emoji-picker 2019-07-28 14:41:22 +03:00
Henry Jameson
259e8c52ee post-merge fix 2019-07-28 13:33:05 +03:00
Henry Jameson
b3aff9bbae Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (469 commits)
  Feature/add sticker picker
  guard more secure routes
  guard secure routes by redirecting to root
  closest can returns itself as well
  find inside status-content div only
  try to use the closest a tag as target
  Update es.json
  Also apply keyword filter to subjects
  Remove files I accidentally pushed in
  fix issues caused by merges in usersearch on @
  Add user search at
  fix eslint warnings
  remove vue-popperjs
  fix moderation menu partially hidden by usercard boundary
  migrate popper css
  rewrite ModerationTools using v-tooltip
  make popover position for status action dropdow relative to parent node
  rewrite ExtraButtons using v-tooltip
  install v-tooltip
  i18n/Update pedantic Japanese translation
  ...
2019-07-28 13:30:29 +03:00
Shpuld Shpludson
d3f6b581d1 Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue
2019-07-26 12:44:32 +00:00
taehoon
65ef039316 add unit test for elimination logic 2019-07-25 08:03:41 -04:00
taehoon
53c9517a4a use array.includes instead of array.indexOf 2019-07-24 22:42:06 -04:00
taehoon
0f8ace4836 update status eliminating logic 2019-07-24 21:02:37 -04:00
taehoon
876c6de806 fix typos 2019-07-24 21:02:37 -04:00
taehoon
dca384f123 update prop syntax 2019-07-24 21:02:37 -04:00
taehoon
d7dc070667 put two loops in one parent 2019-07-24 21:02:37 -04:00
taehoon
ae829e8df1 move pinned statuses showing logic in timeline 2019-07-24 21:02:37 -04:00
taehoon
4826d72549 update prop name 2019-07-24 21:02:37 -04:00
taehoon
7f9feacd26 prevent showing pinned statuses twice 2019-07-24 21:02:37 -04:00
tarteka
6380f7df16 Update es.json (add sticker) 2019-07-24 22:06:45 +00:00
absturztaube
fa6210872f Feature/add sticker picker
Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
2019-07-24 19:35:52 +00:00
taehoon
8375d7a3aa guard more secure routes 2019-07-24 11:08:05 -04:00
taehoon
ad29e20324 guard secure routes by redirecting to root 2019-07-24 11:08:05 -04:00
Shpuld Shpludson
1f8f2e26e3 Merge branch 'patch-2' into 'develop'
Update es.json

See merge request pleroma/pleroma-fe!889
2019-07-24 13:32:57 +00:00
taehoon
1cefaa8446 closest can returns itself as well 2019-07-23 20:59:37 -04:00
taehoon
17ad5bbdf9 find inside status-content div only 2019-07-23 15:44:41 -04:00
taehoon
09efcb48a4 try to use the closest a tag as target 2019-07-23 15:43:03 -04:00
tarteka
51fc0a5c52 Update es.json 2019-07-23 15:16:03 +00:00
Toromino
fb9f254f8d Also apply keyword filter to subjects 2019-07-20 19:06:54 +02:00
shpuld
619608ea7a fix issues caused by merges in usersearch on @ 2019-07-18 17:22:51 +03:00
Wyatt Benno
5909baba7c Add user search at 2019-07-18 03:40:02 +00:00
taehoon
051b3b5141 fix eslint warnings 2019-07-15 21:22:41 -04:00
taehoon
e3ac71968b fix moderation menu partially hidden by usercard boundary 2019-07-15 21:22:41 -04:00
taehoon
c4789a348f migrate popper css 2019-07-15 21:22:41 -04:00
taehoon
4f74392641 rewrite ModerationTools using v-tooltip 2019-07-15 21:22:41 -04:00
taehoon
b9c547828e make popover position for status action dropdow relative to parent node 2019-07-15 21:22:41 -04:00
taehoon
005815c825 rewrite ExtraButtons using v-tooltip 2019-07-15 21:22:40 -04:00
taehoon
1727c815f8 install v-tooltip 2019-07-15 21:22:40 -04:00
HJ
f734a72116 Merge branch 'fix/respect-hide-post-stats' into 'develop'
Hide favs/rts properly when hide post stats is enabled

See merge request pleroma/pleroma-fe!877
2019-07-15 21:47:45 +00:00
Shpuld Shpludson
e86f6edb7c Merge branch 'patch-2' into 'develop'
Update es.json

See merge request pleroma/pleroma-fe!794
2019-07-15 19:21:37 +00:00
Hakaba Hitoyo
54b45ec4a3 i18n/Update pedantic Japanese translation 2019-07-15 19:18:40 +00:00
Hakaba Hitoyo
f665ac83e7 i18n/Update easy Japanese trasnlation 2019-07-15 19:18:20 +00:00
Shpuld Shpludson
3370dd80dc Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
#   src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
Eugenij
69a4bcb238 New search 2019-07-15 16:42:27 +00:00
taehoon
ff90d864cc fix wrong eslint comments 2019-07-12 15:11:54 -04:00
taehoon
78594f61d4 add a todo comment 2019-07-12 15:10:30 -04:00
taehoon
57c5d269b8 add bell-ringing icon 2019-07-11 12:52:05 -04:00
taehoon
b2dbf01a72 eslint —fix 2019-07-10 21:01:08 -04:00
taehoon
9712e324e5 hide subscribe button unless following 2019-07-10 21:01:08 -04:00
taehoon
1237d0d2b8 use normal bell for unsubscribed state 2019-07-10 21:01:08 -04:00
taehoon
4f26299bd5 update copy 2019-07-10 21:01:08 -04:00
taehoon
0f4cccd115 improve ui 2019-07-10 21:01:08 -04:00
taehoon
38ba5fe028 change subscribe button to icon button 2019-07-10 21:01:08 -04:00
taehoon
2ab00387fe clean up + add btn-group css class 2019-07-10 21:01:07 -04:00
taehoon
e1d6e56e1b clean up layout 2019-07-10 21:01:07 -04:00
taehoon
0fc154d9d4 clean up UserCard css 2019-07-10 21:01:07 -04:00
taehoon
dbe2decc59 clean up UserCard template 2019-07-10 21:01:07 -04:00
taehoon
3b9ab0e343 no need to covert to boolean 2019-07-10 21:01:07 -04:00
taehoon
670cbfdd1c change subscribing to subscribed 2019-07-10 21:01:07 -04:00
taehoon
0c52d69a52 update copy 2019-07-10 21:01:07 -04:00
taehoon
ace3b399ff support i18n 2019-07-10 21:01:07 -04:00