Commit Graph

4725 Commits (67d8df04a440ec9b2949bdddd3a3d8dd70c9b140)

Author SHA1 Message Date
Ariadne Conill c9280b9730 rework to use properties instead of compound typing, per SocialCG
5 years ago
Ariadne Conill ef659331b0 implement invisible support for remote users
5 years ago
Ariadne Conill 95871cb462 user: implement User.invisible?/1
5 years ago
Ariadne Conill 1469a084d4 relay: set invisible to true
5 years ago
Ariadne Conill e7333db72a user info: add invisible field
5 years ago
Haelwenn f01dbc450c Merge branch 'feature/mastofe-pwa' into 'develop'
5 years ago
eugenijm 52ed2f8f2d Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
KokaKiwi 638457ba94 MastoFE: Add PWA manifest.
5 years ago
Mark Felder dcb23a85b6 Merge branch 'develop' into feature/push-subject-for-dm
5 years ago
Mark Felder 152caef51d Direct messages should provide a distinct push notification subject
5 years ago
Maxim Filippov 019147f115 Merge branch 'develop' into feature/relay-list
5 years ago
Ariadne Conill 44e64af5e7 object: containment: simplify the pattern match for OStatus testsuite hack
5 years ago
Ariadne Conill e99fdfc32d object: containment: only allow OStatus references in test suite environment
5 years ago
Ariadne Conill 3c785b85a6 object: fetcher: fix up formatting
5 years ago
Ariadne Conill bae96de273 activitypub: tag containment checks for better error tracing
5 years ago
Ariadne Conill 7295a05cee object: containment: also allow OStatus object IDs through when comparing origins
5 years ago
Ariadne Conill a177f22e02 object: fetcher: improve error reporting
5 years ago
Ariadne Conill bf2107743f object: containment: don't try to contain ostatus objects
5 years ago
Ariadne Conill 6f110fc04c object fetcher: fix up error handling
5 years ago
Ariadne Conill 48059c03c9 fix up some tests
5 years ago
Ariadne Conill d379b48769 kill almost all of the OStatus module
5 years ago
Ariadne Conill 6a1f4c5145 federator: remove OStatus incoming document support
5 years ago
Ariadne Conill 835ad52378 remove Salmon module
5 years ago
Ariadne Conill beb9861f9d router: disconnect Salmon
5 years ago
Ariadne Conill a7b92bba68 webfinger: stop pulling Salmon data out of WebFinger
5 years ago
Ariadne Conill c00ae10af8 feed: don't advertise salmon endpoint
5 years ago
Ariadne Conill adb639db56 publisher: move remote_users() from Salmon module
5 years ago
Ariadne Conill 4f82e42e4e websub: remove entirely
5 years ago
Ariadne Conill b16a460916 federator: remove websub stuff
5 years ago
Ariadne Conill 25b7ff56c3 application: don't start Federator.init/1 anymore
5 years ago
rinpatch 39e996528c Fix a migration wiping user info of users that don't have any mutes
5 years ago
Haelwenn (lanodan) Monnier 3c6fd0bb99
upload.ex: Remove deprecated configuration
5 years ago
Maxim Filippov 2473702be2 Merge branch 'develop' into feature/relay-list
5 years ago
kaniini 7511f3d192 Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
5 years ago
kaniini 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
5 years ago
eugenijm 359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers
5 years ago
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
lain 1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop'
5 years ago
feld 21f0757b0d Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
5 years ago
lain 6977cddff9 Merge branch 'benchmark-finishing' into 'develop'
5 years ago
rinpatch 0a5175ecbb Order fts results by trigram
5 years ago
rinpatch c10ce113d4 User search: Remove trigram and refactor the module
5 years ago
Maxim Filippov da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
Maxim Filippov 90d516d42b Store status data inside flag activity
5 years ago
Alexander e7bb762ec2
don't stream in benchmark env
5 years ago
kPherox 5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
Egor Kislitsyn 1d46944fbd
Do not add `follower_address` to `following` for non local users
5 years ago
eugenijm a97b642289 Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
lain e3b4a3e96b Merge branch 'incoming-id-fixes' into 'develop'
5 years ago
rinpatch 9bdbf0811b Make MediaProxy failure tracking less brutal
5 years ago
Maxim Filippov cc6875b582 Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Maxim Filippov c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
lain 422aa6befe Ostatus DeleteHandler: Fix for new option format.
5 years ago
lain 37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain 9b963064eb Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
Egor Kislitsyn 059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
lain 29647dfd09 Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
lain d7f9679ff2 Merge branch 'develop' into 'reactions'
5 years ago
Maxim Filippov 24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov ad42837244 Ability to toggle activation status and permission group for a group of users
5 years ago
eugenijm 580a67f5ca Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Maxim Filippov aa7fd616c7 Line is too long!
5 years ago
Maxim Filippov 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov 7aceaa517b Admin API: Reports, grouped by status
5 years ago
lain 6c278cfe09 Merge branch 'develop' into 'reactions'
5 years ago
Ariadne Conill 9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287)
5 years ago
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus
5 years ago
lain d580eedfe9 Linting.
5 years ago
lain 73b6512907 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop'
5 years ago
Ivan Tashkinov 28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
lain 91e90aa807 Merge branch 'misskey-compat' into 'reactions'
5 years ago
Haelwenn b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
kaniini 2411d09215 Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
5 years ago
feld 1d8e956c32 Use the user.id instead of nickname in report URLs
5 years ago
Ivan Tashkinov b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
rinpatch fefbd31c6e Move local keys out of `user.info`
5 years ago
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
lain 61097ba6ab Merge branch 'develop' into 'reactions'
5 years ago
Ivan Tashkinov f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Haelwenn 9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
5 years ago
kaniini 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop'
5 years ago
kaniini 45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop'
5 years ago
kaniini 17ff4b43cb Merge branch 'unread-conversation-count' into 'develop'
5 years ago
eugenijm 8249924485 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain 1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain 276a520163 CommonAPI: Create profile updates as public.
5 years ago
lain 4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
Thibaut Girka 791d93ff0e Make credo happy
5 years ago
Thibaut Girka 977e711e22 Import object from self-Announce whenever possible
5 years ago
kaniini e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
5 years ago
lain 6a85f7d1ea Transmogrifier: Extend misskey like compatibility.
5 years ago
lain d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maksim Pechnikov 83631752af removed legacy api: "/objects/:uuid/likes"
5 years ago
kaniini e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
5 years ago
kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop'
5 years ago
Maxim Filippov 8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once
5 years ago
Ariadne Conill d1d058bf85 streamer: worker: actually use should_send? consistently
5 years ago
Ariadne Conill 5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
5 years ago
Ariadne Conill 2417b633ed streamer: add missing copyright headers
5 years ago
lain 43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
5 years ago
lain 568a995d64 ActivityPub: Change addressing of Undo.
5 years ago
lain 27110793a7 Merge branch 'featrue/job-monitor' into 'develop'
5 years ago
lain 27e914955e Merge branch 'fix/nickname-fail' into 'develop'
5 years ago
rinpatch 8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by
5 years ago
lain 01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop'
5 years ago
Egor Kislitsyn d3ac4e8083
Fix OAuthController
5 years ago
Haelwenn (lanodan) Monnier 5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
5 years ago
eugenijm 06d9df79c5 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions.
5 years ago
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
lain 4cb603e1df PleromaAPI: Add unreacting.
5 years ago
lain 391c736292 PleromaAPI: Fix emoji_reactions_by
5 years ago
Egor Kislitsyn e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn 7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
lain 9cfe9a57c5 CommonAPI: Add unreactions.
5 years ago
Egor Kislitsyn d3c404af12
Add MastoFEController
5 years ago
lain dfe5c958eb ActivityPub: Add undo for emoji reactions.
5 years ago
Egor Kislitsyn 1c6e1055c8
Add CustomEmojiController
5 years ago
lain 557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop'
5 years ago
kaniini debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop'
5 years ago
Thibaut Girka 86880b9821 Inline object when Announcing a self-owned private object
5 years ago
Thibaut Girka 3d61efa7c9 Rename misleading `get_announce_visibility` to `public_announce?`
5 years ago
Egor Kislitsyn 26693292f4
Remove `:enqueued` counter
5 years ago
Egor Kislitsyn c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini 89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
5 years ago
kaniini 8557176808 Merge branch 'split-masto-api/auth' into 'develop'
5 years ago
kaniini 9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop'
5 years ago
feld 1255ec888d Revert "Add upload limits to /api/v1/instance"
5 years ago
Thibaut Girka 427d0c2a00 Store private announcements in object.data["announcements"], filter them on display
5 years ago
Sergey Suprunenko c541b83bef Track failed proxy urls and don't request them again
5 years ago
Thibaut Girka 43e3db0951 Fix returned visibility of announces in MastodonAPI
5 years ago
Thibaut Girka 4c1f158f5d Allow users to announce privately, including own private notes
5 years ago
Maxim Filippov b2273c695e Discard identifier, if empty
5 years ago
Thibaut Girka fe538973dd Ensure self-announces do not widen the audience of the original post
5 years ago
KokaKiwi 1f0be71ea4 Make activity announceable by its author.
5 years ago
Maxim Filippov 0f9c2c8b87 Send an identifier alongside with error message in OAuthController
5 years ago
Egor Kislitsyn af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
Egor Kislitsyn 2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
Egor Kislitsyn 39695c4436 Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
Egor Kislitsyn 585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
Egor Kislitsyn 36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
kPherox a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
lain dae744478e Transmogrifier: Handle compact objects in undos.
5 years ago
Ivan Tashkinov 6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
lain 19bc0b8c79 .
5 years ago
lain 08256e9299 ActivityPub: Federate reactions.
5 years ago
lain 6068d2254e PleromaAPIController: Fixes and refactoring.
5 years ago
lain 04a2910f33 Pleroma.Constants: Fix typo.
5 years ago
Egor Kislitsyn 0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn 987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn 3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn e7aef27c00
Fix merge
5 years ago
lain a7f22c6e93 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain b923842e96 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop'
5 years ago
kaniini 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop'
5 years ago
kaniini 74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop'
5 years ago
Egor Kislitsyn b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
5 years ago
Ariadne Conill 1d7cbdaf7b change new scrobble endpoint
5 years ago
Ariadne Conill e653edd182 split scrobble functions into their own controller
5 years ago
Ariadne Conill a6e1469767 router: change scrobble timeline route from now-playing to scrobbles
5 years ago
Ariadne Conill 8b34b221cb common api: add some missing IR bits for listen activities' children
5 years ago
Ariadne Conill 84712c35f9 activitypub: object view: include child object for Listen activities
5 years ago
Ariadne Conill 71eff09e56 common api: make sure the generated IR is actually federatable
5 years ago
Ariadne Conill 7cad6ea67a pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill 2c82d8603b common api: implement scrobbling
5 years ago
Ariadne Conill 172c74a77b activitypub: transmogrifier: implement support for Listen activities
5 years ago
Ariadne Conill 1f9de2a8cd activitypub: implement IR-level considerations for Listen activities
5 years ago
Ariadne Conill b7877e9b1c mastodon api: implement rendering of listen activities
5 years ago
Egor Kislitsyn d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
rinpatch e9d1aa75d5 Revert subscription refactoring.
5 years ago
kaniini 6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop'
5 years ago
Maksim Pechnikov 1053319cd6 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Haelwenn (lanodan) Monnier 9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
rinpatch 374f83d29b Fix not being able to post empty statuses with attachments
5 years ago
minibikini f9380289eb Add `remote_ip` plug
5 years ago
kaniini 92d08d4113 Merge branch 'split-masto-api/follow-requests' into 'develop'
5 years ago
kaniini 68bf99baf2 Merge branch 'split-masto-api/domain-blocks' into 'develop'
5 years ago
kaniini 27a3221d57 Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
5 years ago
Egor Kislitsyn 408750b94e Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
Egor Kislitsyn 99c5a35890 Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
Egor Kislitsyn 8d31530119 Cleanup ScheduledActivityView
5 years ago
Egor Kislitsyn 0a5b106ddd Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
Egor Kislitsyn 621377f378 Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
Egor Kislitsyn 6c7c35dbe1 Fix SubscriptionNotificationView
5 years ago
kaniini 91e2bcf218 Merge branch 'refactor/status-controller' into 'develop'
5 years ago
Ariadne Conill 14294243a2 mastodon api: implement follow_requests_count
5 years ago
Egor Kislitsyn 5ea5c58a85 Move view logic from StatusController.context to StatusView and add a test
5 years ago
kaniini eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop'
5 years ago
Egor Kislitsyn 98d1347a4e Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
kaniini 219771288c Merge branch 'refactor/common_api' into 'develop'
5 years ago
kaniini dc0fdb5e84 Merge branch 'refactor/timeline-controller' into 'develop'
5 years ago
Maksim Pechnikov 73ae38ca04 add deprecated tag
5 years ago
Maksim Pechnikov b4fc96f640 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maxim Filippov e7836adf21 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov 3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Egor Kislitsyn 75290cbfbd Add Pleroma.JobQueueMonitor
5 years ago
Roman Chvanikov b4b147000c Merge develop
5 years ago
Egor Kislitsyn 3572cf29b7 Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
Egor Kislitsyn c57ad0a402 Cleanup CommonAPI
5 years ago
Egor Kislitsyn de3e90e536 Add ActivityDraft.with_valid/2
5 years ago
Egor Kislitsyn eed774d058 Add CommonAPI.ActivityDraft
5 years ago
kaniini 6abe12dced Merge branch 'refactor/notification-controller' into 'develop'
5 years ago
kaniini a39e065916 Merge branch 'feature/return-link-for-password-reset' into 'develop'
5 years ago
kaniini 48a82c4609 Merge branch 'refactor/user' into 'develop'
5 years ago
Hakaba Hitoyo 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context"
5 years ago
kaniini 3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop'
5 years ago
kaniini beabc49e35 Merge branch 'feature/activities-pagination-by-offset' into 'develop'
5 years ago
kaniini 1b9cd4c866 Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
5 years ago
rinpatch f92d7d52c2 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
rinpatch f2880d7d29 Credo considered harmful
5 years ago
rinpatch c7d8ccd0c4 Remove useless with clause
5 years ago
rinpatch 1ddd403339 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch d87be2ec96 Don't embed the first page in inboxes/outboxes and refactor the views to
5 years ago
Ekaterina Vaartis 1fd9c60f87 Fix emoji tags for shareable packs to be "pack:{name}"
5 years ago
Ekaterina Vaartis 118d6dcdf4 Fix nodeinfo handling
5 years ago
Ekaterina Vaartis ba9d35a904 Add an API endpoint for listing remote packs
5 years ago
vaartis a6e85215e1 Credo fix (remove parens on function definition)
5 years ago
vaartis f21dbbc021 Move emoji_dir_path & cache_seconds_per_file
5 years ago
Ekaterina Vaartis cdbe7cd37a When listing emoji packs, be sure to create the directory
5 years ago
Egor Kislitsyn b5dfe83433 Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Maksim Pechnikov 1a858134ed Merge branch 'develop' into issue/1218
5 years ago
Maxim Filippov 60cbea5bb2 Allow activities pagination via limit/offset
5 years ago
Haelwenn (lanodan) Monnier 0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
Egor Kislitsyn 035f22f784 Fix Credo warnings
5 years ago
Egor Kislitsyn 1bea67cb5e Cleanup Pleroma.User
5 years ago
Egor Kislitsyn 209395c7e6 Add User.change_info/2 and User.update_info/2
5 years ago
Maxim Filippov 5e9759cd7d Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Egor Kislitsyn a66a7a328f Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Egor Kislitsyn 79b25be4e1 Do not return tuple when unneeded
5 years ago
Maksim Pechnikov d75d0ae134 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
kaniini 29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop'
5 years ago
kaniini 19263f30c3 Merge branch 'support-rel-ugc' into 'develop'
5 years ago
kaniini 760df67a7b Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
5 years ago
kaniini ad9595ca55 Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
5 years ago
Steven Fuchs e1d2d69c87 Clean up views
5 years ago
Ekaterina Vaartis e63f167f01 Also pretty print pack.json
5 years ago
Rachel Fae Fox 63af6951fa add tunable for stream uploads, as needed for jortage to work.
5 years ago
Maksim Pechnikov 494bb6bac6 updated tests
5 years ago
Maksim Pechnikov 179fa32dd5 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maksim Pechnikov 38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch fd48bd80eb Merge branch 'better-emoji-packs' into 'develop'
5 years ago