Commits · 45b06860d37d588868669081e6f2fbd83695e1aa · normandy / pleroma

Feb 21, 2019
- Merge branch '2019-02-21-update-frontend' into 'develop' · 45b06860
  lain authored 6 years ago
  
  update frontend See merge request pleroma/pleroma!850
  45b06860
- update frontend · 553ce57d
  lain authored 6 years ago
  
  553ce57d
Feb 20, 2019
- Merge branch 'feature/improve-error-logging' into 'develop' · 1f85c9c9
  lain authored 6 years ago
  
  logging: improve visibility into ISE errors See merge request pleroma/pleroma!845
  1f85c9c9
- logging: only return ISE reasons in API responses when in dev or test mode · 22e2ed23
  kaniini authored 6 years ago
  
  22e2ed23
- tests: fix tests · 3ee77e95
  kaniini authored 6 years ago
  
  3ee77e95
- logging: improve visibility into ISE errors · 8b080964
  kaniini authored 6 years ago
  
  8b080964
- Merge branch 'feature/reports' into 'develop' · 54f9e3d3
  kaniini authored 6 years ago
  
  Reports Closes #83 See merge request pleroma/pleroma!701
  54f9e3d3
- Reports · bff9eb5e
  minibikini authored 6 years ago
  
  bff9eb5e
- Merge branch 'nicer-share-urls' into 'develop' · 77fb926a
  kaniini authored 6 years ago
  
  Add some nicer urls in status view. See merge request pleroma/pleroma!844
  77fb926a
- Add some nicer urls in status view. · 59c27f29
  lain authored 6 years ago
  
  59c27f29
- Merge branch '468_oauth2_scopes' into 'develop' · dff5e1e4
  lain authored 6 years ago
  
  [#468] OAuth2 scopes Closes #468 See merge request pleroma/pleroma!799
  dff5e1e4
- [#468] Added support for `push` OAuth scope (Mastodon 2.4+). · b574d97c
  Ivan Tashkinov authored 6 years ago
  
  b574d97c
- [#468] Merged `upstream/develop`. · 6fe7acd5
  Ivan Tashkinov authored 6 years ago
  
  6fe7acd5
- Merge branch 'muting' into 'develop' · 11b3c10c
  lain authored 6 years ago
  
  Implement muting, add it to the whole mastodon API See merge request pleroma/pleroma!319
  11b3c10c
- Add test for User.mutes and so on. · 4196d9af
  lain authored 6 years ago
  
  4196d9af
- Add test for muting functionality. · 9ae79bb7
  lain authored 6 years ago
  
  9ae79bb7
- Remove superfluous migration. · 840d2c9f
  lain authored 6 years ago
  
  840d2c9f
- [#468] Adjusted scope restriction for MastodonAPIController#index. · 3ad91ec3
  Ivan Tashkinov authored 6 years ago
  
  3ad91ec3
- [#468] More OAuth scopes-specific tests. · 337367d7
  Ivan Tashkinov authored 6 years ago
  
  337367d7
Feb 19, 2019
- Merge branch 'set-activation-status-admin-api' into 'develop' · abd0b85e
  kaniini authored 6 years ago
  
  Added admin API for changing user activation status See merge request pleroma/pleroma!843
  abd0b85e
- Update the mute implementation to the current codebase · 5a46d37a
  vaartis authored 6 years ago
  
  Make it part of the info thing (and do a migration to ensure it's there)
  5a46d37a
- [#468] Added OAuth scopes-specific tests. · 04ee877a
  Ivan Tashkinov authored 6 years ago
  
  04ee877a
- Remove unused "muted" parameter, use piping for mute/block fns · 465b547c
  vaartis authored 6 years ago
  
  465b547c
- Do not unfollow muted users · 092b1b14
  vaartis authored 6 years ago
  
  092b1b14
- Add test for mastodon muting endpoints · ad2cf4fd
  vaartis authored 6 years ago
  
  ad2cf4fd
- Implement mastodon mutes endpoint · da64ea4a
  vaartis authored 6 years ago
  
  Aparently i forgot to add it, it gets a list of muted users
  da64ea4a
- Implement muting, add it to the mastodon API · f41f017b
  vaartis authored 6 years ago
  
  f41f017b
- Added admin API for changing user activation status · 25b9e7a8
  Eugenij authored 6 years ago
  
  25b9e7a8
- [#468] Merged `upstream/develop`. · c0ecbf66
  Ivan Tashkinov authored 6 years ago
  
  c0ecbf66
- Merge branch 'set-cache-on-user-tag-update' into 'develop' · 1dd718e8
  lain authored 6 years ago
  
  Update user cache when user tags are updated See merge request pleroma/pleroma!840
  1dd718e8
- Merge branch 'fix/check-follower-collection-in-is_private' into 'develop' · f25a3f4f
  lain authored 6 years ago
  
  properly check for follower address in is_private? See merge request pleroma/pleroma!841
  f25a3f4f
- Merge branch 'fix/ap_id-unique_constraint' into 'develop' · f53dc5ee
  lain authored 6 years ago
  
  mark ap_id unique_constraint See merge request pleroma/pleroma!842
  f53dc5ee
- mark ap_id unique_constraint · 109b01a6
  rinpatch authored 6 years ago
  
  109b01a6
- properly check for follower address in is_private? · 96dcacad
  rinpatch authored 6 years ago
  
  96dcacad
- Update user cache when user tags are updated · fc354814
  Eugenij authored 6 years ago
  
  fc354814
Feb 18, 2019
- Merge branch 'feature/jobs' into 'develop' · 833161b5
  kaniini authored 6 years ago
  
  Job Queue See merge request pleroma/pleroma!732
  833161b5
- Merge branch 'patch-image-description' into 'develop' · a39a094c
  kaniini authored 6 years ago
  
  Patch to support image descriptions for pleroma-fe See merge request pleroma/pleroma!626
  a39a094c
- Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' · 7456338e
  kaniini authored 6 years ago
  
  Add OAuth tokens endpoint See merge request pleroma/pleroma!805
  7456338e
- Merge branch 'features/flavour-switching' into 'develop' · c23bd057
  kaniini authored 6 years ago
  
  [MastoAPI] Add switching of frontend flavours See merge request pleroma/pleroma!807
  c23bd057
- Merge branch 'follow-request-count' into 'develop' · cd019a59
  kaniini authored 6 years ago
  
  Follow request count See merge request pleroma/pleroma!817
  cd019a59