Commits · 54ccbd8479a77f613e8efd9568b3611c28d21742 · Hakaba Hitoyo / pleroma

May 13, 2018
- Use original status id instead of announce id · 54ccbd84
  normandy authored 6 years ago
  
  54ccbd84
May 12, 2018
- Merge branch 'feature/unrepeat-tests' into feature/unrepeats · aee49724
  normandy authored 6 years ago
  
  aee49724
- Update test fixture · 694e3769
  normandy authored 6 years ago
  
  694e3769
May 11, 2018
- Revert "Log error when handling unrepeats" · 4d887475
  normandy authored 6 years ago
  
  This reverts commit c17c55e9.
  4d887475
- Add tests for unrepeats · 16b79365
  normandy authored 6 years ago
  
  16b79365
- Log error when handling unrepeats · c17c55e9
  normandy authored 6 years ago
  
  c17c55e9
- Probably better way of handling non-follow undos in ostatus · 271fb5cc
  normandy authored 6 years ago
  
  271fb5cc
- Revert "Do not send non-follow undos over ostatus for now" · 4151cbe6
  normandy authored 6 years ago
  
  This reverts commit 07fdc072.
  4151cbe6
- Revert "Use [] instead of nil" · 0b527b55
  normandy authored 6 years ago
  
  This reverts commit 42268b09.
  0b527b55
- Use [] instead of nil · 42268b09
  normandy authored 6 years ago
  
  42268b09
- Do not send non-follow undos over ostatus for now · 07fdc072
  normandy authored 6 years ago
  
  07fdc072
May 09, 2018
- Match proper number of values from unannounce · 900c7354
  normandy authored 6 years ago
  
  900c7354
- Change argument order and call correct # of args · 54f66285
  normandy authored 6 years ago
  
  54f66285
- Handle Undo activites containing an Announce · e55f69a6
  normandy authored 6 years ago
  
  e55f69a6
- Federate correct activity · 4d5ec883
  normandy authored 6 years ago
  
  4d5ec883
May 04, 2018
- Fix formatting · 8b4ee0ea
  normandy authored 6 years ago
  
  8b4ee0ea
Apr 25, 2018
- Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats · 2d775bf1
  normandy authored 6 years ago
  
  2d775bf1
- Formatting fixes · e981280f
  normandy authored 6 years ago
  
  e981280f
- Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats · 9e0dd21e
  normandy authored 6 years ago
  
  9e0dd21e
- Fix comment grammar · 0df1a4ef
  normandy authored 6 years ago
  
  0df1a4ef
Apr 24, 2018
- Merge branch 'gitignore' into 'develop' · d4a54a90
  lain authored 6 years ago
  
  Gitignore See merge request pleroma/pleroma!131
  d4a54a90
- Fix formatting. · c78e7d8b
  lain authored 6 years ago
  
  c78e7d8b
- Add common files to gitignore · 52b1bc78
  Rachel H authored 6 years ago
  
  52b1bc78
- Merge branch 'feature/message-rewrite-facility' into 'develop' · 7a52c454
  lain authored 6 years ago
  
  message rewrite facility See merge request pleroma/pleroma!112
  7a52c454
- Update .gitlab-ci.yml · bbd549c0
  lain authored 6 years ago
  
  bbd549c0
- Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop · 3f938509
  lain authored 6 years ago
  
  3f938509
- Correct syntax with mix format · afe892dd
  dashie authored 6 years ago
  
  Verified
  
  afe892dd
- Add User.decrease_note_count and call it from ActivityPub.delete · 9972678a
  dashie authored 6 years ago
  
  Verified
  
  9972678a
- Merge branch 'favicon_tag' into 'develop' · 62a2287b
  lain authored 6 years ago
  
  Fix endpoint for favicon See merge request !84
  62a2287b
Apr 23, 2018
- update frontend · fc6f5bca
  lain authored 6 years ago
  
  fc6f5bca
- update frontend · 661fd3c9
  lain authored 6 years ago
  
  661fd3c9
- Embed announce activity data instead of linking to it · 8c080653
  normandy authored 6 years ago
  
  8c080653
Apr 22, 2018
- Revert "Rename make_unannounce_data helper to make_undo_data" · b1742eca
  normandy authored 6 years ago
  
  This reverts commit c649ca89.
  b1742eca
- Small cleanup. · 0574df27
  lain authored 6 years ago
  
  0574df27
- Merge branch 'develop' into fix/note-count-not-updating · 114ca9e0
  lain authored 6 years ago
  
  114ca9e0
- Rename make_unannounce_data helper to make_undo_data · c649ca89
  normandy authored 6 years ago
  
  This makes it a bit more easier to adapt for unlikes as well in the future.
  c649ca89
Apr 21, 2018
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 26af5bad
  lain authored 6 years ago
  
  26af5bad
- Formatter: Use proper escaping for links. · 0c221943
  lain authored 6 years ago
  
  0c221943
- Update note count in ActivityPub.create. · 22bfeac2
  eal authored 6 years ago
  
  22bfeac2
- Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop' · d0b1c498
  lain authored 6 years ago
  
  Resolve "Enable custom panel by default and have default content" Closes #146 See merge request pleroma/pleroma!124
  d0b1c498