Commits · 37c7d850f1f93b5aaeeba3d4770c40dcd648a540 · Ilja / pleroma-fe

Feb 05, 2019
- Update es.json · 37c7d850
  tarteka authored 6 years ago
  
  37c7d850
- Merge branch 'issue-316-empty-username' into 'develop' · 2db7774a
  Shpuld Shpludson authored 6 years ago
  
  #316 - fix empty username issue See merge request pleroma/pleroma-fe!531
  2db7774a
- #316 - fix empty username issue · 0b244545
  Dave LiPuma authored 6 years ago
  
  0b244545
- Merge branch 'issue-138-html-escaping' into 'develop' · 8e51c784
  Shpuld Shpludson authored 6 years ago
  
  #138 - escape html entities in BIO text See merge request pleroma/pleroma-fe!522
  8e51c784
- Fix mishandled @error in stillImage · 5974dfeb
  Shpuld Shpludson authored 6 years ago
  
  5974dfeb
Feb 04, 2019
- #138 - fix lint error · 94fdc2d5
  Dave LiPuma authored 6 years ago
  
  94fdc2d5
- #138 - unescape user bio · e1f9298e
  Dave LiPuma authored 6 years ago
  
  e1f9298e
- #138 - escape html entities in BIO text · c1883f52
  Dave LiPuma authored 6 years ago
  
  c1883f52
- Merge branch '309-add-logo-to-hamburger-menu' into 'develop' · 44831733
  Shpuld Shpludson authored 6 years ago
  
  Add logo and sitename to the side drawer area Closes #309 See merge request !517
  44831733
- Do not use BEM · 13ee6243
  Tae Hoon authored 6 years ago
  
  13ee6243
- Improve readability using v-if and v-else · 5675b932
  Tae Hoon authored 6 years ago
  
  5675b932
- Show logo/sitename in the side drawer only if logged out · 4528a4cb
  Tae Hoon authored 6 years ago
  
  4528a4cb
- Add logo and sitename to the side drawer area · 53763100
  Tae Hoon authored 6 years ago
  
  53763100
- Merge branch 'feat/follows-following-pagination' into 'develop' · 8c8eb99d
  Shpuld Shpludson authored 6 years ago
  
  Follows + followers pagination #285 See merge request pleroma/pleroma-fe!510
  8c8eb99d
- merge develop and fix conflicts AGAIN · 54e7e0e3
  Shpuld Shpludson authored 6 years ago
  
  54e7e0e3
- Merge branch 'issue-154-shorten-cw-subject' into 'develop' · 3cd1deb1
  Shpuld Shpludson authored 6 years ago
  
  Issue #154 shorten subject Closes #154 See merge request pleroma/pleroma-fe!520
  3cd1deb1
- Merge branch 'issue-312-media-upload' into 'develop' · d5757d44
  Shpuld Shpludson authored 6 years ago
  
  #312 - media uploader not working with same file in adjacent order See merge request pleroma/pleroma-fe!521
  d5757d44
- #312 - media uploader not working with same file in adjacent order · 97fbc1d4
  Dave LiPuma authored 6 years ago
  
  97fbc1d4
- #154 - update long subject determine logic, meaningful variable names · 9d72c7e1
  Dave LiPuma authored 6 years ago
  
  9d72c7e1
- handle poster attachment with tall subjects · 887f1def
  Dave LiPuma authored 6 years ago
  
  887f1def
- shorten incredibly long content warning or subject · 06cf8628
  Dave LiPuma authored 6 years ago
  
  06cf8628
- Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into 'develop' · bb335ea7
  Shpuld Shpludson authored 6 years ago
  
  #307 - replace user links with router links in repeats See merge request pleroma/pleroma-fe!516
  bb335ea7
- Merge branch '275-avatar-placeholder' into 'develop' · d6ee6e83
  Shpuld Shpludson authored 6 years ago
  
  Support avatar placeholder Closes #275 See merge request pleroma/pleroma-fe!511
  d6ee6e83
Feb 03, 2019
- #307 - replace user links with router links in repeats · abf53838
  Xiaofeng An authored 6 years ago
  
  abf53838
- Use an existing image served by backend instead · e7f43d6b
  Tae Hoon authored 6 years ago
  
  e7f43d6b
- Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into 'develop' · 71155848
  Shpuld Shpludson authored 6 years ago
  
  #306 - fix conversation arrow smushed in notifications panel See merge request pleroma/pleroma-fe!513
  71155848
- #306 - fix conversation arrow smushed in notifications panel · 6d3a7809
  Xiaofeng An authored 6 years ago
  
  6d3a7809
- Revert "#306 - fix conversation arrow smushed in notifications panel" · 965a5785
  Xiaofeng An authored 6 years ago
  
  This reverts commit 1e40e70e.
  965a5785
- Merge branch 'revert-886aa35e ' into 'develop' · 063b5ba5
  Shpuld Shpludson authored 6 years ago
  
  Revert "Merge branch 'feature/split-hide-network' into 'develop'" See merge request pleroma/pleroma-fe!514
  063b5ba5
- Revert "Merge branch 'feature/split-hide-network' into 'develop'" · d4991d01
  Shpuld Shpludson authored 6 years ago
  
  This reverts merge request !497
  d4991d01
- Combine friends/followers · 18ae7bd5
  Shpuld Shpludson authored 6 years ago
  
  18ae7bd5
- merge develop in · b614cb94
  Shpuld Shpludson authored 6 years ago
  
  b614cb94
- Merge branch '238-add-avatar-size-suggestion' into 'develop' · c7ee2ed8
  Shpuld Shpludson authored 6 years ago
  
  Add avatar size instruction notice Closes #238 See merge request pleroma/pleroma-fe!512
  c7ee2ed8
- Merge branch 'fix/default-inlined-videos' into 'develop' · f0721ed8
  Shpuld Shpludson authored 6 years ago
  
  Change video playing default without bothering making it an instance configurable See merge request pleroma/pleroma-fe!505
  f0721ed8
- #306 - fix conversation arrow smushed in notifications panel · 1e40e70e
  Xiaofeng An authored 6 years ago
  
  1e40e70e
- Add avatar size instruction notice · d8ad4940
  Tae Hoon authored 6 years ago
  
  d8ad4940
Feb 02, 2019
- Fix class ordering issues related to avatar · 4833f79c
  Tae Hoon authored 6 years ago
  
  4833f79c
- Improve reusability of UserAvatar component · 0b66a43a
  Tae Hoon authored 6 years ago
  
  0b66a43a
- follows/followers pagination ready for review · dbb16d56
  Shpuld Shpludson authored 6 years ago
  
  dbb16d56
- Move avatar css into a correct place · 89b9aed1
  Tae Hoon authored 6 years ago
  
  89b9aed1