Commits · develop · Jared Redford / pleroma-fe

Apr 14, 2019
- Merge branch 'issues/pleroma-fe-496-following-follower-error' into 'develop' · 936eb23b
  Shpuld Shpludson authored 6 years ago
  936eb23b
Apr 13, 2019
- display no message on empty data fetched from api · 41845389
  Brenden Bice authored 6 years ago
  
  41845389
- remove error message on no more following · 2ae05075
  Brenden Bice authored 6 years ago
  
  2ae05075
Apr 12, 2019
- Merge branch 'fix-notif-user' into 'develop' · fa33e3ec
  HJ authored 6 years ago
  fa33e3ec
- Fix wrong usercard notification · 7d01b3d8
  HJ authored 6 years ago
  
  7d01b3d8
Apr 11, 2019
- Merge branch '480-replies' into 'develop' · fd3811d6
  HJ authored 6 years ago
  fd3811d6
- maintain conversationsObject storage · ab7a418d
  Tae Hoon authored 6 years ago
  
  ab7a418d
- remove unused importing · fa16d66c
  Tae Hoon authored 6 years ago
  
  fa16d66c
- get statuses in a conversation from the global repository instead of local state · 724602bd
  Tae Hoon authored 6 years ago
  
  724602bd
Apr 10, 2019
- Merge branch 'restore-yarnlock' into 'develop' · 8c2efc5a
  HJ authored 6 years ago
  8c2efc5a
- restore yarnlock · ab58b735
  HJ authored 6 years ago
  
  ab58b735
- Merge branch 'issue-436-mastoapi-notifications' into 'develop' · 84505e01
  HJ authored 6 years ago
  84505e01
- #436 - remove yarn.lock · 76cd01e9
  Dave LiPuma authored 6 years ago
  
  76cd01e9
- #436 - merge develop · 40e9eebf
  Dave LiPuma authored 6 years ago
  
  40e9eebf
- Merge branch 'fix-local' into 'develop' · d94a7b63
  HJ authored 6 years ago
  d94a7b63
- Fix wrong local · 18cb97a2
  HJ authored 6 years ago
  
  18cb97a2
- Merge branch 'mastoapi/update-extension-support' into 'develop' · ed3aceff
  Shpuld Shpludson authored 6 years ago
  ed3aceff
- Merge branch 'fix-emoji-picker' into 'develop' · 25601c68
  Shpuld Shpludson authored 6 years ago
  25601c68
Apr 09, 2019
- support new custom emoji format · a25aabfa
  HJ authored 6 years ago
  
  a25aabfa
- Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into... · d498a26a
  Dave LiPuma authored 6 years ago
  d498a26a
- revert, it's still missing · dfd89b0b
  HJ authored 6 years ago
  
  dfd89b0b
- add support for pleroma-specific fields · d95fc028
  HJ authored 6 years ago
  
  d95fc028
- Merge branch '486-expand-button' into 'develop' · d7cf841d
  Shpuld Shpludson authored 6 years ago
  d7cf841d
- #486 - remove expand button on conversation page · 5df049ca
  Jared Redford authored 6 years ago
  
  5df049ca
- Merge branch 'fix/prevent-repeated-fetching' into 'develop' · b3ace226
  Shpuld Shpludson authored 6 years ago
  b3ace226
- fix small bug · 011f04c1
  jasper authored 6 years ago
  
  011f04c1
- Add await to login befor redirect to friends timeline · b7d7c216
  jasper authored 6 years ago
  
  b7d7c216
- Prevent repeated fetching · 1570e779
  jasper authored 6 years ago
  
  1570e779
- Merge branch 'fix/notification-bugs' into 'develop' · 1e9ddcb0
  Shpuld Shpludson authored 6 years ago
  1e9ddcb0
- #436 - merge develop · d3218807
  Dave LiPuma authored 6 years ago
  
  d3218807
Apr 08, 2019
- Merge branch 'moderation-menu' into 'develop' · 546ced43
  Shpuld Shpludson authored 6 years ago
  546ced43
- Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into... · b0da32fe
  Dave LiPuma authored 6 years ago
  b0da32fe
- Merge branch 'debug_message' into 'develop' · 2f725c57
  Shpuld Shpludson authored 6 years ago
  2f725c57
- remove debug message · 7259e02a
  Maksim authored 6 years ago and Shpuld Shpludson committed 6 years ago
  
  7259e02a
Apr 04, 2019
- Merge branch 'issue-469-safe-dm-from-BE' into 'develop' · 8c7f765d
  Shpuld Shpludson authored 6 years ago
  8c7f765d
- Add space · 1c04cd20
  jasper authored 6 years ago
  
  1c04cd20
- Separate timeline and notification · a1275be4
  jasper authored 6 years ago
  
  a1275be4
Apr 03, 2019
- Remove useless codes · 7c2b65e9
  jasper authored 6 years ago
  
  7c2b65e9
- Fix notification bugs · ea27483f
  jasper authored 6 years ago
  
  ea27483f
- #436 - revert stripe html for notification · fe756fe3
  Dave LiPuma authored 6 years ago
  
  fe756fe3