Commit Graph

3781 Commits (ae4fc58589ac48a0853719e6f83b2559b6de44fb)

Author SHA1 Message Date
lambda 1dcdcd8871 Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
5 years ago
lambda 46684db84d Update account_view.ex
5 years ago
lain 249b31ffe5 Fix specs.
5 years ago
rinpatch 642a67dd44 Render polls in statuses
5 years ago
Alexander Strizhakov 7ed682213f Fix/902 random compile failing
5 years ago
Haelwenn (lanodan) Monnier 68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
5 years ago
Aaron Tinio 70235ce840 Fix typo: s/"tags"/"tag"/g
5 years ago
kaniini bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop'
5 years ago
Sergey Suprunenko 2c303afc8b Remove duplicated entries in users' following lists
5 years ago
Sergey Suprunenko e2b3a27204 Add Reports to Admin API
5 years ago
feld e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
5 years ago
Mark Felder ebb0482116 Merge branch 'develop' into conversations-import
5 years ago
lambda fde30aee43 Merge branch 'feature/sql-thread-sat' into 'develop'
5 years ago
Alexander Strizhakov 73ae58fdfa Feature/896 toggling confirmation
5 years ago
Egor Kislitsyn fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Alex S 9d14214eb9 Merge branch 'develop' into feature/890-add-report-uri
5 years ago
Alex S aa11fa4864 add report uri and report to
5 years ago
William Pitcock c31026423c publisher: use the correct queue name for outgoing federation
5 years ago
Aaron Tinio 793f1834d2 Use named binding to conditionally join object
5 years ago
Aaron Tinio 2b6119dfbf Restrict reblogs of activities from blocked domains
5 years ago
rinpatch 62e42b03ab Handle incoming Question objects
5 years ago
William Pitcock a591ab6112 activity pub: remove Ecto SQL query dumps
5 years ago
William Pitcock f09c3afdf5 chase test failures
5 years ago
William Pitcock 0aada88b55 bbs: chase timeline containment patch
5 years ago
William Pitcock 31db31c587 activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
5 years ago
William Pitcock de114ffbb0 activitypub: remove contain_timeline()
5 years ago
William Pitcock 0387f52138 activitypub: add restrict_thread_visibility()
5 years ago
lain f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
kaniini 62516be9c4 Merge branch 'fix/public-option-not-working' into 'develop'
5 years ago
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
5 years ago
lain 7a92e701b9 CommonAPI: Visibility refactor.
5 years ago
lain cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
lain f1e67bdc31 Search: Add optional rum indexing / searching.
5 years ago
Sachin Joshi ee22fff5ac remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn a7a8f3bc2c Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Aaron Tinio 70c81b95d0 Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
Aaron Tinio 7b8dc99ef1 Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
5 years ago
William Pitcock 071f78733a switch to pleroma/http_signatures library
5 years ago
Mark Felder 1caa6331ea Group def perform() together to fix the build
5 years ago
lambda fa4bd898f1 Merge branch 'fix/gopher' into 'develop'
5 years ago
William Pitcock 51325fd60c gopher: fix rendering of post content (closes #895)
5 years ago
lambda 692919c7d2 Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
5 years ago
William Pitcock ac3a3abf6b clean up follow/block imports a little
5 years ago
kaniini dfd031c26a Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
5 years ago
Maksim 52297920e7 Refactoring oauth response.
5 years ago
Egor Kislitsyn e82e73478e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn b92c004ea8 Reuse query from User.restrict_deactivated/1
5 years ago
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Aaron Tinio a18b2c0b12 Fix Pleroma.Config.get!/1 raising an error when value is false
5 years ago
Mark Felder bbacdf2352 Bump Mastodon API level
5 years ago
Mark Felder 498bfdf403 Switch to Jason over Poison
5 years ago
William Pitcock 69a9e0563c user: migrate follow/blocks import to job queue
5 years ago
William Pitcock 57d11ac9db activitypub: move post rich media fetching to job queue
5 years ago
William Pitcock 32d4630c9c user: move initial post fetching to job queue
5 years ago
lambda b14a314ce7 Merge branch 'feature/federator-behaviours' into 'develop'
5 years ago
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
5 years ago
Sachin Joshi 7701a4c841 Make irreversible field default to false in filters
5 years ago
Egor Kislitsyn 23276e8d68 Use pseudo ap id of a list in BCC
5 years ago
William Pitcock 44b182732e nodeinfo: gather supported protocol names from federation modules
5 years ago
William Pitcock 28f7f4c6de webfinger: build the response based on enabled federation modules
5 years ago
William Pitcock 55fa4b812a federator: websub removal
5 years ago
William Pitcock c23276a59a activitypub: publisher: fixups
5 years ago
William Pitcock fedaca15a3 websub: adapt to work as a federator publishing module
5 years ago
William Pitcock 179293e51c salmon: refactor to work as a federator publishing module
5 years ago
William Pitcock 2aee62a456 federator: publisher: only attempt publishing if we know the activity is representable
5 years ago
William Pitcock 69158f1065 ostatus: only as:Public activities are representable
5 years ago
William Pitcock 85377c0b67 federator: move activitypub relaying to the AP publisher module
5 years ago
William Pitcock 676752bb83 federator: hook up Publisher.publish()
5 years ago
William Pitcock f7a6a37c4e federator: remove no longer used :publish_single_ap
5 years ago
William Pitcock 10695a28d2 federator: publisher: add publish() wrapper
5 years ago
William Pitcock 0afc8d7856 federator: publisher: integrate job queue, simplify publish_one logic
5 years ago
William Pitcock ef1f9e8d4e activitypub: split out outgoing federation into a federation module
5 years ago
William Pitcock e7d292f80e federator: add publisher module defining a contract for publishing behaviours
5 years ago
rinpatch b9f84a382a Normalize the object only after ensuring the activity type is Create
5 years ago
kaniini 131f883207 Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
5 years ago
lain 01c45ddc9e Search: Use RUM index.
5 years ago
Sachin Joshi f01f995816 make url uniform in admin api
5 years ago
Roman Chvanikov f1f7a11222 Merge develop
5 years ago
feld c953ae8c3d Initial bundle of basic AdminFE
5 years ago
rinpatch 1d78e42fd4 Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
5 years ago
Francis Dinh 2a54e8c1f5 Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
5 years ago
rinpatch e4523c3010 Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain a33bec7d58 Conversations: Import order, import as read.
5 years ago
lain e6d7f8d223 Credo fixes.
5 years ago
lain 6d19bb4eae Conversations: Add mix task to 'import' old DMs.
5 years ago
lain a4598b5e8b Visibility: Make it more resilient.
5 years ago
lain 920bd47055 ActivityPub: Remove leftover printf debugging.
5 years ago
lain fcf2f38d20 Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov bfeb33e951 Merge develop
5 years ago
Maksim 799e1f48b5 Refactoring functions for dealing with oauth scopes.
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
kaniini 14deed7f7d Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
5 years ago
William Pitcock d64c3b604e twitterapi: use order constraint to force descending order
5 years ago
William Pitcock 6020ff3fb6 activitypub: add optional order constraint to timeline query builder
5 years ago
rinpatch 4c5125dedc Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch be067ec2ab Use with_preloaded_bookmark in create_by_object_ap_id_with_object
5 years ago
rinpatch 3a7c14645e - Actually use preloaded bookmarks in views
5 years ago
rinpatch f841eb7cdb Preload bookmarks wherever the object is preloaded
5 years ago
rinpatch 06947c9147 Remove bookmarks assoc
5 years ago
kaniini a1a0df19c4 Merge branch 'docs/MRF-modules' into 'develop'
5 years ago
William Pitcock e71ddf23ba containment: remove pointless moduledoc line
5 years ago
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
5 years ago
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim 1040caf096 fix format
5 years ago
lambda aacac9da0b Merge branch 'feature/bbs' into 'develop'
5 years ago
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
Haelwenn (lanodan) Monnier 69a5074893
Remove H1 in @moduledoc
5 years ago
Haelwenn (lanodan) Monnier e41a2f98d5
mrf/tag_policy.ex: Add some documentation
5 years ago
Haelwenn (lanodan) Monnier af62ace954
Add short documentation on every MRF Policy
5 years ago
lain eb0fb73ddb BBS: Credo fixes.
5 years ago
lain c9d1cb2dce BBS: Use cached user fetcher.
5 years ago
lain 4c76f49e60 BBS: small fixes.
5 years ago
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
rinpatch d089ff2460 Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 46bbf9e1cf
TwitterAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
5 years ago
Haelwenn (lanodan) Monnier 2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
Haelwenn (lanodan) Monnier 85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
lain c42ded13a2 Credo fixes.
5 years ago
feld acb04306b6 Standardize construction of websocket URL
5 years ago
lain a0c755cc4a MastodonApi: Bump api level.
5 years ago
lain 81d1aa424d Streamer: Stream out Conversations/Participations.
5 years ago
rinpatch 38b79461df Fix embeded relationships in Mastodon API
5 years ago
lambda 497d34b825 Merge branch 'iss-849' into 'develop'
5 years ago
AkiraFukushima 533d8cd581 Parse access_token from body parameters and URL parameters
5 years ago
Mark Felder 3c4cab9be1 Merge branch 'develop' into update-oauth-template
5 years ago
Mark Felder 9a98f48ec3 Remove incorrect statement about valid characters
5 years ago
Roman Chvanikov 8af55728e4 Fix tests
5 years ago
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator
5 years ago
rinpatch 51e26f14f7 Remove redundant ensure_scrubbed_html
5 years ago
lambda 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop'
5 years ago
Egor Kislitsyn a3dc02d282 Add addressable lists
5 years ago
Alex S f11e7037c2 test fixes
5 years ago
Alex S bdfa3a6fa8 Merging with develop
5 years ago
Sachin Joshi 85fa2fbce4 add scrubber for html special char
5 years ago
Sachin Joshi cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
rinpatch ce4825c1dc Do not normalize objects in stream_out unless the activity type is
5 years ago
Roman Chvanikov 0f0cc2703b Merge develop
5 years ago
lain b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch 0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
5 years ago
kaniini 292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop'
5 years ago
rinpatch 61ca2f7a4e Fix `rights` in TwitterAPI's user entity being present only for
5 years ago
rinpatch ce3789e39a Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the
5 years ago
kaniini 002ea343f8 Merge branch 'feature/bbcode' into 'develop'
5 years ago
William Pitcock 501af917b5 add support for bbcode
5 years ago
lambda 4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
5 years ago
kaniini 48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop'
5 years ago
Mark Felder 24c3e2db2c Add mediaproxy whitelist capability
5 years ago
rinpatch dfc8425659 Move settings to Source subentity
5 years ago
Alex S a825056d4d test fixes
5 years ago
Alex S 85953c0836 fixes for tests
5 years ago
Alex S 229ce6abbc migration without using old field name
5 years ago
Alex S 3c2ae80008 unused
5 years ago
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account
5 years ago
Alex S 1258128f4f favourites add bookmark display
5 years ago
Alex S 324c9c8ab5 migrate user.bookmarks to separate table
5 years ago
Alex S 73d01857e3 bookmarks in separate table
5 years ago
William Pitcock 0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
rinpatch 4baea6e6d9 Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
5 years ago
Sachin Joshi 963d5774af fix the status notification with special char
5 years ago
kaniini 030a7876b4 Merge branch 'security/fix-html-class-scrubbing' into 'develop'
5 years ago
William Pitcock f5535e5743 html: lock down allowed class attributes to only those related to microformats
5 years ago
Sergey Suprunenko 9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
5 years ago
kaniini 10c40e13d2 Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
5 years ago
kaniini aa9d378985 Merge branch 'fix/normalize-activities' into 'develop'
5 years ago
Alex S d35246c449 added healthcheck setting to instance config
5 years ago
rinpatch f60d072bbb Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
rinpatch d21d921def Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
Egor b9cdf6d3b9 Use `User.get_cached*` everywhere
5 years ago
Alexander Strizhakov 88f0be9693 Feature/826 healthcheck endpoint
5 years ago
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
kaniini 7fcbda702e Merge branch 'rework-emoji-management' into 'develop'
5 years ago
Ekaterina Vaartis 3cefdc62e0 Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
5 years ago
Ekaterina Vaartis ba19ba8a88 Formatting
5 years ago
Roman Chvanikov 4908e0eeee Fix Credo warning
5 years ago
Roman Chvanikov eeb093631c Fix Credo warning
5 years ago
Roman Chvanikov e56afefef9 Refactor conversation function in MastodonAPIController to use a View
5 years ago
Roman Chvanikov 2662bea4e0 Add accounts and last_status to conversation read response
5 years ago
Roman Chvanikov f1d90ee942 Remove debug code
5 years ago
Roman Chvanikov 2359ee38b3 Set digest emails to false by default
5 years ago
Ivan Tashkinov 9256d2d4b4 [#923] Refactored OAuthController#authorize definitions, added test.
5 years ago
eugenijm 375fd21055 Set correct values in the MastoAPI reblog status view
5 years ago
Roman Chvanikov 24073f829f Refactor query to return only 1 message instead of 20
6 years ago
Roman Chvanikov 724311e151 Fix Credo warnings
6 years ago
Roman Chvanikov 60f213bb1a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov 64a2c6a041 Digest emails
6 years ago
Ekaterina Vaartis 8f93d4c423 Remove most finmoji mentions where appropriate
6 years ago
Ekaterina Vaartis 53a3e61016 Fix priv/static/instance/static to be just instance/static
6 years ago
Ekaterina Vaartis 52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
Ekaterina Vaartis aaaa428512 mix format
6 years ago
Ekaterina Vaartis a141f0807b Assume packs without emoji.txt only have emoji pictures, unhardcode
6 years ago
Ekaterina Vaartis 1e44b5478d Remove useless comment
6 years ago
Ekaterina Vaartis c26724cc55 Remove finmoji and add a way to download emojis in packs
6 years ago
eugenijm fa48532387 Handle `reblogs` on the first follow request in MastoAPI
6 years ago
kaniini 9da8b287f8 Merge branch 'feature/database-compaction' into 'develop'
6 years ago
Roman Chvanikov 73407f4eea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov bc7862106d Fix tests
6 years ago
Roman Chvanikov 8add119444 Add User.list_inactive_users_query/1
6 years ago
Roman Chvanikov aeafa0b2ef Add Notification.for_user_since/2
6 years ago
Alexander Strizhakov ada384207b typo fix
6 years ago
lambda 218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
6 years ago
rinpatch f9865cf943 Stream out deletes, mistakingly removed when resolving merge conflicts
6 years ago
rinpatch 9238dccac1 Add a guard to fetching reply activity
6 years ago
Haelwenn eba3db0966 Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
6 years ago
Mark Felder 1aa4994f6d Do not require authentication for user search in MastoAPI
6 years ago
rinpatch 83589ca6a5 Merge branch 'develop' into feature/database-compaction
6 years ago
rinpatch ac04311b3f Fix search in TwitterAPI
6 years ago
rinpatch 6069d0fd36 Fix object search depending on embeded object
6 years ago
rinpatch e31a22043b Fix media timeline depending on embeded object and add some guards
6 years ago
rinpatch 2abc09570f Use the preloaded object in tag queries
6 years ago
William Pitcock 36f78c6dcd activitypub: fix filtering of boosts from blocked users
6 years ago
William Pitcock 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users
6 years ago
rinpatch 35ac672b8d Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
rinpatch 4c289e924e Fix delete-by_ap_id to expect not only embeded objects
6 years ago
rinpatch 8e4d950f31 Remove updating reply count for embeded objects
6 years ago
rinpatch c3a2052806 If it's an object struct it is already normalized
6 years ago
rinpatch a53b917e7f oof
6 years ago
rinpatch ad681877df Make credo happy
6 years ago
rinpatch e641651e2b Fix unbookmarking
6 years ago
rinpatch e7c3c36766 Update functions in object fetcher for tesla and set up a proper mock for tests
6 years ago
rinpatch b09ae02c04 Added some more normalization calls all in mastodon api controller
6 years ago
Roman Chvanikov 2f0203a4a1 Resolve conflicts
6 years ago
Roman Chvanikov 87013f8438 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
rinpatch 462028688b Fix pinned posts relying on embded objects
6 years ago
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction
6 years ago
Ivan Tashkinov 128aae05f3 [#923] Minor semantic adjustment.
6 years ago
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop'
6 years ago
kaniini 02a53d00c9 Merge branch 'fix/remote-follow-auth' into 'develop'
6 years ago
Haelwenn cde7711b12 Merge branch 'bugfix/relax-spam-protection' into 'develop'
6 years ago
Normandy d4a749cfb2 Handle new-style mastodon follow lists
6 years ago
William Pitcock 750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
Hakurei Reimu 6e26ac10a3 make Pleroma.Endpoint use extra_cookie_attrs in config
6 years ago
lain 76999c73a7 Conversation: Add accounts to output.
6 years ago
lain 0da985182f Conversation: Return full status object, id is a string.
6 years ago
lain c1ebb38d3a Conversation: Also create participations for remote users.
6 years ago
lambda 56956de6fa Merge branch 'fix/status-reblogged' into 'develop'
6 years ago
lambda f358295cbe Merge branch 'unfollow-oneself' into 'develop'
6 years ago
eugenijm 27d78dc526 Use User.get_cached_by*
6 years ago
rinpatch 5d73dca064 Remove inReplyToStatusId
6 years ago
eugenijm 507e7821e3 Handle follow/unfollow directed to themselves
6 years ago
Roman Chvanikov dc21181f65 Update updated_at field on notification read
6 years ago
Sadposter e513504e88 Revert "Assert on the success of enqueue before returning"
6 years ago
Sadposter 16d8c8b33b Assert on the success of enqueue before returning
6 years ago
Sadposter 5e45557751 Always return {atom, _} from try_send_confirmation
6 years ago
Sadposter ec42b639a3 fix pattern match on user registration
6 years ago
eugenijm 679a8ef629 Assign reblogged in the Mastodon reblog status view
6 years ago
Roman Chvanikov 0cd4b6024d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov 371a4aed2c Add User.Info.email_notifications
6 years ago
Alex S c349573791 Merge develop to 788-separate-email-addresses
6 years ago
Alex S a64eb2b389 fallback to the old behaviour
6 years ago
Egor f9af90c5aa Revert "simplify mentions escape"
6 years ago
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop'
6 years ago
Egor Kislitsyn dd097a406b add tests
6 years ago
lambda 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
6 years ago
lambda 57d5ff57d6 Merge branch 'fix/732-password-align' into 'develop'
6 years ago
Alexander Strizhakov 711ade961e adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov e03d24af96 in_reply_to_id - null
6 years ago
kaniini 31c06dba5a Merge branch 'fix/hackney_max_body_param' into 'develop'
6 years ago
Roman Chvanikov 4615e56219 Add `with_body: true` to requests relying on `max_body: val`
6 years ago
Mark Felder d6d5f46bae Update OAuth web template
6 years ago
Egor Kislitsyn 46bd5c1d87 fix format
6 years ago
Egor Kislitsyn db4badc6aa move user disable into deactivation
6 years ago
Egor Kislitsyn 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Ivan Tashkinov c3f12cf3c3 [#923] OAuth consumer params handling refactoring.
6 years ago
lain d115d2a27e Conversations: Tidying up.
6 years ago
lain c352a0aba6 Conversations: Make tests run.
6 years ago
lain 280172f6f6 Conversations: Create or bump on inserting a dm.
6 years ago
Alex S fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
Alex S fe13a1d78c adding notify_email setting for trigger emails
6 years ago
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
6 years ago
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lambda c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
6 years ago
Haelwenn (lanodan) Monnier cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
6 years ago
Haelwenn (lanodan) Monnier 1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
kaniini 0ab563d334 Merge branch 'hotfix/fix_undefined_summary' into 'develop'
6 years ago
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
6 years ago
rinpatch b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
rinpatch 144648de92 Merge branch 'mastoapi/plaintext-statuses' into 'develop'
6 years ago
lambda 0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop'
6 years ago
Sachin Joshi 07afb9b537 update the follower count when a follower is blocked
6 years ago
Sadposter 589629cf3e
Used cached user resources in subscriptions
6 years ago
Alex S fee50636d0 removing not needed invite update
6 years ago
Alex S d0696fdfd6 fix for elixir 1.7.4
6 years ago
lain a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Sadposter 87a01f9ee0
Use Pleroma.Config instead of Application.get_env
6 years ago
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Sadposter 13ff312c48
Sever subscription in case of block
6 years ago
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
6 years ago
lambda fd45cab9ec Merge branch 'twitter_oauth' into 'develop'
6 years ago
Alexander Strizhakov 36c0a10fdf adding language tag
6 years ago
lambda 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop'
6 years ago
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Egor Kislitsyn a1a854646e Merge branch 'develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
6 years ago
lambda b177e1e7f3 Merge branch 'scheduled-activities' into 'develop'
6 years ago
Alex S 012bb5dcc9 renaming expire_at -> expires_at
6 years ago
Sadposter 76fdfd1c7f Add check on activity visibility in sub notification
6 years ago
Alex S 56c75aec12 credo fix
6 years ago
Alex S b810aac117 added docs to docs/api/admin_api.md
6 years ago
Ivan Tashkinov e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
feld fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop'
6 years ago
eugenijm 2056efa714 Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities.
6 years ago
eugenijm b3870df51f Handle `scheduled_at` on status creation.
6 years ago
eugenijm 7bf622ce73 Add scheduled activities
6 years ago
eugenijm 7aa53d52bd Return 403 on oauth token exchange for a deactivated user
6 years ago
Alex S ce8d457132 little channges
6 years ago
Sadposter c05fe4da0a
Document subscription endpoints, fix typos
6 years ago
feld 9aeac7dcca Merge branch 'feature/prometheus' into 'develop'
6 years ago
Alex S a53d591ac5 code style
6 years ago
Alex S 7410aee886 Merge develop to 770-add-emoji-tags
6 years ago
Alex S dcc54f8cfa admin api endpoints for invites
6 years ago
Alex S 47b07cec49 token -> invite renaming
6 years ago
Alex S be54e40890 twitter api registration
6 years ago
Alex S 0484f3a8b1 generating tokens with mix
6 years ago
Sergey Suprunenko 325a268017 Redirect to the referer url after mastofe authorization
6 years ago
Mark Felder b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
Roger Braun 7895ee37fa Add user following / unfollowing to the admin api.
6 years ago
Sadposter 9ca91cbb87 Change relationship direction of subscriptions
6 years ago
Sadposter d35f6551c1 Move subscriptions endpoint to be under /pleroma
6 years ago
Sadposter d56866c824 Add subscribed status to user view
6 years ago
Sadposter 316fe20d86 Make subscriptions the same direction as blocks
6 years ago
Sadposter 23c4f49494 Fix subscription endpoint return formats
6 years ago
Sadposter 007762e767 Add notification checks
6 years ago
Sadposter 79910ce5cc Add API endpoints and user column for subscription
6 years ago
Egor Kislitsyn 1c2e4f88d1 fix credo
6 years ago
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
rinpatch f0f30019e1 Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
Ivan Tashkinov 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov 3e7f2bfc2f [#923] OAuthController#callback adjustments (with tests).
6 years ago
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements.
6 years ago
Mark Felder 69038887b2 Code readability tweak
6 years ago
Egor Kislitsyn 0b5c818cb7 [#1] fix telemetry
6 years ago
href bc3618a38d Set up telemetry and prometheus
6 years ago
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Haelwenn (lanodan) Monnier af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
rinpatch 79cb34a4b0 Fix preview not being usable in form data
6 years ago
Haelwenn 0cb94cfa94 Merge branch 'fix-slow-relationships' into 'develop'
6 years ago
lambda 256b492a58 Merge branch 'bugfix/wrong-date-format' into 'develop'
6 years ago
lambda a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop'
6 years ago
lain 39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
6 years ago
lain fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching.
6 years ago
Alex S fa8483cb80 Merging develop into feature/770-add-emoji-tags
6 years ago
Alex S d140738edf second level of headertext change in doc
6 years ago
lambda 180b87257c Merge branch 'bugfix/share-mastodon' into 'develop'
6 years ago
lambda ce9284b36f Merge branch 'remove-user-activities' into 'develop'
6 years ago
lambda b95cf3d490 Merge branch 'get_by_id' into 'develop'
6 years ago
Alex S 9e0567ec52 Merge develop into feature/770-add-emoji-tags
6 years ago
rinpatch fdb4357e9b Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
Ivan Tashkinov 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lambda 091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
6 years ago
lambda 26d509cc86 Merge branch 'get_by_id' into 'develop'
6 years ago
cascode 95c92c49c9 Fix account lookup for nicknames beginning with numbers
6 years ago
Ivan Tashkinov 590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Egor Kislitsyn 88d3cb44c3 replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
6 years ago
Egor Kislitsyn 1b3d921921 change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
Egor Kislitsyn 4212527928 change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
6 years ago
Sergey Suprunenko 3db9235150
Ignore dates in wrong formats
6 years ago
Egor Kislitsyn a14742f495 add `user delete_activities` mix task
6 years ago
Alex S 08d64b977f little changes and typos
6 years ago
Alex S 9b2188da7c refactoring of emoji tags config to use groups
6 years ago
Egor Kislitsyn a1869f5272 Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
6 years ago
Sachin Joshi f20e8d28de add support for all status type (ostatus) and replase case with if
6 years ago
Ivan Tashkinov aac48d0cc6 Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Sachin Joshi 6386c1c9c1 fetch url for OStatus to know if it is a/c or status
6 years ago
Haelwenn (lanodan) Monnier f56eef8d8c
router: Add fake identity proof endpoint
6 years ago
Sergey Suprunenko b6f9f7b8aa
Handle dates in the Unix timestamp format (Fixes #763)
6 years ago
Sachin Joshi 1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status
6 years ago
Ivan Tashkinov 6910fb371b Fixed local MastoFE authentication / `force_login` option.
6 years ago
Ivan Tashkinov cbe09d94d1 Added `force_login` authentication option (previously applied by default).
6 years ago
Alex S 17d3d05a71 code style
6 years ago
Alex S 3601f03147 Adding tag to emoji ets table
6 years ago
rinpatch fe5145eeaa Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
6 years ago
rinpatch 975482f091 insert object defaults for fake activities and make credo happy
6 years ago
rinpatch d866b59eea oof
6 years ago
rinpatch 45ba10bf47 Fix the issue with HTML scrubber
6 years ago
Ivan Tashkinov 804173fc92 [#923] Minor code readability fix.
6 years ago
Ivan Tashkinov eadafc88b8 [#923] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lain 629ad1766c BBS: Some fixes.
6 years ago
lain e3bf6655ba Add replying.
6 years ago
lain 10fdc080a0 BBS: Tests and formatting.
6 years ago
lain 17ab9fa45b BBS: Some more functionality.
6 years ago
lain c810fb81a4 Basic SSH daemon.
6 years ago
rinpatch cd387f8693 Add a fake option to lazy_put_actvity_defaults
6 years ago
rinpatch 1bb4d5d65b Implement fake status submit
6 years ago
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Haelwenn (lanodan) Monnier c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
Haelwenn (lanodan) Monnier 6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
Haelwenn (lanodan) Monnier e83ad12c57
pagination.ex: Drop atom keys in params
6 years ago
Haelwenn (lanodan) Monnier 6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
eugenijm cd90695a34 Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm 55d086b520 Notification controls
6 years ago
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API
6 years ago
Alex S 3ca6c4f443 password reset page labels align
6 years ago
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov 2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring.
6 years ago
lambda 926bf114b7 Merge branch 'feature/more-user-filters' into 'develop'
6 years ago
rinpatch ce6d64bbd8 Fix missing announces in MastoAPI home timeline
6 years ago
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module
6 years ago
eugenijm a4ab60ac54 Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm 691d1208b5 Add GET /api/v1/apps/verify_credentials
6 years ago
lambda ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop'
6 years ago
lambda c6ab5ebe7c Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
6 years ago
lain 10a7a4a868 AP UserView: Refactor banner / avatar display code, add test.
6 years ago
lambda 9e3899bf36 Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
6 years ago
lambda 21ff78cd40 Merge branch 'replies-count' into 'develop'
6 years ago
rinpatch 406d19331f Remove ActivityRepresenter
6 years ago
Ivan Tashkinov eef1042b16 Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
eugenijm 568e348588 Increment replies_count on replies (MastoAPI)
6 years ago
Ivan Tashkinov b0759f821b Comments split.
6 years ago
Ivan Tashkinov 263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
Mark Felder c410296120 Try sending an empty map
6 years ago
Mark Felder 6f090f981b Attempt to fix incorrect federation of default instance avatars
6 years ago
rinpatch b028b0f97d Merge branch 'bugfix/missing-announces' into 'develop'
6 years ago
William Pitcock 26b0c802c3 fix up missing announcements with preloads
6 years ago
kaniini bc14c98de1 Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
6 years ago
kaniini 63ffa4842c Merge branch 'fix/mastoapi-liked' into 'develop'
6 years ago
rinpatch a7f58b3c13 Serve non-public activities in /api/v1/favourites
6 years ago
Austin Lanari 6c96d68f77 add overriding truncated_namespace condition for truncating paths for digital ocean
6 years ago
rinpatch 750de7d842 Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
William Pitcock 4aa699271c activity: use left join instead of inner join when fetching activities that may or may not have a child object
6 years ago
William Pitcock 332dc1371b user: use preloads when deleting accounts
6 years ago
William Pitcock debf7f016d ostatus: use preload objects with Object.normalize() when opportunistic
6 years ago
William Pitcock 3c2350cbee object: downgrade normalize warning to debug severity
6 years ago
William Pitcock 8c70156157 activitypub: object view: use preloaded object when possible
6 years ago
William Pitcock f9d5c13b21 activity: add get_by_ap_id_with_object()
6 years ago
William Pitcock ce47eb8b29 activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
William Pitcock aabcecb269 notification: formatting
6 years ago
William Pitcock 07cdd9ed02 streamer: use the preloaded object if possible
6 years ago
William Pitcock c62220c500 rich media: helpers: only crawl Create activities
6 years ago
William Pitcock 9a06d9f6e8 notification: preload child objects
6 years ago
William Pitcock 4cedf45423 relay: use preloaded object since we always have it
6 years ago
William Pitcock e430a71d37 ostatus: fetch preloaded object in note handler for testsuite
6 years ago
William Pitcock 73efe95368 activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
William Pitcock ba7299fc87 activitypub: add missing with_preloaded_object()
6 years ago
William Pitcock e4307cadc8 activitypub: splice in the child object if we have one
6 years ago
William Pitcock a6973a668e formatting
6 years ago
William Pitcock 59518cbcd8 activity: fix credo nitpick
6 years ago
William Pitcock b3bf523c09 rich media: use optimized Object.normalize()
6 years ago
William Pitcock e75e43b949 common api: use the optimized Object.normalize whenever possible
6 years ago