Commit Graph

3382 Commits (4dfc617cdf1c2579f4f941dcd0fa5c728178df06)

Author SHA1 Message Date
rinpatch d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation
5 years ago
Ivan Tashkinov 3965772b26 [#1559] Minor change (analysis).
5 years ago
Ivan Tashkinov f35c28bf07 [#1559] Added / fixed tests for follow / follow_request notifications.
5 years ago
rinpatch dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
5 years ago
Maksim Pechnikov 2b7d7bbd2d Merge branch 'develop' into issue/1276
5 years ago
kPherox 06471940e0 Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
5 years ago
lain 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop'
5 years ago
lain 96ee0aadbf Merge branch 'improving-test-coverage' into 'develop'
5 years ago
lain 349b9d86dc Merge branch 'remake-remodel-2' into 'develop'
5 years ago
Alexander Strizhakov a43e055916
using another fn for file deletion
5 years ago
Alexander Strizhakov b59ac37b2c
tests for emoji mix task
5 years ago
Ivan Tashkinov fc81e5a49c Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
5 years ago
Ivan Tashkinov aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Maksim Pechnikov dbcfac11b4 Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 23219e6fb3
Add OpenAPI
5 years ago
Alexander Strizhakov 2d64500a9d
error improvement for email_invite endpoint
5 years ago
Ivan Tashkinov 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
feld ef7d2b0f11 Merge branch 'gun' into 'develop'
5 years ago
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
5 years ago
rinpatch bfec45bf74 Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
5 years ago
Alexander Strizhakov 94ddbe4098
restrict remote users from indexing
5 years ago
Haelwenn (lanodan) Monnier 185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn (lanodan) Monnier b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
Haelwenn (lanodan) Monnier 2553400a66
Initial failing test statement against funkwhale channels
5 years ago
kPherox dbf9d719f9
split test for update profile fields
5 years ago
lain aebec1bac9 Validator Test: Small refactor.
5 years ago
Alexander Strizhakov df5f89c0d6
test for default features and changelog entry
5 years ago
lain 643f15e77b Validators: ObjectID is an http uri.
5 years ago
Alexander Strizhakov b607ae1a1c
removing grouped reports admin api endpoint
5 years ago
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Haelwenn e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop'
5 years ago
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov dfbc05d496 Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
lain 0adaab8e75 Bump copyright dates.
5 years ago
Ivan Tashkinov 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
rinpatch de62e633d3 Merge branch '1364-notifications-sending-control' into 'develop'
5 years ago
Ivan Tashkinov ff1baae7e9 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 460e41585c Further preloading (more endpoints), refactoring, tests.
5 years ago
Egor Kislitsyn 9081a071ee
Add a test for accounts/update_credentials
5 years ago
Ivan Tashkinov 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Ivan Tashkinov e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
Haelwenn (lanodan) Monnier 03a18cf037
node_info_test: Bump default features list
5 years ago
Haelwenn (lanodan) Monnier 212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
5 years ago
Haelwenn (lanodan) Monnier 64165d1df9
node_info_test.exs: Add test on the default feature list
5 years ago
Ivan Tashkinov 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
feld 8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop'
5 years ago
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
5 years ago
Egor Kislitsyn 4a2538967c
Support pagination in conversations
5 years ago
Egor Kislitsyn d1a9716a98
Fix activity deletion
5 years ago
lain eec1fcaf55 Home timeline tests: Add failing test for relationships
5 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Haelwenn (lanodan) Monnier 15be6ba9c2
AccountView: fix for other forms of <br> in bio
5 years ago
Alexander Strizhakov 7f9b5284fa
updating clear_config
5 years ago
Alexander Strizhakov 9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
lain d74405fc1a Merge branch 'fix-feed-pagination' into 'develop'
5 years ago
Ivan Tashkinov 1c05f539aa Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
Ivan Tashkinov 0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
5 years ago
lain 6c1232b486 NotificationController: Fix test.
5 years ago
lain 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
Haelwenn (lanodan) Monnier a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
5 years ago
Haelwenn (lanodan) Monnier c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
5 years ago
lain 3c2c32b460 Merge branch 'remake-remodel' into develop
5 years ago
Haelwenn (lanodan) Monnier f9d622d25a
WIP
5 years ago
Ivan Tashkinov ec3719f539 Improved in-test config management functions.
5 years ago
Alexander Strizhakov f9ecb513fa
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media
5 years ago
Ivan Tashkinov 7438833685 [#1364] Improved notification-related tests.
5 years ago
eugenijm 13cce9c0de Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
eugenijm d198e7fa2a Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
5 years ago
Alexander Strizhakov f3791add99
removing with_move parameter
5 years ago
Ivan Tashkinov 0e07c5ef57 Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Alexander Strizhakov 3805e09b9c
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov dc2ec84c0f
warnings fix
5 years ago
Alexander Strizhakov 89e4b3ebbd
fix for content-type header for tag feed
5 years ago
Alexander Strizhakov 91870c8995
adding rss for user feed
5 years ago
Alexander Strizhakov 26e2076659
fix for feed page pagination
5 years ago
rinpatch 34fd1c2c9d Merge branch 'bugfix/earmark_renderer_test' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Ivan Tashkinov 7c8003c3fc [#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier dca21cd1d6 test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
5 years ago
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
5 years ago
rinpatch e87a32bcd7 rip out fetch_initial_posts
5 years ago
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop'
5 years ago
rinpatch 994ac4357c Merge branch 'fix/hashtags-streaming' into 'develop'
5 years ago
rinpatch fc4496d4fa rate limiter: disable based on if remote ip was found, not on if the plug was enabled
5 years ago
rinpatch 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop'
5 years ago
Mark Felder c6eb1c1b92 Merge branch 'develop' into fix/cache-control-headers
5 years ago
Mark Felder db36b48180 Remove test verifying we preserve cache-control headers; we don't
5 years ago
Mark Felder 470090471d Fix test to use new cache-control settings
5 years ago
rinpatch 096c5c52e0 Merge branch 'revert/cache-control' into 'develop'
5 years ago
Egor Kislitsyn fffc382f13
Fix hashtags WebSocket streaming
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
5 years ago
feld 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop'
5 years ago
Alexander Strizhakov 39ed608b13
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 1306b92997
clean up
5 years ago
Ivan Tashkinov bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop'
5 years ago
rinpatch 7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
5 years ago
feld f92c447bbc Merge branch 'relay-list-change' into 'develop'
5 years ago
rinpatch c3b9fbd3a7 Revert "Set better Cache-Control header for static content"
5 years ago
Alexander Strizhakov 282a93554f
merging release default config on app start
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 f39e1b9eff
add verify tls_opts only when we open connection
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
Alexander Strizhakov 9f884a2639
tests changes
5 years ago
Alexander Strizhakov 14678a7708
using `stub` instead `expect`
5 years ago
Alexander Strizhakov 56ff02f2ef
removing GunMock to use Mox
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 931111fd55
removing integration tests
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
Alexander Strizhakov d6bebd4f9c
moving some logic to tesla adapter
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
Alexander Strizhakov 6b2fb9160c
otp version
5 years ago
Mark Felder d9c5ae7c09 Update Copyrights for gun related files
5 years ago
Mark Felder 4427161ca3 Merge branch 'develop' into gun
5 years ago
Mark Felder 5592db4757 Older copyright updates
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 884d9710b2
refactoring for gun api modules
5 years ago
Alexander Strizhakov 23f407bf09
don't test gun itself
5 years ago
Alexander Strizhakov f98ee730f0
adapter renaming to adapter_helper
5 years ago
Alexander Strizhakov 3723d72365
proxy parse tests fix
5 years ago
Alexander Strizhakov 7c0ed9302c
unnecessary mock
5 years ago
Alexander Strizhakov e605e79df9
simplification of formatting host method
5 years ago
Alexander Strizhakov ee8071f0d5
removing unused method
5 years ago
Alexander Strizhakov 28ed4b41d0
naming for checkin from pool timeout
5 years ago
Alexander Strizhakov 4c8569d403
otp_version refactor
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 137c600cae
stop connections manually
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 4d416343fa rate limiter: Fix a race condition
5 years ago
rinpatch 19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop'
5 years ago
Ivan Tashkinov c747260989 [#2250] Tiny refactoring per merge request review.
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
feld 97dae77240 Merge branch 'token-web-push-test' into 'develop'
5 years ago
Egor Kislitsyn c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions
5 years ago
Alexander Strizhakov 3eccdd15aa
compile fix
5 years ago
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276
5 years ago
rinpatch 035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop'
5 years ago
rinpatch 5e4fe0e8f7 instance.gen task: fix crash when using custom static directory
5 years ago
eugenijm 7ad5c51f23 Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Alexander Strizhakov 8efae966b1
open conn in separate task
5 years ago
lain 81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
Haelwenn (lanodan) Monnier ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native
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 ad8f26c0a4
more info in Connections.checkin timout errors
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 3eddd9caa6 Merge branch 'require-signature' 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 e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop'
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
Alexander Strizhakov c9db0507f8
removing retry option and changing some logger messages levels
5 years ago
Mark Felder 138a3c1fe4 Spelling was wrong in test as well
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