Commit Graph

3272 Commits (642a67dd4492f31b5b9fe457e34c1589c9d70c3f)

Author SHA1 Message Date
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
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
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
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
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
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
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