Commit Graph

2454 Commits (3420dec494203b46d37ddc17f7e1235dc908a5b3)

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
Haelwenn (lanodan) Monnier 6c0d869d9d
Bump copyright years of files changed after 2019-01-01
5 years ago
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
rinpatch 19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop'
5 years ago
Alexander Strizhakov 814b275af7
Merge branch 'develop' into gun
5 years ago
feld f2216287a7 Merge branch 'admin-status-list' into 'develop'
5 years ago
Ivan Tashkinov 6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
Egor Kislitsyn cb60a9c42f
Do not fail when user has no email
5 years ago
eugenijm 4ab07cf0d5 Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
eugenijm e2a6a40367 Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
5 years ago
Egor Kislitsyn f446744a6a
Allow account registration without an email
5 years ago
Egor Kislitsyn c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions
5 years ago
eugenijm 7ad5c51f23 Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Ivan Tashkinov 0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
Ivan Tashkinov 8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Alexander Strizhakov 13918cb545
Merge branch 'develop' into gun
5 years ago
Haelwenn c5570e0493 Merge branch 'single_emoji_reaction' into 'develop'
5 years ago
lain c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
5 years ago
Ivan Tashkinov 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain cf4ecffcea Merge branch 'tests-clear-config-tweaks' into 'develop'
5 years ago
lain 314928333a Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
Mark Felder cf94349287 Merge branch 'develop' into gun
5 years ago
lain cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop'
5 years ago
Ivan Tashkinov 226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
5 years ago
Ivan Tashkinov 61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain c07efd5b42 Merge branch 'need-reboot-flag' into 'develop'
5 years ago
Egor Kislitsyn ca7ac068f0
Add a test
5 years ago
Alexander Strizhakov 514c899275
adding gun adapter
5 years ago
rinpatch 472132215e Use floki's new APIs for parsing fragments
5 years ago
Ivan Tashkinov 269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
Haelwenn (lanodan) Monnier 1257331291
MastodonAPI.StatusView: Do not use site_name
5 years ago
Ivan Tashkinov 4f8c3462a8 Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
feld b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
5 years ago
Egor Kislitsyn 19516af74e
Fix `status.expires_in` validation
5 years ago
Mark Felder ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links"
5 years ago
Egor Kislitsyn 58b2017aa0
Restore TwitterAPI tests
5 years ago
feld 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
5 years ago
rinpatch ea1631d7e6 Make Floki use fast_html
5 years ago
lain 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383
5 years ago
Ivan Tashkinov b95dd5e217 [#1505] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.
5 years ago
Ivan Tashkinov 24e49d14f2 [#1505] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
Ivan Tashkinov 7c3991f59e [#1505] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
Ivan Tashkinov 4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Ivan Tashkinov d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
Alexander Strizhakov dad23e3766
need_reboot flag
5 years ago
Haelwenn 1262357ddb Merge branch 'cancel-follow-request' into 'develop'
5 years ago
Lain Soykaf d85bcc8627 Questions: Add timezone to `closed` property
5 years ago
Lain Soykaf 4538a1ee01 EmojiReactions: Remove old API endpoints
5 years ago
Lain Soykaf f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
Egor Kislitsyn bc2e98b200
Add User.get_follow_state/2
5 years ago
Lain Soykaf 8a79f20c21 EmojiReactions: Rename to EmojiReacts
5 years ago
feld df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop'
5 years ago
Egor Kislitsyn 8b9742ecf5 Cancellation of a follow request for a remote user
5 years ago
Alexander Strizhakov c85aa6e87f
removing confusing error
5 years ago
rinpatch 15cb1f6804 Merge branch 'fix/unpinnable-polls' into 'develop'
5 years ago
Alexander Strizhakov 5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
rinpatch 49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
5 years ago
Egor Kislitsyn 8c71f7e11a Add support for cancellation of a follow request
5 years ago
Ivan Tashkinov e84fee5b86 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Maksim Pechnikov 2c40c8b4a2 Merge branch 'develop' into issue/1383
5 years ago
rinpatch 50f5a92021 fix not being able to pin polls
5 years ago
rinpatch 983a87175e mastodon API: do not sanitize html in non-html fields
5 years ago
rinpatch c27d1d65bf Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
5 years ago
rinpatch 5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
lain a0d9d42eaa Emoji Reactions: Actually use the validation.
5 years ago
feld e2f2602fdc Merge branch 'emoji-api-errors' into 'develop'
5 years ago
rinpatch 263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop'
5 years ago
Haelwenn 946de2299c Merge branch 'fix-streaming-reblog' into 'develop'
5 years ago
Alexander Strizhakov e7fee0d6fa
emoji api error on not writable dir
5 years ago
lain 7a60cd91ff Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
5 years ago
lain e2e9299b8e Streamer Tests: code readability improvements
5 years ago
lain b3a877d6c9 Emoji Reactions: Correctly handle deleted users
5 years ago
lain a802e07241 Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Alexander Strizhakov 1f4fbe9d98
title parse improvement
5 years ago
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383
5 years ago
lain cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
lain 2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop'
5 years ago
Alexander Strizhakov 7bd4c14581
meta tag parser respect first title header
5 years ago
lain e816edbb2f Update streamer_test.exs
5 years ago
lain 77f24525ca Streamer: Correctly handle reblog mutes
5 years ago
Maksim Pechnikov 02c3dd2e3d update ecto
5 years ago
Maksim Pechnikov be926863a8 fix test
5 years ago
Maksim Pechnikov bcffa662dc Merge branch 'develop' into feature/tag_feed
5 years ago
Hakaba Hitoyo dabd535e43 Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov bfc70fdf29 Merge branch 'develop' into issue/1383
5 years ago
Mark Felder d770cffce0 Merge branch 'develop' into issue/1280
5 years ago
Alexander Strizhakov e93cc561cd
restarting pleroma from outside application
5 years ago
Ivan Tashkinov 86e4d23acb [#1505] Background fetching of incoming activities' `replies` collections.
5 years ago
Maksim Pechnikov 99c0a11c58 added atom feed
5 years ago
Maksim Pechnikov 055edd3d72 Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch 0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop'
5 years ago
lain 347f3ed2c6 Emoji reactions: Change api format once more
5 years ago
lain 34fc0ca053 Emoji reactions: Add sanity checks for the cache
5 years ago
Maksim Pechnikov 2cfe1b9385 Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 5fc2fa8908 Merge branch 'develop' into issue/1383
5 years ago
Haelwenn dddebee047 Merge branch 'emoji-notifications' into 'develop'
5 years ago
Mark Felder ae78059ff4 Merge branch 'develop' into features/remote-follow-userpage-redirect
5 years ago
lain 615b72238e Notifications: Add emoji reaction notifications
5 years ago
Ivan Tashkinov cf96c40057 [#1505] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
Maksim Pechnikov cf19bf3c7c Merge branch 'develop' into issue/1383
5 years ago
feld be27777156 Merge branch 'admin-be' into 'develop'
5 years ago
lain dd3fc50ea4 Emoji reactions: Change cache and reply format
5 years ago
Alexander Strizhakov d5f8a88a37
support for updating env after settings deletion
5 years ago
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 5ea8596448 Merge branch 'develop' into feature/tag_feed
5 years ago
Haelwenn (lanodan) Monnier 7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
5 years ago
rinpatch 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop'
5 years ago
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov dcae5914d1
fix for db key
5 years ago
Maksim Pechnikov 41e2332007 Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results
5 years ago
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
Ivan Tashkinov ca3b4de2c9 [#1521] AdminApiControllerTest: fixed create report test (OAuth).
5 years ago
rinpatch 00d08c9231 Merge branch 'favoritng-responses' into 'develop'
5 years ago
lain 4c5b5f14dc StatusView: Add `emoji_reactions`
5 years ago
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop'
5 years ago
lain 2199d63ddc StatusControllerTest: Fix typo
5 years ago
lain 42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
5 years ago
lain 510776ba31 CommonAPI: Don't error out on double favs/repeats
5 years ago
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop'
5 years ago
lain 5fddf988ea Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5
5 years ago
Alexander Strizhakov efb8ef5abe
releases support
5 years ago
Alexander Strizhakov e699861690
full update for some subkeys
5 years ago
Alexander Strizhakov 89e93fb33f
return db key on update requests
5 years ago
Alexander Strizhakov 7676ed8239
some clean up
5 years ago
Maksim Pechnikov 108a39c876 updated error messages for authentication process
5 years ago
Alexander Strizhakov 60ba2339a2
saving to DB only added by user settings
5 years ago
Alexander Strizhakov 29155137fd
renaming
5 years ago
Maksim Pechnikov a5db044e57 Merge branch 'develop' into feature/tag_feed
5 years ago
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed'
5 years ago
Alexander Strizhakov 59ba5c80b9
little cleanup
5 years ago
Egor Kislitsyn 023b7f605b
Fix notification controller test
5 years ago
Egor Kislitsyn 3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
Maksim Pechnikov c9f45edeac Merge branch 'develop' into feature/tag_feed
5 years ago
Alexander Strizhakov a9c7cd341b
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov 0d331f3d23
compilation warnings fix
5 years ago
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383
5 years ago
feld bb5862ea2f Merge branch 'issue/1354' into 'develop'
5 years ago
Mark Felder e64059d218 Assign token that can write to follows
5 years ago
Mark Felder 2f5b8fbeb3 Merge branch 'develop' into issue/1354
5 years ago
feld ea4a462858 Merge branch 'issue/1487' into 'develop'
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov d933fd3d61
more renamings
5 years ago
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
5 years ago