lain
|
e0d1a942a6
|
Merge branch 'issue/1707' into 'develop'
[#1707] fixed `mix pleroma.instance gen`
See merge request pleroma/pleroma!2565
|
2020-05-21 14:32:49 +00:00 |
|
lain
|
ab1154e13f
|
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
|
2020-05-21 14:30:34 +00:00 |
|
lain
|
a42a0716ec
|
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
|
2020-05-21 13:31:49 +00:00 |
|
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
2020-05-21 13:30:09 +00:00 |
|
lain
|
283fb1e05b
|
Merge branch 'issue/749' into 'develop'
[#749] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
|
2020-05-21 13:27:44 +00:00 |
|
Egor Kislitsyn
|
45d2c4157f
|
Add OpenAPI spec for AdminAPI.StatusController
|
2020-05-21 17:23:12 +04:00 |
|
lain
|
bf1b221f94
|
Credo fixes for the credo god.
|
2020-05-21 14:12:32 +02:00 |
|
lain
|
cdc6ba8d7b
|
AnnounceValidator: Check for announcability
|
2020-05-21 13:58:18 +02:00 |
|
lain
|
c76267afb9
|
Credo fixes.
|
2020-05-21 13:31:52 +02:00 |
|
lain
|
23e248694d
|
Announcements: Fix all tests.
|
2020-05-21 13:16:21 +02:00 |
|
lain
|
d9d425708e
|
SideEffects: Builed out Announce effects.
|
2020-05-21 12:43:09 +02:00 |
|
Egor Kislitsyn
|
9de9760aa6
|
Move status actions to AdminAPI.StatusController
|
2020-05-21 13:52:30 +04:00 |
|
Maksim Pechnikov
|
9bc5e18ade
|
rename mix task: pleroma.user unsubscribe -> pleroma.user deactivate
|
2020-05-21 08:06:57 +03:00 |
|
eugenijm
|
b7fc61e17b
|
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
|
2020-05-21 04:41:42 +03:00 |
|
Maksim Pechnikov
|
c96f425cb0
|
fixed mix pleroma.instance gen
|
2020-05-20 21:30:41 +03: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
|
265746b21f
|
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
|
2020-05-20 12:08:28 +00: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 |
|
lain
|
eb5f428565
|
CommonAPI: Change public->private implicit addressing.
This will not add the OP to the `to` field anymore when going from
public to private.
|
2020-05-20 13:38:47 +02:00 |
|
Egor Kislitsyn
|
5ba6e1c322
|
Move notification actions to PleromaAPI.NotificationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
f3fc8b22b1
|
Move conversation actions to PleromaAPI.ConversationController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
9a5de0f454
|
Move reaction actions to EmojiReactionController
|
2020-05-20 15:15:13 +04:00 |
|
Egor Kislitsyn
|
490a3a34b6
|
Add OpenAPI spec for PleromaAPI.PleromaAPIController
|
2020-05-20 15:15:13 +04: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 |
|
Egor Kislitsyn
|
aef31c69df
|
Rename EmojiAPIController to EmojiPackController
|
2020-05-18 19:43:25 +04:00 |
|
Egor Kislitsyn
|
8bde8dfec2
|
Cleanup Pleroma.Emoji.Pack
|
2020-05-18 19:43:23 +04:00 |
|
Egor Kislitsyn
|
6e4de715b3
|
Add OpenAPI spec for PleromaAPI.EmojiAPIController
|
2020-05-18 19:28:46 +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 |
|
Haelwenn (lanodan) Monnier
|
e688d4ee69
|
MRF.StealEmojiPolicy: New Policy
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
|
2020-05-14 09:59:56 +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 |
|
Alexander Strizhakov
|
e0944dee99
|
make test fail everytime
|
2020-05-13 11:38:22 +03:00 |
|
Alexander Strizhakov
|
712055612f
|
don't run tests which change env in async
|
2020-05-13 11:38:22 +03:00 |
|
Alexander Strizhakov
|
4ba913d641
|
{:error, :enoent} s3 fix
s3 tests were executed before temp file was uploaded
|
2020-05-13 11:38:21 +03:00 |
|
Alex Gleason
|
b46811a074
|
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
|
2020-05-12 17:14:59 -05:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
Stephanie Wilde-Hobbs
|
a2fcfc78c9
|
Filter config descriptions by config whitelist
|
2020-05-12 21:07:33 +01:00 |
|
rinpatch
|
2b18b8a263
|
Merge branch 'streamer-get-topic' into 'develop'
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
|
2020-05-12 17:02:57 +00:00 |
|
href
|
68cca29dcf
|
Fix typo in test
|
2020-05-12 18:51:10 +02:00 |
|
rinpatch
|
24c8c13640
|
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
|
2020-05-12 16:45:46 +00:00 |
|
rinpatch
|
4cc71aad65
|
Merge branch '1748-remote-following-follower-count' into 'develop'
Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515
|
2020-05-12 16:44:58 +00:00 |
|
Stephanie Wilde-Hobbs
|
620247a015
|
Add database configuration whitelist
|
2020-05-12 17:12:27 +01:00 |
|
href
|
e6d8cacf2d
|
Expand and authorize streams in Streamer directly
|
2020-05-12 18:04:47 +02:00 |
|
lain
|
dfb90a1fd6
|
Transmogrifier: Add tests for certain announces
|
2020-05-12 12:50:48 +02:00 |
|
lain
|
ca31af473c
|
Transmogrifier: On incoming follow accept, update follow counts.
|
2020-05-12 12:29:37 +02:00 |
|
lain
|
d0ba1844b0
|
ActivityPub: Fix non-federating blocks.
|
2020-05-12 10:52:46 +02:00 |
|
Maksim Pechnikov
|
63477d07ad
|
unsubscribes of friends when user deactivated
|
2020-05-12 08:14:42 +03:00 |
|
rinpatch
|
f8190aea5e
|
Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
|
2020-05-11 22:30:36 +00:00 |
|
lain
|
679afb2de4
|
SideEffects test: Add test for favorite deletion.
|
2020-05-11 15:38:19 +02:00 |
|
lain
|
5367a00257
|
Deletion: Handle the case of pruned objects.
|
2020-05-11 15:06:23 +02:00 |
|
Egor Kislitsyn
|
3bde0fa3f6
|
Add OpenAPI spec for TimelineController
|
2020-05-11 15:43:03 +04:00 |
|
Ivan Tashkinov
|
aee88d11be
|
[#2456] Removed support for embedded relationships in account view.
|
2020-05-10 09:16:48 +03:00 |
|
Ivan Tashkinov
|
14a49a0483
|
[#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
|
2020-05-09 18:05:44 +03:00 |
|
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
2020-05-08 21:37:55 +03:00 |
|
rinpatch
|
570940a3fd
|
Merge branch 'bugfix/fix-like-notifications' into 'develop'
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
|
2020-05-08 15:00:43 +00:00 |
|
Alexander Strizhakov
|
287f781808
|
user deletion
|
2020-05-08 17:11:17 +03:00 |
|
lain
|
fbcc53760e
|
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
|
2020-05-08 10:41:41 +00:00 |
|