Commit Graph

  • 1207e88195
    Fix ReportControllerTest Egor Kislitsyn 2019-09-30 18:30:10 +07:00
  • 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop' kaniini 2019-09-30 11:21:49 +00:00
  • 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop' kaniini 2019-09-30 11:17:30 +00:00
  • 74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop' kaniini 2019-09-30 10:49:40 +00:00
  • f889e8e309 Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop' kaniini 2019-09-30 10:46:34 +00:00
  • ed176e7402 Merge branch 'feature/scrobbling' into 'develop' kaniini 2019-09-30 10:45:00 +00:00
  • b7f27a4f58
    Extract report actions from MastodonAPIController to ReportController Egor Kislitsyn 2019-09-30 17:04:03 +07:00
  • 1d7cbdaf7b change new scrobble endpoint Ariadne Conill 2019-09-29 02:18:34 +00:00
  • 211008ae2f test: fix scrobble controller tests Ariadne Conill 2019-09-29 00:35:40 +00:00
  • e653edd182 split scrobble functions into their own controller Ariadne Conill 2019-09-29 00:25:42 +00:00
  • a6e1469767 router: change scrobble timeline route from now-playing to scrobbles Ariadne Conill 2019-09-29 00:18:06 +00:00
  • 8b34b221cb common api: add some missing IR bits for listen activities' children Ariadne Conill 2019-09-28 12:29:00 +00:00
  • 84712c35f9 activitypub: object view: include child object for Listen activities Ariadne Conill 2019-09-28 12:28:39 +00:00
  • 71eff09e56 common api: make sure the generated IR is actually federatable Ariadne Conill 2019-09-28 12:12:35 +00:00
  • e7309d3b60 test: transmogrifier: add test proving that transmogrifier can handle outgoing listens Ariadne Conill 2019-09-28 11:57:24 +00:00
  • 53506da414 update changelog Ariadne Conill 2019-09-28 02:13:26 +00:00
  • 7cad6ea67a pleroma api: hook up scrobbler controller Ariadne Conill 2019-09-28 02:12:12 +00:00
  • 2c82d8603b common api: implement scrobbling Ariadne Conill 2019-09-28 00:24:32 +00:00
  • 172c74a77b activitypub: transmogrifier: implement support for Listen activities Ariadne Conill 2019-09-27 12:40:31 +00:00
  • 1f9de2a8cd activitypub: implement IR-level considerations for Listen activities Ariadne Conill 2019-09-27 12:22:35 +00:00
  • b7877e9b1c mastodon api: implement rendering of listen activities Ariadne Conill 2019-09-27 11:40:40 +00:00
  • c3d09921e4 test: factory: implement support for generating mock audio and listen objects Ariadne Conill 2019-09-27 11:15:20 +00:00
  • 5fd29edac4 docs: add scrobble API description Ariadne Conill 2019-09-27 11:04:52 +00:00
  • d4d88b3361
    Extract conversation actions from MastodonAPIController to ConversationController Egor Kislitsyn 2019-09-30 16:52:07 +07:00
  • 1fba66178d Merge branch 'develop' into cleanup/drop-subscription-table-if-exists rinpatch 2019-09-30 00:26:49 +03:00
  • 81b4243173 Remove subscription_notifications table if it existed rinpatch 2019-09-29 23:52:40 +03:00
  • 90537f3981 Merge branch 'revert/subscription-refactoring' into 'develop' rinpatch 2019-09-29 20:07:37 +00:00
  • e9d1aa75d5 Revert subscription refactoring. rinpatch 2019-09-29 18:43:27 +03:00
  • 6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop' kaniini 2019-09-29 11:44:31 +00:00
  • a067cf0f23 Merge branch 'backport/1.0-index-fix' into 'master' kaniini 2019-09-29 11:41:59 +00:00
  • b60ec3b173 Add an index on object likes rinpatch 2019-08-23 03:17:20 +03:00
  • f31ad5549b Merge branch 'chores/1691-breaking-change' into 'develop' Haelwenn 2019-09-29 00:34:14 +00:00
  • e46dfd9295
    CHANGELOG.md: Sorting, colon after breaking Haelwenn (lanodan) Monnier 2019-09-29 02:16:52 +02:00
  • 717cb4f933
    admin_api.md: Put data-type info as the values Haelwenn (lanodan) Monnier 2019-09-29 02:14:53 +02:00
  • 51a4a211a3
    CHANGELOG.md: !1691 is a breaking change Haelwenn (lanodan) Monnier 2019-09-29 02:13:17 +02:00
  • 239cf46eb4 Merge branch 'chore/update-docs' into 'develop' Haelwenn 2019-09-28 23:59:15 +00:00
  • 0e59d1dc04 Update admin_api.md Maxim Filippov 2019-09-29 00:01:35 +03:00
  • b35a0f0ce4 Merge branch 'tests/mastodon_api_controller.ex' into 'develop' Haelwenn 2019-09-28 19:02:05 +00:00
  • 1053319cd6 Merge branch 'develop' into tests/mastodon_api_controller.ex Maksim Pechnikov 2019-09-28 10:32:03 +03:00
  • 50ab064353 Merge branch 'bugfix/post-empty-status' into 'develop' Haelwenn 2019-09-28 00:03:24 +00:00
  • 9202904da9
    status_controller.ex: Posting media status without content defined Haelwenn (lanodan) Monnier 2019-09-28 01:21:28 +02:00
  • a0f42ecbca Merge branch 'fix/empty-attachment-statuses' into 'develop' rinpatch 2019-09-27 23:09:07 +00:00
  • 374f83d29b Fix not being able to post empty statuses with attachments rinpatch 2019-09-28 01:56:20 +03:00
  • 705ea1b975 Merge branch 'remote-ip' into 'develop' Haelwenn 2019-09-27 21:59:23 +00:00
  • f9380289eb Add remote_ip plug minibikini 2019-09-27 21:59:23 +00:00
  • 92d08d4113 Merge branch 'split-masto-api/follow-requests' into 'develop' kaniini 2019-09-27 07:54:54 +00:00
  • 68bf99baf2 Merge branch 'split-masto-api/domain-blocks' into 'develop' kaniini 2019-09-27 07:54:08 +00:00
  • 27a3221d57 Merge branch 'split-masto-api/scheduled-statuses' into 'develop' kaniini 2019-09-27 07:53:22 +00:00
  • c903d46a12 Merge branch 'split-masto-api/filters' into 'develop' kaniini 2019-09-27 07:52:27 +00:00
  • 408750b94e Extract domain blocks actions from MastodonAPIController to DomainBlockController Egor Kislitsyn 2019-09-27 14:28:05 +07:00
  • 99c5a35890 Extract follow requests actions from MastodonAPIController to FollowRequestController Egor Kislitsyn 2019-09-27 14:25:17 +07:00
  • 8d31530119 Cleanup ScheduledActivityView Egor Kislitsyn 2019-09-27 11:46:20 +07:00
  • 0a5b106ddd Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController Egor Kislitsyn 2019-09-27 13:35:45 +07:00
  • a83c116df7 Merge branch 'fix/subscription-notification-view' into 'develop' kaniini 2019-09-27 06:17:40 +00:00
  • 621377f378 Extract filter actions from MastodonAPIController to FilterController Egor Kislitsyn 2019-09-27 13:06:25 +07:00
  • 6c7c35dbe1 Fix SubscriptionNotificationView Egor Kislitsyn 2019-09-27 11:55:47 +07:00
  • 91e2bcf218 Merge branch 'refactor/status-controller' into 'develop' kaniini 2019-09-27 04:37:48 +00:00
  • 843c11d1f6 changelog Ariadne Conill 2019-09-27 04:24:20 +00:00
  • 14294243a2 mastodon api: implement follow_requests_count Ariadne Conill 2019-09-27 04:22:40 +00:00
  • 5ea5c58a85 Move view logic from StatusController.context to StatusView and add a test Egor Kislitsyn 2019-09-26 14:28:35 +07:00
  • 76b7e5cd5b Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest Egor Kislitsyn 2019-09-26 13:38:45 +07:00
  • eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop' kaniini 2019-09-27 03:51:24 +00:00
  • 98d1347a4e Extract status actions from MastodonAPIController into StatusController Egor Kislitsyn 2019-09-09 21:49:02 +07:00
  • c4fbb56984 Merge branch 'patch-2' into 'develop' kaniini 2019-09-27 03:50:36 +00:00
  • 0e280354d9 Merge branch 'update/docs-jp' into 'develop' kaniini 2019-09-27 03:49:00 +00:00
  • 01a7e20c32 Merge branch 'list-packs-docs' into 'develop' kaniini 2019-09-27 03:46:53 +00:00
  • 8df3a63ce9 Merge branch 'patch-1' into 'develop' kaniini 2019-09-27 03:46:34 +00:00
  • 219771288c Merge branch 'refactor/common_api' into 'develop' kaniini 2019-09-27 03:46:02 +00:00
  • dc0fdb5e84 Merge branch 'refactor/timeline-controller' into 'develop' kaniini 2019-09-27 03:42:30 +00:00
  • 67a659a096 Merge branch 'chore/changelog-sync' into 'develop' rinpatch 2019-09-26 22:17:20 +00:00
  • 3ec81b816f Sync changelogs between master and develop rinpatch 2019-09-27 01:16:24 +03:00
  • 7030721b31 Merge branch 'backport/1.0-hackney-and-outbox-fixes' into 'master' v1.0.7 rinpatch 2019-09-26 22:05:33 +00:00
  • df8fda267e Change the 1.0.7 release date to be based on UTC rinpatch 2019-09-27 00:59:07 +03:00
  • c8694d6d7b Bump version to 1.0.7 rinpatch 2019-09-27 00:44:10 +03:00
  • 31421916c0 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex rinpatch 2019-09-25 13:38:45 +00:00
  • 13e7753382 Credo considered harmful rinpatch 2019-09-25 16:36:46 +03:00
  • 821fb2a584 Remove useless with clause rinpatch 2019-09-25 16:26:47 +03:00
  • 700d0a56a1 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-25 13:20:48 +00:00
  • 68e7bea354 Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern rinpatch 2019-09-25 15:59:04 +03:00
  • 231e5e7914 Add a changelog entry for hackney fix rinpatch 2019-09-27 00:21:13 +03:00
  • e17113d821 mix.lock: Bump hackney to 1.15.2 Haelwenn (lanodan) Monnier 2019-09-25 23:16:35 +02:00
  • 73ae38ca04 add deprecated tag Maksim Pechnikov 2019-09-26 21:08:04 +03:00
  • b4fc96f640 Merge branch 'develop' into tests/mastodon_api_controller.ex Maksim Pechnikov 2019-09-26 20:56:59 +03:00
  • cb282f2ccd Merge branch 'feature/moderation-log-filters' into 'develop' feld 2019-09-26 16:44:53 +00:00
  • 39a4892929 Add docs Maxim Filippov 2019-09-26 19:20:47 +03:00
  • f249b2381f Fix code block for admin api document kPherox 2019-09-26 16:10:34 +00:00
  • e7836adf21 Merge branch 'develop' into feature/moderation-log-filters Maxim Filippov 2019-09-26 19:01:54 +03:00
  • 3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex Maksim Pechnikov 2019-09-26 16:13:07 +03:00
  • b736312123 Update CHANGELOG Roman Chvanikov 2019-09-26 15:17:36 +03:00
  • 75290cbfbd Add Pleroma.JobQueueMonitor Egor Kislitsyn 2019-09-26 18:49:57 +07:00
  • fc16bec317 Add list_from endpoint to the pleroma_api docs Ekaterina Vaartis 2019-09-26 09:52:11 +03:00
  • b4b147000c Merge develop Roman Chvanikov 2019-09-26 10:38:54 +03:00
  • 2b98ef832c Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1' rinpatch 2019-09-26 06:11:52 +00:00
  • 6d1ca73466 Linting rinpatch 2019-09-26 09:03:20 +03:00
  • 3572cf29b7 Extract timeline actions from MastodonAPIController into TimelineController Egor Kislitsyn 2019-09-26 10:53:42 +07:00
  • c57ad0a402 Cleanup CommonAPI Egor Kislitsyn 2019-09-24 15:56:20 +07:00
  • de3e90e536 Add ActivityDraft.with_valid/2 Egor Kislitsyn 2019-09-23 18:52:41 +07:00
  • eed774d058 Add CommonAPI.ActivityDraft Egor Kislitsyn 2019-09-24 16:10:54 +07:00
  • 6abe12dced Merge branch 'refactor/notification-controller' into 'develop' kaniini 2019-09-26 03:13:22 +00:00
  • a39e065916 Merge branch 'feature/return-link-for-password-reset' into 'develop' kaniini 2019-09-26 03:12:03 +00:00