Commits · 52bec238c3c80a246eb269de9afb1f9b3ea58f4f · normandy / pleroma

Mar 29, 2019
- Merge branch 'feature/deploy-docs' into 'develop' · 52bec238
  lain authored 5 years ago
  
  Add automatic documentation build and deploy for master and develop branches Closes #478 See merge request pleroma/pleroma!965
  52bec238
- Merge branch 'bugfix/migration-less_replies_count' into 'develop' · ef3c23d4
  kaniini authored 5 years ago
  
  Revert awfully long migration from 568e3485 See merge request pleroma/pleroma!991
  ef3c23d4
- Revert awfully long migration from 568e3485 · b2f3a40e
  Haelwenn authored 5 years ago
  
  b2f3a40e
Mar 28, 2019
- Merge branch 'admin-api-user-show' into 'develop' · a71831d1
  lain authored 5 years ago
  
  Admin API user show Closes #766 See merge request pleroma/pleroma!987
  a71831d1
Mar 27, 2019
- Add user show endpoint for Pleroma admin API · 10c81fc9
  Eugenij authored 5 years ago
  
  10c81fc9
- Merge branch 'feature/more-user-filters' into 'develop' · 926bf114
  lain authored 5 years ago
  
  Add more user filters + move search to its own module See merge request pleroma/pleroma!982
  926bf114
- Merge branch 'fix-reblog-tests' into 'develop' · a5f141d9
  lain authored 5 years ago
  
  Fix muting reblogs tests See merge request pleroma/pleroma!984
  a5f141d9
- Fix muting reblogs tests · 776bb513
  rinpatch authored 5 years ago
  
  776bb513
- Merge branch 'hotfix/missing-announce-mastoapi' into 'develop' · 6da1999f
  rinpatch authored 5 years ago
  
  Fix missing announces in MastoAPI home timeline Closes #762 See merge request pleroma/pleroma!983
  6da1999f
- Fix missing announces in MastoAPI home timeline · ce6d64bb
  rinpatch authored 5 years ago
  
  Closes #762
  ce6d64bb
- Merge branch 'apps-verify-credentials' into 'develop' · b2e163ec
  lain authored 5 years ago
  
  MastodonAPI: Add GET /api/v1/apps/verify_credentials See merge request pleroma/pleroma!981
  b2e163ec
Mar 26, 2019
- Add more user filters + move search to its own module · 3cf7539b
  Maxim Filippov authored 5 years ago
  
  3cf7539b
- Add vapid_key to the `POST /api/v1/apps` response · a4ab60ac
  Eugenij authored 5 years ago
  
  a4ab60ac
- Add GET /api/v1/apps/verify_credentials · 691d1208
  Eugenij authored 5 years ago
  
  691d1208
- Merge branch 'fix/ap-icon' into 'develop' · ff3b09f6
  lain authored 5 years ago
  
  Do not federate instance avatar Closes #759 See merge request pleroma/pleroma!977
  ff3b09f6
- Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop' · c6ab5ebe
  lain authored 5 years ago
  
  Mastodon 2.7.2 instance attributes (registrations, languages) See merge request pleroma/pleroma!979
  c6ab5ebe
- AP UserView: Refactor banner / avatar display code, add test. · 10a7a4a8
  lain authored 5 years ago
  
  10a7a4a8
- Test for MastoAPI /api/v1/instance response structure (formatting fix). · 47b49ab1
  Ivan Tashkinov authored 5 years ago
  
  47b49ab1
- Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop' · 9e3899bf
  lain authored 5 years ago
  
  Mastodon-based auth error messages. User#auth_active?/1 refactoring. See merge request pleroma/pleroma!978
  9e3899bf
- Test for MastoAPI /api/v1/instance response structure. · caf0e9cf
  Ivan Tashkinov authored 5 years ago
  
  caf0e9cf
- Merge branch 'replies-count' into 'develop' · 21ff78cd
  lain authored 5 years ago
  
  Increment replies_count (MastoAPI) Closes #756 See merge request pleroma/pleroma!974
  21ff78cd
- Merge branch 'refactor/remove-activity-representer' into 'develop' · 3f44433e
  lain authored 5 years ago
  
  Remove ActivityRepresenter See merge request pleroma/pleroma!980
  3f44433e
- Credo is upset about me not remembering the alphabet · aacdcac1
  rinpatch authored 5 years ago
  
  aacdcac1
- Fix formatting · 087662d4
  rinpatch authored 5 years ago
  
  087662d4
- Remove ActivityRepresenter · 406d1933
  rinpatch authored 5 years ago
  
  406d1933
- Mastodon 2.7.2 instance attributes (registrations, languages). · eef1042b
  Ivan Tashkinov authored 5 years ago
  
  eef1042b
- Increment replies_count on replies (MastoAPI) · 568e3485
  Eugenij authored 5 years ago
  
  568e3485
- Comments split. · b0759f82
  Ivan Tashkinov authored 5 years ago
  
  b0759f82
- Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`. · 263ca3de
  Ivan Tashkinov authored 5 years ago
  
  263ca3de
- Try sending an empty map · c4102961
  feld authored 5 years ago
  
  c4102961
Mar 25, 2019
- Attempt to fix incorrect federation of default instance avatars · 6f090f98
  feld authored 5 years ago
  
  6f090f98
- Merge branch 'fix/notification-id-index' into 'develop' · 15aa94f4
  rinpatch authored 5 years ago
  
  Add an `id desc nulls last` index to notifications See merge request pleroma/pleroma!975
  15aa94f4
- Add an id index to notifications · 9725c93c
  rinpatch authored 5 years ago
  
  9725c93c
- Merge branch 'bugfix/missing-announces' into 'develop' · b028b0f9
  rinpatch authored 5 years ago
  
  fix up missing announcements with preloads See merge request pleroma/pleroma!972
  b028b0f9
- fix up missing announcements with preloads · 26b0c802
  kaniini authored 5 years ago
  
  26b0c802
- Merge branch 'features/s3-uploader-digital-ocean' into 'develop' · bc14c98d
  kaniini authored 5 years ago
  
  add overriding truncated_namespace condition for truncating paths for digital ocean See merge request pleroma/pleroma!969
  bc14c98d
- Merge branch 'fix/mastoapi-liked' into 'develop' · 63ffa484
  kaniini authored 5 years ago
  
  Serve non-public activities in /api/v1/favourites Closes #648 See merge request pleroma/pleroma!970
  63ffa484
Mar 24, 2019
- Serve non-public activities in /api/v1/favourites · a7f58b3c
  rinpatch authored 5 years ago
  
  Fixes #648
  a7f58b3c
- add overriding truncated_namespace condition for truncating paths for digital ocean · 6c96d68f
  Austin authored 5 years ago
  
  6c96d68f
- Merge branch 'features/mrf-keyword-nil-summary' into 'develop' · 750de7d8
  rinpatch authored 5 years ago
  
  mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil See merge request pleroma/pleroma!968
  750de7d8