nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
9729 commits 2 branches 0 tags 272 MiB
Commit graph

3558 commits

Author SHA1 Message Date
lain d9d425708e SideEffects: Builed out Announce effects. 2020-05-21 12:43:09 +02:00
lain 39031f4860 Pipeline: Don't federate if federation is disabled. 2020-05-20 16:36:55 +02:00
lain e42bc5f557 Announcements: Handle through common pipeline. 2020-05-20 15:44:37 +02:00
lain c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator 2020-05-20 14:02:40 +02:00
lain 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop' 
User deletion

Closes #1734

See merge request pleroma/pleroma!2493
 2020-05-20 11:43:49 +00:00
Haelwenn 94ba5a7802 Merge branch 'exposed-background-image' into 'develop' 
InstanceView: Expose background image link.

See merge request pleroma/pleroma!2545
 2020-05-20 10:53:54 +00:00
lain 6dd1575c64 Merge branch 'issue/1509' into 'develop' 
[#1509]  purge media from cache after delete

See merge request pleroma/pleroma!2539
 2020-05-20 10:35:36 +00:00
Haelwenn 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop' 
Add OpenAPI spec for PleromaAPI.ScrobbleController

See merge request pleroma/pleroma!2559
 2020-05-20 04:00:46 +00:00
lain 2328eff09c UserTest: Hide warning in tests. 2020-05-19 14:36:13 +02:00
Egor Kislitsyn 6609714d66
Move Scrobble views to ScrobbleView 2020-05-19 16:26:06 +04:00
Egor Kislitsyn 524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController 2020-05-19 16:26:06 +04:00
Haelwenn 58ccd2bbfd Merge branch 'openapi/pleroma-api/mascot' into 'develop' 
Add OpenAPI spec for MascotController

See merge request pleroma/pleroma!2553
 2020-05-19 09:41:57 +00:00
Maksim Pechnikov 41f8f17260 fix api/v1/accounts/update_credentials 2020-05-19 09:42:41 +03:00
Maksim Pechnikov 5f0a3ac74d added tests 2020-05-19 06:05:09 +03:00
Egor Kislitsyn fe5d423b43
Add OpenAPI spec for MascotController 2020-05-18 22:01:18 +04:00
Egor Kislitsyn 45c3a72404
[OpenAPI] Use BooleanLike in all request bodies 2020-05-18 20:58:59 +04:00
lain 0d5bce018d AnnounceValidator: Validate for existing announce 2020-05-18 16:54:10 +02:00
lain 17a8342c1e ObjectValidators: Add basic Announce validator. 2020-05-18 16:45:11 +02:00
lain 63ab2743ce TransmogrifierTest: Fix tests. 2020-05-18 15:47:26 +02:00
lain 7d381b16b7 Transmogrifier Test: Extract Announce handling. 2020-05-18 14:48:37 +02:00
Alexander Strizhakov 215daabdb4
copyright update 2020-05-18 15:15:51 +03:00
lain 188b32145e InstanceView: Expose background image link. 
This will make it easier for more clients to support this feature.
 2020-05-18 13:29:30 +02:00
lain 96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop' 
MediaController OAuth scope assignments fix

See merge request pleroma/pleroma!2541
 2020-05-18 10:57:59 +00:00
Ivan Tashkinov 9b76565264 MediaController: enforced owner-only access in :show action. 
Improved error response on denied access (now 403). Adjusted tests.
 2020-05-18 09:51:53 +03:00
lain 8bfd9710ae Pleroma Authenticator: Also update passwords here. 2020-05-17 11:53:17 +02:00
lain bfdd90f6d7 AuthenticationPlug: Also update crypt passwords. 2020-05-17 11:40:25 +02:00
lain baef35bcc8 Authentication Plug: Update bcrypt password on login. 2020-05-17 10:31:01 +02:00
lain 4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop' 
Restricted support for embedded relationships

See merge request pleroma/pleroma!2456
 2020-05-17 07:26:51 +00:00
Ivan Tashkinov af9dfdce6b MediaController OAuth scope assignments fix. 
Typo fix (`def get_media` instead of `def show`).
 2020-05-17 08:46:43 +03:00
lain d96f8f17e8 Merge branch 'features/mastoapi_v2_media' into 'develop' 
MastodonAPI: /api/v2/media endpoints

See merge request pleroma/pleroma!2439
 2020-05-16 17:13:38 +00:00
lain 2dcb26a6e5 CommonAPI: Unblock a user even if we don't have an activity. 2020-05-16 12:28:24 +02:00
Alexander Strizhakov 3c29f4f957
returning partial chain 2020-05-15 16:16:02 +03:00
rinpatch e455ca3f3e Merge branch 'feature/database-configuration-whitelist' into 'develop' 
Database configuration whitelist

See merge request pleroma/pleroma!2522
 2020-05-14 16:07:37 +00:00
lain 4157c459b8 Merge branch 'bcrypt-auth' into 'develop' 
Handle bcrypt passwords for Mastodon migration

See merge request pleroma/pleroma!2527
 2020-05-14 14:36:56 +00:00
Egor Kislitsyn bb03dfdb03
Do not require description in update action 2020-05-14 16:29:32 +04:00
Egor Kislitsyn 0f885b4b86
Fix OpenAPI spec 2020-05-14 16:18:30 +04:00
Stephanie Wilde-Hobbs 20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
Haelwenn (lanodan) Monnier cb363f0183
MastodonAPI: /api/v2/media endpoints 2020-05-14 10:14:28 +02:00
Alex Gleason 9cbf17d59f
Handle bcrypt passwords for Mastodon migration 2020-05-13 10:53:56 -05:00
Egor Kislitsyn 6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController 2020-05-13 19:06:46 +04:00
lain da550be066 Merge branch 'fix/1742-random-failing-tests' into 'develop' 
Fix sporadically failing tests

See merge request pleroma/pleroma!2524
 2020-05-13 13:38:32 +00:00
Egor Kislitsyn bcadbf964a
Add OpenAPI spec for SuggestionController 2020-05-13 14:15:24 +04:00
Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs
 2020-05-13 12:42:36 +03:00
lain 156c8a5088 Merge branch 'openapi/statuses' into 'develop' 
Add OpenAPI spec for StatusController

See merge request pleroma/pleroma!2521
 2020-05-13 09:34:30 +00:00
lain 1307d6ca3c Merge branch 'openapi/timelines' into 'develop' 
Add OpenAPI spec for TimelineController

See merge request pleroma/pleroma!2506
 2020-05-13 09:33:37 +00:00
Alexander Strizhakov fbe3d3aa5f
ignore order 2020-05-13 11:38:23 +03:00
Alexander Strizhakov 2c356a4bac
don't use async with global mocks 2020-05-13 11:38:23 +03:00
Alexander Strizhakov 12635bc156
don't use global mocks in setup callbacks 2020-05-13 11:38:22 +03:00
Alexander Strizhakov b962b24e6f
don't run in async if tests depend on env config 2020-05-13 11:38:22 +03:00
Alexander Strizhakov ec27f346ee
correct order for publised in assert 2020-05-13 11:38:22 +03:00