Commits · develop · Joseph Nuthalapati / pleroma-fe

09 Aug, 2019 7 commits
- Merge branch 'fix/incorrect-follow-request-status' into 'develop' · 7e2d48a2
  HJ authored Aug 09, 2019
```
Fix sent follow request detection

See merge request pleroma/pleroma-fe!910
```
  7e2d48a2
- Apply suggestion to src/services/follow_manipulate/follow_manipulate.js · 114b5f6e
  rinpatch authored Aug 09, 2019
  
  114b5f6e
- Apply suggestion to src/services/follow_manipulate/follow_manipulate.js · 5f3ac662
  rinpatch authored Aug 09, 2019
  
  5f3ac662
- Apply suggestion to src/services/follow_manipulate/follow_manipulate.js · e83b321f
  rinpatch authored Aug 09, 2019
  
  e83b321f
- Fix sent follow request detection · 766bcc2a
  rinpatch authored Aug 09, 2019
```
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.
```
  766bcc2a
- Merge branch 'fix/text-dont-media-viewer' into 'develop' · 59f29313
  HJ authored Aug 09, 2019
```
fix english settings label regarding how to view videos

See merge request pleroma/pleroma-fe!909
```
  59f29313
- fix english settings label regarding how to view videos · 3e7f0ecf
  Matrix-Sasuke authored Aug 09, 2019
  
  3e7f0ecf
08 Aug, 2019 5 commits
- fix extra buttons merge bug · d4c366a1
  Shpuld Shpludson authored Aug 08, 2019
  
  d4c366a1
- Merge branch '632' into 'develop' · a45f258a
  Shpuld Shpludson authored Aug 08, 2019
```
Fix gif image zoom bug on hover

Closes #632

See merge request pleroma/pleroma-fe!905
```
  a45f258a
- Merge branch '631' into 'develop' · acb788d5
  Shpuld Shpludson authored Aug 08, 2019
```
Hide image block in rich media preview in case of broken image

Closes #631

See merge request pleroma/pleroma-fe!902
```
  acb788d5
- Merge branch '627' into 'develop' · 74cf6010
  Shpuld Shpludson authored Aug 08, 2019
```
Fix "Post status modal disappearing on mobile landscape mode"

Closes #627

See merge request pleroma/pleroma-fe!899
```
  74cf6010
- Merge branch 'feat/conversation-muting' into 'develop' · 92380652
  Shpuld Shpludson authored Aug 08, 2019
```
Add Conversation/Thread Muting

See merge request pleroma/pleroma-fe!876
```
  92380652
07 Aug, 2019 4 commits
- make size of gif image and preview equal · 4d54c67d
  Tae Hoon authored Aug 06, 2019
  
  4d54c67d
- css improvements · 32b4d4d2
  Tae Hoon authored Jul 31, 2019
  
  32b4d4d2
- do not unmount post status modal in desktop · a13c9451
  Tae Hoon authored Jul 31, 2019
  
  a13c9451
- hide rich media preview image in case of broken image · bb9cee84
  Tae Hoon authored Aug 04, 2019
  
  bb9cee84
06 Aug, 2019 2 commits
- Merge branch 'issue-617' into 'develop' · 17dc7357
  HJ authored Aug 06, 2019
```
Handle JSONified errors while registering

Closes #617

See merge request pleroma/pleroma-fe!888
```
  17dc7357
- Handle JSONified errors while registering · 4fc27414
  Lee Starnes authored Aug 06, 2019
```
Closes #617
```
  4fc27414
31 Jul, 2019 6 commits
- Merge branch 'patch-2' into 'develop' · 0e6489d8
  Shpuld Shpludson authored Jul 31, 2019
```
Update es.json (add sticker)

See merge request pleroma/pleroma-fe!893
```
  0e6489d8
- Merge branch '618' into 'develop' · f031e963
  Shpuld Shpludson authored Jul 31, 2019
```
Ability to enlarge profile picture in profile page

Closes #618

See merge request pleroma/pleroma-fe!890
```
  f031e963
- Merge branch 'focus-on-search-input' into 'develop' · f4b9efff
  Shpuld Shpludson authored Jul 31, 2019
```
Focus on the search input when the search icon is clicked

See merge request pleroma/pleroma-fe!896
```
  f4b9efff
- Focus on the search input when the search icon is clicked · 25464899
  Eugenij authored Jul 31, 2019
  
  25464899
- Merge branch '626' into 'develop' · 3f4cb1d5
  Shpuld Shpludson authored Jul 31, 2019
```
Prevent scrolling top when click search input

Closes #626

See merge request pleroma/pleroma-fe!898
```
  3f4cb1d5
- prevent scrolling top when click search input · af75791f
  Tae Hoon authored Jul 31, 2019
  
  af75791f
29 Jul, 2019 5 commits
- add zoom-in indication to avatar · be7a508d
  Tae Hoon authored Jul 25, 2019
  
  be7a508d
- add zoom-in icon · 1e613ae9
  Tae Hoon authored Jul 25, 2019
  
  1e613ae9
- allow zooming avatar in profile panel header · b2bd128f
  Tae Hoon authored Jul 25, 2019
  
  b2bd128f
- use $route instead of $router.currentRoute · 5881d92e
  Tae Hoon authored Jul 23, 2019
  
  5881d92e
- enlarge avatar in profile page · 7c298206
  Tae Hoon authored Jul 22, 2019
  
  7c298206
28 Jul, 2019 2 commits
- Merge branch '549' into 'develop' · 8aa3e7d5
  HJ authored Jul 28, 2019
```
Prevent showing pinned statuses twice

Closes #549

See merge request pleroma/pleroma-fe!812
```
  8aa3e7d5
- update unit test · 18a41e78
  Tae Hoon authored Jul 28, 2019
  
  18a41e78
26 Jul, 2019 2 commits
- Merge branch 'develop' into 'feat/conversation-muting' · d3f6b581
  Shpuld Shpludson authored Jul 26, 2019
```
# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue
```
  d3f6b581
- rewrite unit tests · d785ed5a
  Tae Hoon authored Jul 25, 2019
  
  d785ed5a
25 Jul, 2019 7 commits
- add more unit tests for elimination logic · a443a520
  Tae Hoon authored Jul 25, 2019
  
  a443a520
- add unit test for elimination logic · 65ef0393
  Tae Hoon authored Jul 25, 2019
  
  65ef0393
- use array.includes instead of array.indexOf · 53c9517a
  Tae Hoon authored Jul 24, 2019
  
  53c9517a
- update status eliminating logic · 0f8ace48
  Tae Hoon authored Jul 20, 2019
  
  0f8ace48
- fix typos · 876c6de8
  Tae Hoon authored Jul 19, 2019
  
  876c6de8
- update prop syntax · dca384f1
  Tae Hoon authored Jul 19, 2019
  
  dca384f1
- put two loops in one parent · d7dc0706
  Tae Hoon authored Jul 19, 2019
  
  d7dc0706