fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-27 00:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6622 commits 26 branches 107 tags 316 MiB
Commit graph

227 commits

Author SHA1 Message Date
Maxim Filippov a9459ff98f Admin API: Endpoint for fetching latest user's statuses 2019-07-14 00:37:26 +03:00
Roman Chvanikov eae991b06a merge develop 2019-07-12 18:08:27 +03:00
kaniini e4e3fd7e55 Merge branch 'fix/1019-refactor' into 'develop' 
Fix/1019 refactor

See merge request pleroma/pleroma!1397
 2019-07-11 13:01:11 +00:00
Alexander Strizhakov a237c6a2d4 support for idna domains 2019-07-10 15:23:25 +00:00
Alex S beba7bbc85 removing synchronization worker 2019-07-10 17:42:18 +03:00
Sergey Suprunenko ff55e3c16f Create mentions only for explicitly mentioned users 2019-07-10 13:29:50 +00:00
Ivan Tashkinov 829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests 
# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs
 2019-07-09 21:46:16 +03:00
Roman Chvanikov 371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
Alexander Strizhakov d6b0fce6e9 Fix/1019 correct count remote users 2019-07-09 17:36:35 +00:00
kaniini 4948117fcf Merge branch 'remove-swift' into 'develop' 
Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374
 2019-07-09 16:54:32 +00:00
Ivan Tashkinov 46cf81a544 [#878] Formatting fix. 2019-07-08 20:05:02 +03:00
Ivan Tashkinov daff85a985 [#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity. 2019-07-08 19:53:02 +03:00
Maksim 6dadf5d6f4 [#1043] fix search accounts. 2019-07-05 04:22:08 +00:00
Egor Kislitsyn 11143c542a Remove httpoison from dependencies 2019-07-03 14:42:24 +07:00
Roman Chvanikov 657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
Maksim Pechnikov 4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
Alex S 982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
Alex S 0f59265a50 salmon fix 
removed some ownership sandbox error
 2019-06-16 20:10:12 +08:00
Alexander Strizhakov c2ca1f22a2 it is changed in compile time 
we can't change module attributes and endpoint settings in runtime
 2019-06-14 15:45:05 +00:00
Roman Chvanikov b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +03:00
Sergey Suprunenko 84cc131b59 Add missing HTTP Request mocks 2019-06-04 05:46:19 +00:00
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
rinpatch 65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings 2019-05-30 21:03:31 +00:00
Roman Chvanikov ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants 2019-05-25 04:43:11 +00:00
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects 2019-05-18 13:37:38 +03:00
Alexander Strizhakov 7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Sergey Suprunenko e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
rinpatch 62e42b03ab Handle incoming Question objects 2019-05-15 20:10:16 +03:00
Roman Chvanikov b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
Roman Chvanikov bc7862106d Fix tests 2019-04-19 23:26:41 +07:00
lain 64c1c3a407 Participations: Add marking as read and unread. 2019-04-10 15:12:01 +02:00
lain d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' 
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
 2019-04-10 10:10:08 +00:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
 2019-04-08 12:20:26 +03:00
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm 7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
Alex S be54e40890 twitter api registration 
fix for twitter api tests
 2019-04-06 17:18:59 +07:00
Sergey Suprunenko 325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-04 23:43:08 +03:00
Ivan Tashkinov f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements. 2019-04-04 22:41:03 +03:00
lambda 180b87257c Merge branch 'bugfix/share-mastodon' into 'develop' 
[OStatus] adds status to pleroma instance if the url given is a status

See merge request pleroma/pleroma!1002
 2019-04-02 12:47:40 +00:00
Ivan Tashkinov 15ce710460 Added "GET /oauth/authorize" tests. 2019-04-02 13:43:33 +03:00
Sachin Joshi 6386c1c9c1 fetch url for OStatus to know if it is a/c or status 2019-04-02 10:26:09 +05:45
Sachin Joshi 1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status 2019-04-01 22:26:58 +05:45
Egor 9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier fb82f6fc7c
[Credo] Remove parentesis on argument-less functions 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Maksim bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts) 2019-03-04 20:47:34 +03:00
Ivan Tashkinov b574d97c2e [#468] Added support for push OAuth scope (Mastodon 2.4+). 2019-02-20 17:27:41 +03:00
Ivan Tashkinov c0ecbf6669 [#468] Merged upstream/develop. 2019-02-19 19:10:55 +03:00
kaniini 833161b5d2 Merge branch 'feature/jobs' into 'develop' 
Job Queue

See merge request pleroma/pleroma!732
 2019-02-18 19:43:06 +00:00
kaniini 7456338ed3 Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' 
Add OAuth tokens endpoint

See merge request pleroma/pleroma!805
 2019-02-18 04:02:41 +00:00
Ivan Tashkinov bc4f77b10b [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Ivan Tashkinov dcf24a3233 [#468] Refactored OAuth scopes' defaults & missing selection handling. 2019-02-17 13:49:14 +03:00
Ivan Tashkinov 063baca5e4 [#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages. 2019-02-14 00:29:29 +03:00
Maxim Filippov 61a4bc5095 Add OAuth tokens endpoint 2019-02-13 12:59:56 +03:00
Haelwenn (lanodan) Monnier 8bb7e19b38
test: de-group alias/es 2019-02-11 03:44:15 +01:00
Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
 2019-02-04 20:50:28 +07:00
lain e61f0be951 Unbreak all the tests. 2019-02-03 18:54:39 +01:00
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop' 
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
 2019-02-01 09:14:35 +00:00
William Pitcock 106475f265 test: http mocks: formatting 2019-01-31 16:30:56 +00:00
William Pitcock 4e76f9fde1 test: add malformed OGP data fixture 2019-01-31 16:12:35 +00:00
Egor Kislitsyn d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs 2019-01-31 15:07:49 +07:00
Egor Kislitsyn 55affbca7f add a job queue 2019-01-28 22:17:17 +07:00
Ivan Tashkinov d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
Ivan Tashkinov 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. 2019-01-28 15:25:06 +03:00
Haelwenn (lanodan) Monnier d9f3af477d Move definitions of RichMedia fixtures to test/support/http_request_mock.ex 2019-01-26 14:18:23 +00:00
Ivan Tashkinov d99650270b [#534] Federation reachability filtering tests. 2019-01-25 20:38:54 +03:00
sxsdv1 1eb7318831 Prepare all types objects before serialising 
Activities returned from inbox can include other types of objects like
Article
 2019-01-12 20:24:32 +01:00
sxsdv1 2d7da5f437 Don't crash on AP request for tombstone 
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
 2019-01-05 11:16:05 +01:00
rinpatch b73a1a33de Merge branch 'captcha' into 'develop' 
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
 2019-01-03 17:04:27 +00:00
William Pitcock 3c08d229db tests: add legal boilerplate 2018-12-23 20:57:10 +00:00
Ekaterina Vaartis 336e37d98f Make captcha (kocaptcha) stateless 
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
 2018-12-21 09:55:47 +03:00
lambda 52ac7dce5c Merge branch 'captcha' into 'develop' 
Captcha

See merge request pleroma/pleroma!550
 2018-12-17 19:45:14 +00:00
href b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00
Ekaterina Vaartis ef6829382a Clean captchas up periodically, not schedule it after theyre created 2018-12-16 23:53:44 +03:00
Ekaterina Vaartis 73576ab64e Fix captcha tests 2018-12-16 23:01:44 +03:00
Ekaterina Vaartis e8537208bd Add a captcha mock for tests 2018-12-15 22:38:39 +03:00
Maksim Pechnikov 89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
lain c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01:00
kaniini ccf0b46dd6 Merge branch '210_twitter_api_uploads_alt_text' into 'develop' 
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.

See merge request pleroma/pleroma!496
 2018-12-06 07:36:21 +00:00
Ivan Tashkinov 848151f7cb [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check 
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
 2018-12-05 13:37:06 +03:00
Maksim Pechnikov 50e72f6c48 remove httpoison_mock 2018-12-04 18:09:22 +03:00
Maksim Pechnikov dd8aee332c formatting the code 2018-12-04 17:48:55 +03:00
Maksim Pechnikov 5c6d47614d all tests passed 2018-12-04 17:44:15 +03:00
Maksim Pechnikov a9e4a97586 update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 7ec64ac33f update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 80bfdb4e7d update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 6cfdc11e32 update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov c508d41c34 add http requests mock 2018-12-04 14:04:06 +03:00
lain c443c9bd72 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-12-01 09:55:46 +01:00
href b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
lain 47d883d3ab Fix User deactivation. 2018-11-18 18:06:02 +01:00
William Pitcock 55640c4804 tests: add a test to verify the general fake direction protection works in all cases 2018-11-17 20:31:20 +00:00
William Pitcock dc1d8e13b4 tests: add a testcase for user collision 2018-11-17 20:20:45 +00:00
William Pitcock b483ae0a72 tests: add a second spoofing variant 2018-11-17 18:25:32 +00:00