Commit Graph

3483 Commits

Author SHA1 Message Date
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
HJ 17dc7357d5 Merge branch 'issue-617' into 'develop'
Handle JSONified errors while registering

Closes #617

See merge request pleroma/pleroma-fe!888
2019-08-06 18:03:32 +00: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
tarteka 5f6456703c add Basque translate 2019-08-01 18:21:32 +02:00
HJ 5d70ada203 Apply suggestion to docs/HACKING.md 2019-08-01 15:51:15 +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
Shpuld Shpludson f4b9efff77 Merge branch 'focus-on-search-input' into 'develop'
Focus on the search input when the search icon is clicked

See merge request pleroma/pleroma-fe!896
2019-07-31 17:39:35 +00:00
Eugenij 254648991d Focus on the search input when the search icon is clicked 2019-07-31 17:39:35 +00:00
Shpuld Shpludson 3f4cb1d58e Merge branch '626' into 'develop'
Prevent scrolling top when click search input

Closes #626

See merge request pleroma/pleroma-fe!898
2019-07-31 17:39:26 +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 1e613ae9b3 add zoom-in icon 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
HJ 8aa3e7d52e Merge branch '549' into 'develop'
Prevent showing pinned statuses twice

Closes #549

See merge request pleroma/pleroma-fe!812
2019-07-28 21:05:22 +00:00
taehoon 18a41e785e update unit test 2019-07-28 16:55:34 -04: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 d785ed5a05 rewrite unit tests 2019-07-25 23:34:56 -04:00
taehoon a443a5203e add more unit tests for elimination logic 2019-07-25 14:17:48 -04: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