Commit Graph

2800 Commits

Author SHA1 Message Date
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
shpuld f1bdbeabf0 fix js error on mute 2019-08-10 15:53:46 +03:00
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
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
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
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