Commit graph

  • debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop' kaniini 2019-10-02 10:45:55 +0000
  • f205d3da1d Merge branch 'get_announce_visibility-name' into 'develop' kaniini 2019-10-02 10:44:51 +0000
  • 86880b9821 Inline object when Announcing a self-owned private object Thibaut Girka 2019-10-02 12:14:08 +0200
  • 3d61efa7c9 Rename misleading get_announce_visibility to public_announce? Thibaut Girka 2019-10-02 10:48:34 +0200
  • 0fc29deba0
    Add tests for Pleroma.JobQueueMonitor Egor Kislitsyn 2019-10-02 15:24:21 +0700
  • 93f966ea4b
    Update CHANGELOG and pleroma_api.md Egor Kislitsyn 2019-10-02 14:51:30 +0700
  • 26693292f4
    Remove :enqueued counter Egor Kislitsyn 2019-10-02 14:50:25 +0700
  • c8b01f6667
    Extract instance actions from MastodonAPIController to InstanceController Egor Kislitsyn 2019-10-02 14:13:52 +0700
  • 89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' kaniini 2019-10-02 07:04:33 +0000
  • 8557176808 Merge branch 'split-masto-api/auth' into 'develop' kaniini 2019-10-02 07:02:56 +0000
  • 9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop' kaniini 2019-10-02 07:02:24 +0000
  • 5eab6561d8 Merge branch 'update/admin-fe-20191001' into 'develop' kaniini 2019-10-02 07:01:18 +0000
  • a562cb2c34 Update AdminFE bundle Mark Felder 2019-10-01 18:29:39 -0500
  • aaafec7eb8 Merge branch 'feature/expose-attachment-size' into 'develop' feld 2019-10-01 22:16:29 +0000
  • 1255ec888d Revert "Add upload limits to /api/v1/instance" feld 2019-10-01 22:16:29 +0000
  • 427d0c2a00 Store private announcements in object.data["announcements"], filter them on display Thibaut Girka 2019-10-01 21:40:35 +0200
  • ee6da62cdb Merge branch 'feature/track-reverse-proxy-failures' into 'develop' feld 2019-10-01 20:00:27 +0000
  • c541b83bef Track failed proxy urls and don't request them again Sergey Suprunenko 2019-10-01 20:00:27 +0000
  • 43e3db0951 Fix returned visibility of announces in MastodonAPI Thibaut Girka 2019-10-01 19:28:51 +0200
  • 7d5a9f3f6d Add tests for privately announcing statuses via API Thibaut Girka 2019-10-01 19:08:25 +0200
  • 4c1f158f5d Allow users to announce privately, including own private notes Thibaut Girka 2019-10-01 18:38:23 +0200
  • b2273c695e Discard identifier, if empty Maxim Filippov 2019-10-01 19:43:22 +0300
  • e0b654e202 Add tests Thibaut Girka 2019-10-01 17:51:27 +0200
  • fe538973dd Ensure self-announces do not widen the audience of the original post Thibaut Girka 2019-10-01 17:49:52 +0200
  • 1f0be71ea4 Make activity announceable by its author. KokaKiwi 2019-02-24 18:45:29 +0100
  • 0f9c2c8b87 Send an identifier alongside with error message in OAuthController Maxim Filippov 2019-10-01 18:10:04 +0300
  • af690d1033
    Extract auth actions from MastodonAPIController to AuthController Egor Kislitsyn 2019-10-01 15:54:45 +0700
  • 51b5c53988 Merge branch 'split-masto-api/apps' into 'develop' kaniini 2019-10-01 08:32:59 +0000
  • 2dad6dd020
    Extract apps actions from MastodonAPIController to AppController Egor Kislitsyn 2019-10-01 15:21:46 +0700
  • 82d7985ae9 Merge branch 'split-masto-api/suggestions' into 'develop' kaniini 2019-10-01 08:15:56 +0000
  • 39695c4436 Extract suggestions actions from MastodonAPIController to SuggestionController Egor Kislitsyn 2019-10-01 14:45:04 +0700
  • b4369e7e68 Merge branch 'split-masto-api/media' into 'develop' kaniini 2019-10-01 07:57:46 +0000
  • 585bc57edb
    Extract media actions from MastodonAPIController to MediaController Egor Kislitsyn 2019-10-01 14:36:35 +0700
  • f0b4ba1bf9 Merge branch 'split-masto-api/polls' into 'develop' kaniini 2019-10-01 07:11:54 +0000
  • 36a34c36fe
    Extract poll actions from MastodonAPIController to PollController Egor Kislitsyn 2019-10-01 11:44:34 +0700
  • f364438032
    Add rel="ugc" kPherox 2019-10-01 02:24:06 +0900
  • 70d18a278c Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1' kaniini 2019-09-30 16:40:46 +0000
  • a0f101ee80
    Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials kPherox 2019-10-01 01:39:22 +0900
  • 5bfd4006ae Pleroma 1.0.90 (aka 1.1 RC1). Ariadne Conill 2019-09-30 16:38:34 +0000
  • 57101955b6 Merge branch 'cherry-pick-compact-undos' into 'maint/1.1' kaniini 2019-09-30 16:37:45 +0000
  • 703deb66d9 Merge branch 'compact-undos' into 'develop' kaniini 2019-09-30 16:25:45 +0000
  • 565b8d02c8 Transmogrifier: Handle compact objects in undos. lain 2019-09-30 18:13:05 +0200
  • 56c91d1323 Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1' rinpatch 2019-09-30 16:16:22 +0000
  • dae744478e Transmogrifier: Handle compact objects in undos. lain 2019-09-30 18:13:05 +0200
  • 96e1db1cf1 Merge branch 'ci/build-otp-maint' into 'develop' kaniini 2019-09-30 15:37:03 +0000
  • 7c9b023a91 Merge branch 'ci/build-otp-maint' into 'develop' kaniini 2019-09-30 15:37:03 +0000
  • 4f3b8d5399 Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1' kaniini 2019-09-30 15:35:47 +0000
  • 979f66a99c update pleroma fe Ariadne Conill 2019-09-30 15:34:19 +0000
  • 7131580058 CI: Enable OTP release building for maint/* branches rinpatch 2019-09-30 18:23:29 +0300
  • 6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions Ivan Tashkinov 2019-09-30 17:41:20 +0300
  • 19bc0b8c79 . lain 2019-09-30 16:38:19 +0200
  • 08256e9299 ActivityPub: Federate reactions. lain 2019-09-30 15:51:09 +0200
  • 6068d2254e PleromaAPIController: Fixes and refactoring. lain 2019-09-30 15:13:25 +0200
  • 04a2910f33 Pleroma.Constants: Fix typo. lain 2019-09-30 15:13:05 +0200
  • a22a7437d8 Merge branch 'split-masto-api/mascots' into 'develop' kaniini 2019-09-30 12:53:43 +0000
  • dfab2232f8 Merge branch 'update/admin-fe-20190930' into 'develop' kaniini 2019-09-30 12:53:28 +0000
  • 28be12b38e update admin fe Ariadne Conill 2019-09-30 12:52:28 +0000
  • 0c6009dd2e
    Extract mascot actions from MastodonAPIController to MascotController Egor Kislitsyn 2019-09-30 19:32:43 +0700
  • 0aef18bcf4 Litepub Context: Add EmojiReaction. lain 2019-09-30 14:26:59 +0200
  • 905bb11747 Merge branch 'split-masto-api/accounts' into 'develop' kaniini 2019-09-30 12:21:16 +0000
  • c55facf78b
    Fix warning in TransmogrifierTest Egor Kislitsyn 2019-09-30 19:06:17 +0700
  • 987e0b8be8
    Move update_credentials to MastodonAPI.AccountController Egor Kislitsyn 2019-09-30 15:47:01 +0700
  • c0ce2d5faf
    Move account_register, relationships and verify_credentials to MastodonAPI.AccountController Egor Kislitsyn 2019-09-30 16:08:29 +0700
  • 122cc050ab
    Move account_lists test to MastodonAPI.AccountControllerTest Egor Kislitsyn 2019-09-30 14:43:54 +0700
  • 38db4878a4
    Disable async in DomainBlockControllerTest Egor Kislitsyn 2019-09-30 14:28:37 +0700
  • 3c5ecb70b4
    Add PleromaAPI.AccountController Egor Kislitsyn 2019-09-30 14:28:12 +0700
  • e7aef27c00
    Fix merge Egor Kislitsyn 2019-09-30 19:10:54 +0700
  • a7f22c6e93 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-09-30 13:58:14 +0200
  • b923842e96 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-09-30 13:57:54 +0200
  • 3f0e276ac9 Merge branch 'fix/report-controller-test' into 'develop' kaniini 2019-09-30 11:41:39 +0000
  • 1207e88195
    Fix ReportControllerTest Egor Kislitsyn 2019-09-30 18:30:10 +0700
  • 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop' kaniini 2019-09-30 11:21:49 +0000
  • 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop' kaniini 2019-09-30 11:17:30 +0000
  • 74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop' kaniini 2019-09-30 10:49:40 +0000
  • f889e8e309 Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop' kaniini 2019-09-30 10:46:34 +0000
  • ed176e7402 Merge branch 'feature/scrobbling' into 'develop' kaniini 2019-09-30 10:45:00 +0000
  • b7f27a4f58
    Extract report actions from MastodonAPIController to ReportController Egor Kislitsyn 2019-09-30 17:04:03 +0700
  • 1d7cbdaf7b change new scrobble endpoint Ariadne Conill 2019-09-29 02:18:34 +0000
  • 211008ae2f test: fix scrobble controller tests Ariadne Conill 2019-09-29 00:35:40 +0000
  • e653edd182 split scrobble functions into their own controller Ariadne Conill 2019-09-29 00:25:42 +0000
  • a6e1469767 router: change scrobble timeline route from now-playing to scrobbles Ariadne Conill 2019-09-29 00:18:06 +0000
  • 8b34b221cb common api: add some missing IR bits for listen activities' children Ariadne Conill 2019-09-28 12:29:00 +0000
  • 84712c35f9 activitypub: object view: include child object for Listen activities Ariadne Conill 2019-09-28 12:28:39 +0000
  • 71eff09e56 common api: make sure the generated IR is actually federatable Ariadne Conill 2019-09-28 12:12:35 +0000
  • e7309d3b60 test: transmogrifier: add test proving that transmogrifier can handle outgoing listens Ariadne Conill 2019-09-28 11:57:24 +0000
  • 53506da414 update changelog Ariadne Conill 2019-09-28 02:13:26 +0000
  • 7cad6ea67a pleroma api: hook up scrobbler controller Ariadne Conill 2019-09-28 02:12:12 +0000
  • 2c82d8603b common api: implement scrobbling Ariadne Conill 2019-09-28 00:24:32 +0000
  • 172c74a77b activitypub: transmogrifier: implement support for Listen activities Ariadne Conill 2019-09-27 12:40:31 +0000
  • 1f9de2a8cd activitypub: implement IR-level considerations for Listen activities Ariadne Conill 2019-09-27 12:22:35 +0000
  • b7877e9b1c mastodon api: implement rendering of listen activities Ariadne Conill 2019-09-27 11:40:40 +0000
  • c3d09921e4 test: factory: implement support for generating mock audio and listen objects Ariadne Conill 2019-09-27 11:15:20 +0000
  • 5fd29edac4 docs: add scrobble API description Ariadne Conill 2019-09-27 11:04:52 +0000
  • d4d88b3361
    Extract conversation actions from MastodonAPIController to ConversationController Egor Kislitsyn 2019-09-30 16:52:07 +0700
  • 1fba66178d Merge branch 'develop' into cleanup/drop-subscription-table-if-exists rinpatch 2019-09-30 00:26:49 +0300
  • 81b4243173 Remove subscription_notifications table if it existed rinpatch 2019-09-29 23:52:40 +0300
  • 90537f3981 Merge branch 'revert/subscription-refactoring' into 'develop' rinpatch 2019-09-29 20:07:37 +0000
  • e9d1aa75d5 Revert subscription refactoring. rinpatch 2019-09-29 18:43:27 +0300
  • 6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop' kaniini 2019-09-29 11:44:31 +0000
  • f31ad5549b Merge branch 'chores/1691-breaking-change' into 'develop' Haelwenn 2019-09-29 00:34:14 +0000