Commit Graph

2648 Commits (30590cf46b88d0008c9a7163b8339aa9376f2378)

Author SHA1 Message Date
feld f92c447bbc Merge branch 'relay-list-change' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 863ec33ba2
Add support for funkwhale Audio activity
5 years ago
Ivan Tashkinov 5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
Ivan Tashkinov 972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Mark Felder 5af798f246 Fix enforcement of character limits
5 years ago
Alexander Strizhakov 426f5ee48a
tesla adapter can't be changed in adminFE
5 years ago
Ivan Tashkinov 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov b2eb1124d1
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov 027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Ivan Tashkinov 40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
Alexander Strizhakov f0753eed0f
removing try block in tesla request
5 years ago
eugenijm ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode
5 years ago
lain f1750b4658 Admin API tests: Fix wrong test.
5 years ago
lain 4bce13fa2f MastodonController: Return 404 errors correctly.
5 years ago
lain 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop'
5 years ago
Alexander Strizhakov 22d52f5691
same copyright date format
5 years ago
Mark Felder 4427161ca3 Merge branch 'develop' into gun
5 years ago
Mark Felder 05da5f5cca Update Copyrights
5 years ago
Ivan Tashkinov b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
Alexander Strizhakov 509c81e4b1
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov bd8624d649 [#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest.
5 years ago
Ivan Tashkinov b4367125e9 [#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
5 years ago
Ivan Tashkinov 99a6c660a9 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Egor Kislitsyn 4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
Haelwenn 764a50f8a6 Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
5 years ago
Alexander Strizhakov cc98d010ed
relay list shows hosts without accepted follow
5 years ago
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
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 28701c08ad Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 6f9839c73c Merge branch 'develop' into issue/1276
5 years ago
feld b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
5 years ago
Maksim Pechnikov da44ee5b0f Merge branch 'develop' into issue/1276
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 58574ef156 Merge branch 'develop' into issue/1276
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
Maksim Pechnikov b87533760b Merge branch 'develop' into issue/1276
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 ba5e8a6444 Merge branch 'develop' into issue/1276
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 e442ea5722 Merge branch 'develop' into issue/1276
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
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
Alexander Strizhakov 88a16bb9fc
deep merge in config update
5 years ago
Alexander c841174de8
flag for delete fix
5 years ago
Alexander 0b02040327
little fixes and typos fix
5 years ago
Alexander 9c1f3bfeff
fixes for logger backends
5 years ago
Alexander 063ab6d911
logger backends fix
5 years ago
Alexander 583cee4607
parsing proxy url setting
5 years ago
Alexander fea734ca70
errors on endpoints
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alexander 0656816c77
tests for setttings without an explicit key
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Maksim Pechnikov fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov 933dc12043 added code of mr#2067
5 years ago
Maksim Pechnikov 385356aad0 fix oauth scopes for AdminApi#reports_update
5 years ago
Maksim Pechnikov 969769730e update tests
5 years ago
Maksim Pechnikov bdd71669da update test
5 years ago
Maksim Pechnikov 5b84156013 moved remote follow in separate controller
5 years ago
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
5 years ago
Mark Felder 06ae56a3ae Posts without media attachments should get the Summary TwitterCard
5 years ago
feld a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop'
5 years ago
Ivan Tashkinov ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn 34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Egor Kislitsyn 432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Maxim Filippov 404a9ccb9a Stats: return status counts by scope
5 years ago
Maksim Pechnikov b53573a837 add tag feeds
5 years ago
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
5 years ago
Egor Kislitsyn 6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Maxim Filippov 45180d4c60 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
Egor Kislitsyn 8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Maksim Pechnikov a879c396bb Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch eae65e3216 formatting
5 years ago
rinpatch 6ffbfdeeb2 tests: significantly reduce streamer timeout
5 years ago
rinpatch 137a3d220b tests: remove a useless 1 second sleep
5 years ago
rinpatch 814a99c80f tests: remove a useless 3 second sleep
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov eb11c60289 Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
5 years ago
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411
5 years ago
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
5 years ago
Sadposter 5abee19b63 make analysis happy
5 years ago
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities
5 years ago
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
5 years ago
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results
5 years ago
Maksim Pechnikov 2b821036c4 Merge branch 'develop' into issue/1383
5 years ago
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov 6fbafb1cdc Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383
5 years ago
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
5 years ago
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
5 years ago
Maxim Filippov a7f77785c2 Implement report notes destruction
5 years ago
Ivan Tashkinov 1770602747 [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests.
5 years ago
rinpatch 6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop'
5 years ago
lain e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
5 years ago
Maxim Filippov 08c89fd2b8 Fix incorrect report count
5 years ago
Maksim Pechnikov 22fc271e23 init tag feed
5 years ago
Ivan Tashkinov 13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov af42c00cff [#1427] Reworked admin scopes support.
5 years ago
rinpatch cdff5b8267 Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch 9f99640cfc ActivityPub: Fix deletes being exempt from MRF
5 years ago
lain 67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop'
5 years ago
feld d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop'
5 years ago
Maksim Pechnikov 3fe7a1fd35 Merge branch 'develop' into issue/1342
5 years ago
lain 1993d7096d Validators: Add a type for the datetime used in AP.
5 years ago
Maksim Pechnikov 49bb0a130f Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov e21afdb7c7 Merge branch 'develop' into issue/1411
5 years ago
Egor Kislitsyn d4953474ac Merge branch 'develop' into improve-move-notificaions-api
5 years ago
Maxim Filippov 4453a9cb73 Add failing test, which exposes a bug
5 years ago
Maksim Pechnikov 3c3bba0b7c fix ScheduledActivity
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain e9993acdbb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
Maksim Pechnikov 680e071dba Merge branch 'develop' into issue/1383
5 years ago
lain 24599c519f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
5 years ago
Maksim Pechnikov ed7f850ad2 fix test
5 years ago
lain aa97fe8f17 ChatChannel: Ignore messages that are too long.
5 years ago
Maksim Pechnikov 29a98b86b7 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 652cc6ba4b updated ScheduledActivity
5 years ago
Maxim Filippov 4b60d41db9 Add report notes
5 years ago
Egor Kislitsyn 624e720aa4 Add `with_move` query param to the notifications API
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
Maksim Pechnikov 88f7cf51d4 Merge branch 'develop' into issue/1411
5 years ago
kPherox 1915b23e72
test missing first field
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov 04a8ffbe84 added privacy option to push notifications
5 years ago
Maksim Pechnikov a52da55eb9 added User.NotificationSetting struct
5 years ago
Maksim Pechnikov b7c449118b Merge branch 'develop' into issue/1383
5 years ago
lain 8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop'
5 years ago
Egor Kislitsyn c4b468a95b
Cleanup tests output
5 years ago
Maxim Filippov fcabcab443 Fetch account from report, not from status (it might be deleted)
5 years ago
Maxim Filippov 5135656f57 Handle reopened reports with deleted statuses
5 years ago
lain 50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
Egor Kislitsyn f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn 1fc28a4b44
Add a view for the move notification
5 years ago
Maksim Pechnikov ac3abb5414 moved Pleroma.Stats to Oban Periodic jobs
5 years ago
Ivan Tashkinov c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maxim Filippov 5869a43fe7 Fix tests
5 years ago
Maxim Filippov b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
lain dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
5 years ago
Maxim Filippov b3b4e5ca80 AdminAPI: Grouped reports old/new fix
5 years ago
rinpatch 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch 02f7383891 ActivityPub controller: do not render remote users
5 years ago
Maxim Filippov 82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 2b341627da Admin API: Render whole status in grouped reports
5 years ago
lain bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
5 years ago