Commit Graph

2110 Commits (4a5b0965a0d07d45bfc4687c80c752ec824457cc)

Author SHA1 Message Date
rinpatch bbff7554de Add tests for get_existing_votes
5 years ago
Egor Kislitsyn 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941
5 years ago
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
5 years ago
Sergey Suprunenko 84cc131b59 Add missing HTTP Request mocks
5 years ago
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop'
5 years ago
Roman Chvanikov f6036ce3b9 Fix tests
5 years ago
Roman Chvanikov bd325132ca Fix tests
5 years ago
Roman Chvanikov 3e17610587 Add task to test emails
5 years ago
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov 64ada7f960 fix tests
5 years ago
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment
5 years ago
lain 804b6a4d8f CommonAPI.Utils: Add tests.
5 years ago
lain 80d4d83aac CommonAPI: Add explicit addressing.
5 years ago
lain 2b664b048e User: Add function to get AP ids from nicknames.
5 years ago
Maksim Pechnikov 080e1aa70e add option skip_thread_containment
5 years ago
rinpatch dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda 314758c25b Merge branch 'align-mastodon-conversations' into 'develop'
5 years ago
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch 2fe3a20638 Make error message about author's inability to vote more sensible
5 years ago
rinpatch c47da0e65d Add tests for poll view
5 years ago
William Pitcock 38a275b31f test: add tests for subchain policy
5 years ago
kaniini 5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop'
5 years ago
rinpatch cfa588e357 Fix Credo issues
5 years ago
rinpatch 65db5e9f52 Resolve merge conflicts
5 years ago
rinpatch 300d94c628 Add poll votes
5 years ago
kaniini e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
5 years ago
Sergey Suprunenko 2bbc2a801f Remove all follower collections but actor's from "cc"
5 years ago
kaniini d46cc7896e Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
5 years ago
William Pitcock f2efe24cf8 visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
5 years ago
Sachin Joshi d4304a3945 add the missing mock file
5 years ago
Haelwenn (lanodan) Monnier 5d3ece2861
Remove now useless flavours switching
5 years ago
lambda 2993361075 Merge branch 'hotfix/leaking-lists' into 'develop'
5 years ago
lain 7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store.
5 years ago
lain aaad85c4d9 AccountView: settings -> settings_store
5 years ago
lain eb2963bc43 User: Add settings store to Info, AccountView
5 years ago
rinpatch d9c0650ff9 Mastodon API: Fix lists leaking private posts
5 years ago
rinpatch a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it
5 years ago
lain 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings
5 years ago
lambda 91ac8b075b Merge branch 'use-pleroma-config' into 'develop'
5 years ago
Egor Kislitsyn 99f70c7e20 Use Pleroma.Config everywhere
5 years ago
Roman Chvanikov ce47017c89 Merge develop
5 years ago
Maksim db94294dfb [#936] fix tests
5 years ago
Sachin Joshi 1452a96ad6 ability to set and reset avatar, profile banner and backgroud in Mastodon API
5 years ago
lambda 5bb843ceec Merge branch 'refactor/die-httpoison-die' into 'develop'
5 years ago
William Pitcock 79503ce90f mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
William Pitcock 45e4642a58 tests: chase remote/local removal
5 years ago
William Pitcock 59a703fcbe twitter api: user view: expose user notification settings under pleroma object
5 years ago
William Pitcock 0f7eeb0943 tests: add tests for non-follows/non-followers settings
5 years ago
William Pitcock 1542cccbbc tests: chase notification setting changes
5 years ago
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants
5 years ago
William Pitcock 80d55d428f tests: websub: check only that signature validation succeeds or fails
5 years ago
Aaron Tinio 9415932af5 Keep nodeinfo available when not federating
5 years ago
Sergey Suprunenko bbea5691da Mention all people in the beginning of DM
5 years ago
feld f916e4cdd9 Move the Cache Control header test to its own file
5 years ago
Egor Kislitsyn a7affbdd6d Fix tests
5 years ago
Egor Kislitsyn f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Sachin Joshi 0c53d91f3b fix merge conflict
5 years ago
William Pitcock 8086c7aed6 tests: add tests for banner and avatar removal
5 years ago
rinpatch 19c90d47c4 Normalize poll votes to Answer objects
5 years ago
Maksim 620908a2db [#699] add worker to clean expired oauth tokens
5 years ago
lambda 714d8d4ef9 Merge branch 'feature/object-pruning' into 'develop'
5 years ago
lambda ff363f70b5 Merge branch 'refactor/keys' into 'develop'
5 years ago
rinpatch cdac5efd10 Merge branch 'bugfix/account_view_source.note' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
5 years ago
Sachin Joshi 17bfd000d7 Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini 79c2cef2fb Merge branch 'mongooseim-support' into 'develop'
5 years ago
kaniini ab6e15622b Merge branch 'fix/api-fallback' into 'develop'
5 years ago
Sergey Suprunenko 9134848170 Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
5 years ago
William Pitcock 045803346d move key generation functions into Pleroma.Keys module
5 years ago
Aaron Tinio f76268135c Fix failing test
5 years ago
Aaron Tinio 3ab9255eda Respond with a 404 Not implemented JSON error message
5 years ago
Aaron Tinio a13d449b24 Add tests for fallback routes
5 years ago
William Pitcock 73df9d690d object: fetcher: add support for reinjecting pruned objects
5 years ago
rinpatch 63b0b7190c MastoAPI: Add GET /api/v1/polls/:id
5 years ago
rinpatch 0407ffe75f Change validation error status codes to be more appropriate
5 years ago
rinpatch aafe30d94e Handle poll votes
5 years ago
rinpatch 3f96b3e4b8 Enforce poll limits and add error handling for MastodonAPI's post endpoint
5 years ago
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini d4847b17ca Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
5 years ago
Aaron Tinio eb02edcad9 Add virtual :thread_muted? field
5 years ago
Sadposter dc916ba15f
Format mascot tests
5 years ago
Sadposter e81f0fc6d4
Add mascot get/set tests
5 years ago
Aaron Tinio 2375e9a95b Add report filtering to MRF.SimplePolicy
5 years ago
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects
5 years ago
rinpatch fd920c8973 Mastodon API: Add support for posting polls
5 years ago
William Pitcock dc08159538 also suppress link previews from posts marked #nsfw
5 years ago
William Pitcock 0da1233e8e rich media: suppress link previews if post is marked as sensitive
5 years ago
lain f959bf7aa6 MongooseIM: Add basic integration endpoints.
5 years ago
Egor Kislitsyn 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn f2936e0a07 Add `ap_id` to List
5 years ago
lain 249b31ffe5 Fix specs.
5 years ago
Alexander Strizhakov 7ed682213f Fix/902 random compile failing
5 years ago
Aaron Tinio 443cd68a4c Add tests for MRF.SimplePolicy
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 4711d8151c try this
5 years ago
Alex S aa11fa4864 add report uri and report to
5 years ago
Aaron Tinio 2b6119dfbf Restrict reblogs of activities from blocked domains
5 years ago
Aaron Tinio 64495b96e9 Add test for blocked domains
5 years ago
rinpatch 62e42b03ab Handle incoming Question objects
5 years ago
William Pitcock f09c3afdf5 chase test failures
5 years ago
William Pitcock c7644313e7 test: update obsolete test
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
William Pitcock 4429c1b7da tests: fixup
5 years ago
lain cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies.
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
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 d474995efa Add Tests
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
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
rinpatch 15cda998f3 Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
5 years ago
William Pitcock 582bd9d170 tests: fix AP test failures
5 years ago
William Pitcock d823eb921b tests: fix salmon tests
5 years ago
William Pitcock 2b847d4add tests: chase federator publish_single_foo removals
5 years ago
kaniini 131f883207 Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
5 years ago
Sachin Joshi f01f995816 make url uniform in admin api
5 years ago
Roman Chvanikov f1f7a11222 Merge develop
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 a4598b5e8b Visibility: Make it more resilient.
5 years ago
lain fcf2f38d20 Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov bfeb33e951 Merge develop
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
rinpatch 4c5125dedc Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
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
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
lain eb0fb73ddb BBS: Credo fixes.
5 years ago
lain c58fd4c038 BBS: Fix tests.
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
Haelwenn (lanodan) Monnier b5ad1715b2
MastoAPI: profile update with emoji_map
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 81d1aa424d Streamer: Stream out Conversations/Participations.
5 years ago
lambda 497d34b825 Merge branch 'iss-849' into 'develop'
5 years ago
AkiraFukushima a53a6c9d64 Add oauth plug tests for url and body parameters
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
lambda 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop'
5 years ago
Alex S f11e7037c2 test fixes
5 years ago
Sachin Joshi cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char
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 ef52aa0e66 tests: fix up for changed bbcode library output and verify html is properly escaped
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 85953c0836 fixes for tests
5 years ago
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account
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
rinpatch f60d072bbb Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
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
Roman Chvanikov 2662bea4e0 Add accounts and last_status to conversation read response
5 years ago
Ivan Tashkinov 9256d2d4b4 [#923] Refactored OAuthController#authorize definitions, added test.
6 years ago
eugenijm 375fd21055 Set correct values in the MastoAPI reblog status view
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
Ekaterina Vaartis aef3a3ca46 Fix tests that used finmoji
6 years ago
Ekaterina Vaartis 52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl
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 4ef237f26a Fix my incorrect search test fix
6 years ago
rinpatch 83589ca6a5 Merge branch 'develop' into feature/database-compaction
6 years ago
rinpatch 6069d0fd36 Fix object search depending on embeded object
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 d1eb578a57 Refactor tests that used ActivityPub.fetch_object_from_id
6 years ago
rinpatch 8e4d950f31 Remove updating reply count for embeded objects
6 years ago
rinpatch ff8d76c670 Refactor all tests that acessed the embeded object
6 years ago
rinpatch 54b82f236b Fix note count test
6 years ago
rinpatch ad681877df Make credo happy
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 dda4e0e2a8 Fix warnings in object tests
6 years ago
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction
6 years ago
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' 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
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 fd2e31af86 oops
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
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 c5d0fffeaf naming fix
6 years ago
Alex S c349573791 Merge develop to 788-separate-email-addresses
6 years ago
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop'
6 years ago
Egor Kislitsyn d0304b4f92 more tests
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
Alexander Strizhakov 711ade961e adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov e03d24af96 in_reply_to_id - null
6 years ago
lain 6f880b1627 Conversation: Fix tests.
6 years ago
lain 36ec8d9694 ActivityPub: Fix specs.
6 years ago
Ivan Tashkinov c3f12cf3c3 [#923] OAuth consumer params handling refactoring.
6 years ago
lain c352a0aba6 Conversations: Make tests run.
6 years ago
lain cf353514fe Participations: Add last activity.
6 years ago
lain 20d9b90760 Participation: Get for a user.
6 years ago
lain 280172f6f6 Conversations: Create or bump on inserting a dm.
6 years ago
lain 64c1c3a407 Participations: Add marking as read and unread.
6 years ago
lain d1da6b155a Conversation: Add Conversations and Participations.
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
lain b5cecebbc1 Conversations: Fix specs.
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
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
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
Alex S fee50636d0 removing not needed invite update
6 years ago
lain a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
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
Alex S f0ca0696c8 test for valid_invite?
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
Ivan Tashkinov 44829d9181 AdminApiControllerTest unused variables fix.
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 b810aac117 added docs to docs/api/admin_api.md
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
feld 876965a7e7 Merge branch 'fix/failed-legacy-test' into 'develop'
6 years ago
Alex S ce8d457132 little channges
6 years ago
Alex S 76d8928cf1 fix for field name
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
Sergey Suprunenko e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
6 years ago
Mark Felder fac76bfa35 We actually want the user id not nickname in the test...
6 years ago
Mark Felder c746087f57 Also remove Repo functions in the tests
6 years ago
Roger Braun 7895ee37fa Add user following / unfollowing to the admin api.
6 years ago
Sadposter a270e7a191
Mix format everything
6 years ago
Sadposter f6e131eeb9 Don't use twitterAPI for subscription tests
6 years ago
Sadposter 9ca91cbb87 Change relationship direction of subscriptions
6 years ago
Sadposter 73afd13c21 Add subscription key to one test I forgot about
6 years ago
Sadposter 06cd547fc6 Format subscriptions related stuff
6 years ago
Sadposter d56866c824 Add subscribed status to user view
6 years ago
Sadposter 75c4ceb4a2 Add tests for subscriptions
6 years ago
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push
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
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2
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
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
Egor Kislitsyn 20c619f85f replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
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
Egor Kislitsyn 9a59c26619 replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
6 years ago
Ivan Tashkinov 15ce710460 Added "GET /oauth/authorize" tests.
6 years ago
Egor Kislitsyn 11c2d6bdc4 change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
6 years ago
Egor Kislitsyn 1b3d921921 change `Repo.get(User, id)` => `User.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 484162c187 test fix
6 years ago
Alex S 9b2188da7c refactoring of emoji tags config to use groups
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