Commits · 17b8896c40fa1c4aaab96f82fd07d5f5f2698400 · Alex Gleason / pleroma

Oct 14, 2019
- Correct version parser branch name detection · 17b8896c
  rinpatch authored 5 years ago
  
  17b8896c
- Add a changelog entry for branch-moving · d1e96984
  rinpatch authored 5 years ago
  
  d1e96984
- Prepare pleroma_ctl for moving master to stable and relax the error · 58fea885
  rinpatch authored 5 years ago
  
  message
  58fea885
- Preparations for renaming `master` to `stable` · 0e9243e8
  rinpatch authored 5 years ago
  
  0e9243e8
Oct 13, 2019
- Merge branch 'incoming-id-fixes' into 'develop' · e3b4a3e9
  lain authored 5 years ago
  
  Assorted transmogrifier fixes See merge request pleroma/pleroma!1831
  e3b4a3e9
Oct 12, 2019
- Merge branch 'fix/mediaproxy-too-brutal' into 'develop' · 930cbd6d
  rinpatch authored 5 years ago
  
  Make MediaProxy failure tracking less brutal See merge request pleroma/pleroma!1836
  930cbd6d
Oct 11, 2019
- Make MediaProxy failure tracking less brutal · 9bdbf081
  rinpatch authored 5 years ago
  
  The current failure tracking mechanism will never request anything that didn't respond with a success, 403, 404, or 5xx codes. This is causing issues when using in real fediverse because of weird status codes some software has and timeouts being frequent. This patch changes failure tracking mechanism to only never request the url again if it responded with 400, 204, or the body is too large, otherwise it can be re-requested in 60 seconds.
  9bdbf081
- Merge branch 'pleroma-ctl-enchancements' into 'develop' · 44afe4c8
  Haelwenn authored 5 years ago
  
  pleroma_ctl: Make it possible to specify branches/flavours when updating See merge request pleroma/pleroma!1832
  44afe4c8
- Ostatus DeleteHandler: Fix for new option format. · 422aa6be
  lain authored 5 years ago
  
  422aa6be
- SearchController: Fix test. · cb849296
  lain authored 5 years ago
  
  Turns out you can't actually find the user with this.
  cb849296
- pleroma_ctl: Make it possible to specify branches/flavours when updating · b750135a
  rinpatch authored 5 years ago
  
  b750135a
- Transmogrifier: Correctly save incoming ids for Accept/Reject. · 37812740
  lain authored 5 years ago
  
  37812740
- Transmogrifier: Actually store who deleted a note. · 9b963064
  lain authored 5 years ago
  
  9b963064
Oct 10, 2019
- Transmogrifier: Save correct ids for incoming deletes. · 29647dfd
  lain authored 5 years ago
  
  29647dfd
Oct 09, 2019
- Merge branch 'unicode-search' into 'develop' · 9fd5176c
  kaniini authored 5 years ago
  
  Search: Add tests for unicode searches. See merge request pleroma/pleroma!1824
  9fd5176c
- Merge branch 'webfinger-mocks' into 'develop' · c9b3f015
  kaniini authored 5 years ago
  
  provide mocks for webfinger endpoints See merge request pleroma/pleroma!1821
  c9b3f015
- provide mocks for webfinger endpoints · dc6d20b6
  Steven Fuchs authored 5 years ago and kaniini committed 5 years ago
  
  dc6d20b6
- Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop' · 1357ec1a
  lain authored 5 years ago
  
  Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id` See merge request pleroma/pleroma!1822
  1357ec1a
- Merge branch 'feature/count-statuses-task' into 'develop' · f64dfd31
  lain authored 5 years ago
  
  Add a task to re-count statuses for all users Closes #1305 See merge request pleroma/pleroma!1823
  f64dfd31
- Search: Add tests for unicode searches. · c1bae013
  lain authored 5 years ago
  
  c1bae013
- Add a task to re-count statuses for all users · d537bfd4
  minibikini authored 5 years ago
  
  d537bfd4
- Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status... · 580a67f5
  Eugenij authored 5 years ago
  
  Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
  580a67f5
Oct 08, 2019
- Merge branch 'chore/format-migrations' into 'develop' · 63556943
  rinpatch authored 5 years ago
  
  Enable `mix format` for migrations See merge request pleroma/pleroma!1819
  63556943
- Enable `mix format` for migrations · 32808208
  rinpatch authored 5 years ago
  
  32808208
Oct 07, 2019
- Merge branch 'chore/bump-fe-122323f3' into 'develop' · 44e0c5ca
  rinpatch authored 5 years ago
  
  Bump pleroma-fe bundle to pleroma/pleroma-fe@122323f3 See merge request pleroma/pleroma!1817
  44e0c5ca
- Bump pleroma-fe bundle to... · a5021552
  rinpatch authored 5 years ago
  
  Bump pleroma-fe bundle to pleroma/pleroma-fe@122323f3
  a5021552
- Merge branch 'bugfix/exclude-replies' into 'develop' · 380c67e2
  kaniini authored 5 years ago
  
  mastodon api: fix exclude_replies (closes #1287) Closes #1287 See merge request pleroma/pleroma!1813
  380c67e2
- mastodon api: fix exclude_replies (closes #1287) · 9a2f71f4
  kaniini authored 5 years ago
  
  9a2f71f4
- Merge branch 'feature/move-rss-out-of-ostatus' into 'develop' · 0a99f1e8
  kaniini authored 5 years ago
  
  Extract RSS Feed functionality from OStatus Closes #1243 See merge request pleroma/pleroma!1644
  0a99f1e8
- Extract RSS Feed functionality from OStatus · 4b3f77a9
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  4b3f77a9
- Merge branch 'chore/context-cleanups' into 'develop' · 5c32e6ee
  kaniini authored 5 years ago
  
  clean up bundled litepub schema (closes #1303) Closes #1303 See merge request pleroma/pleroma!1808
  5c32e6ee
- clean up bundled litepub schema (closes #1303) · 19962d20
  kaniini authored 5 years ago
  
  19962d20
- Merge branch 'mrf/simple_policy/check_actor' into 'develop' · 93bdc553
  kaniini authored 5 years ago
  
  mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806
  93bdc553
- Merge branch '1260-rate-limited-auth-actions' into 'develop' · 15592f1a
  Haelwenn authored 5 years ago
  
  [#1260] Rate-limiting for create authentication and related requests Closes #1260 See merge request pleroma/pleroma!1681
  15592f1a
- Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions · 28fb98d6
  Ivan Tashkinov authored 5 years ago
  
  # Conflicts: # CHANGELOG.md
  28fb98d6
- Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' · b4f3c168
  Haelwenn authored 5 years ago
  
  [#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643
  b4f3c168
- mrf/simple_policy: check actor against accept/reject · 58aeabd0
  Haelwenn authored 5 years ago
  
  58aeabd0
Oct 06, 2019
- Merge branch 'fix/bad-migration' into 'develop' · 25cffffa
  kaniini authored 5 years ago
  
  Fix muted notification migration only working with a schema See merge request pleroma/pleroma!1803
  25cffffa
- Fix muted notification migration only working with a schema · ee88afb2
  rinpatch authored 5 years ago
  
  Should also improve performance. I tested it on my local DB, but if anyone has a backup of <=1.0 db they can test this on, please do
  ee88afb2
- Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' · 2411d092
  kaniini authored 5 years ago
  
  Move local keys out of `user.info` See merge request pleroma/pleroma!1799
  2411d092