lain
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
4 years ago
lain
b34debe615
Undoing: Move undoing reactions to the pipeline everywhere.
4 years ago
Egor Kislitsyn
3a45952a3a
Add OpenAPI spec for ConversationController
4 years ago
Egor Kislitsyn
32ca9f2c59
Render mastodon-like errors in FilterController
4 years ago
Egor Kislitsyn
46aae346f8
Move single used schemas to Filter operation schema
4 years ago
Egor Kislitsyn
7e7a3e1544
Add OpenAPI spec for FilterController
4 years ago
lain
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
4 years ago
Egor Kislitsyn
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
4 years ago
minibikini
42a4a863f1
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
4 years ago
minibikini
3817f179d7
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
4 years ago
minibikini
b5189d2c50
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
4 years ago
Egor Kislitsyn
88a14da817
Add OpenAPI spec for InstanceController
4 years ago
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
4 years ago
lain
a3071f0231
Undoing: Move undoing likes to the pipeline everywhere.
4 years ago
Egor Kislitsyn
f2bf4390f4
Fix descriptions for List API spec
4 years ago
Egor Kislitsyn
5ec6aad567
Add OpenAPI spec for ListController
4 years ago
Egor Kislitsyn
babcae7130
Move single used schemas to Marker operation schema
4 years ago
Egor Kislitsyn
8096565653
Add OpenAPI spec for MarkerController
4 years ago
Egor Kislitsyn
d861b0790a
Add OpenAPI spec for SubscriptionController
4 years ago
lain
f1da8882f9
UndoValidator: Add UndoValidator.
4 years ago
rinpatch
33f2976020
Merge branch 'feature/1737-magic-key-field' into 'develop'
...
User, Webfinger: Remove OStatus vestiges
Closes #1737
See merge request pleroma/pleroma!2471
4 years ago
rinpatch
5482a1f6ef
Merge branch 'openapi/validation-plug' into 'develop'
...
Ignore unexpected query params and ENUM values
Closes #1719
See merge request pleroma/pleroma!2468
4 years ago
lain
d201527004
Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex
4 years ago
lain
db55dc9445
ActivityPub: Remove `react_with_emoji`.
4 years ago
lain
ad771546d8
Transmogrifier: Move emoji reactions to common pipeline.
4 years ago
lain
f21f538293
LikeValidator: Add defaults for recipients back in.
4 years ago
lain
c297667f16
Merge branch 'fix/issue-1729' into 'develop'
...
Only update follower/following stats for actor types of users and bots.
Closes #1565 and #1729
See merge request pleroma/pleroma!2464
4 years ago
lain
2cb3f8a8cf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
6400998820
AP C2S: Restrict creation to `Note`s for now.
4 years ago
lain
f897da2115
WebFinger: Add back in subscribe_address.
...
It's used for remote following.
4 years ago
lain
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
4 years ago
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
4 years ago
Egor Kislitsyn
e55fd530bc
Render better errors for ENUM validation
4 years ago
Egor Kislitsyn
f070b5569c
Add a config option to enable strict validation
4 years ago
Egor Kislitsyn
4b9ab67aa8
Ignore unexpected ENUM values in query string
4 years ago
minibikini
bfbff7d826
Apply suggestion to lib/pleroma/web/api_spec/cast_and_validate.ex
4 years ago
Egor Kislitsyn
d08c63500b
Ignore unexpected query params
4 years ago
lain
3559dd1085
Transmogrifier: Rely on LikeValidator.
4 years ago
lain
0f9bed022f
LikeValidator: Fix up context.
4 years ago
lain
e03c301ebe
LikeValidator: Fix up missing recipients.
4 years ago
lain
13ab8defc0
Pipeline: Move transctioning to common pipeline.
4 years ago
lain
ec24c70db8
ActivityPub: Don't fetch `Application` follower counts.
4 years ago
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
lain
a7966f2080
Webfinger: Request account info with the acct scheme
4 years ago
lain
1974d0cc42
DeleteValidator: The deleted activity id is an object id
4 years ago
lain
6fb96f64c1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
4dfc617cdf
Transmogrifier: Don't fetch actor that's guaranteed to be there.
4 years ago
Lain Soykaf
f20a1a27ef
DeleteValidator: Improve code readability
4 years ago
Mark Felder
370e313e2d
Only update follower/following stats for actor types of users and bots.
4 years ago
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
4 years ago
eugenijm
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
4 years ago
rinpatch
e55876409b
Deactivate local users on deletion instead of deleting the record
...
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
4 years ago
Ivan Tashkinov
2d07ed7747
[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth
...
(as for related :api pipeline endpoints).
4 years ago
rinpatch
9e3ec58280
Merge branch 'follow-request-notifications' into 'develop'
...
Follow request notifications enforcement
See merge request pleroma/pleroma!2451
4 years ago
Haelwenn
0dfb5ad0ad
Merge branch 'bugfix/static-fe.css' into 'develop'
...
static-fe.css: Restore and move to /priv/static/static-fe
See merge request pleroma/pleroma!2458
4 years ago
Haelwenn (lanodan) Monnier
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
Ivan Tashkinov
cf5ca7e45b
Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
4 years ago
rinpatch
c18ef452b0
OpenAPI: Add `follow_request` to notification types
...
Closes #1731
4 years ago
rinpatch
85105f7aae
OpenAPI: Remove max pagination limit from the spec
...
In an ideal world clients wouldn't try to request more than the max
hardcoded limit, but SubwayTooter does.
4 years ago
Ivan Tashkinov
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
4 years ago
lain
3453e54e6b
MappedSignatureToIdentityPlug: Fix.
4 years ago
lain
a912f72a36
Signature: Handle non-ap ids in key ids.
...
Mastodon and Gab sometimes send the format `acct:name@server`.
4 years ago
lain
3370bb0e46
Merge branch 'openapi/notifications' into 'develop'
...
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
4 years ago
lain
607e06c245
Merge branch 'openapi/reports' into 'develop'
...
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
4 years ago
lain
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
4 years ago
lain
1ead5f49b8
AdminApiController: Use common pipeline for user deletion.
4 years ago
lain
ebbd9c7f36
AdminAPIController: Refactor.
4 years ago
lain
51f1dbf0a2
User deletion mix task: Use common pipeline.
4 years ago
lain
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
4 years ago
lain
ab01863abf
Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
5f42e6629d
DeleteValidator: Only allow deletion of certain types.
4 years ago
Alexander Strizhakov
ecf37b46d2
pagination fix for service users filters
4 years ago
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Lain Soykaf
93f64aba78
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
4 years ago
lain
32b8386ede
DeleteValidator: Don't federate local deletions of remote objects.
...
Closes #1497
4 years ago
lain
a81342a234
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
...
Dismiss the follow request notification on rejection
See merge request pleroma/pleroma!2447
4 years ago
lain
999d639873
ActivityPub: Remove `delete` function.
...
This is handled by the common pipeline now.
4 years ago
lain
3b443cbc1d
User: Use common pipeline to delete user activities
4 years ago
lain
5da08c2b73
SideEffects: Fix comment
4 years ago
lain
500f5ec14e
SideEffects: On deletion, reduce the reply count cache
4 years ago
lain
60db58a1c6
Credo fixes.
4 years ago
lain
ab60ee1776
SideEffects: On deletion, reduce the User note count.
4 years ago
lain
c832d96fc9
SideEffects: Stream out deletes.
4 years ago
lain
4500fdc04c
DeleteValidator: Add internal helper field after validation.
4 years ago
eugenijm
bef34568f0
Dismiss the follow request notification on rejection
4 years ago
Ivan Tashkinov
2c4844237f
Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
4 years ago
Alexander Strizhakov
4a487e4d0b
fix for auth check
4 years ago
lain
14c6672193
AP C2S: Use common pipelin for deletes.
4 years ago
lain
fdd8e7f276
CommonAPI: Use common pipeline for deletions.
4 years ago
lain
417eed4a2b
SideEffects: Handle deletions.
4 years ago
lain
1fb383f368
DeleteValidator: Deleting a user is valid.
4 years ago
lain
4dc5302f45
Transmogrifier: Handle incoming deletes for non-user objects.
4 years ago
Alexander Strizhakov
36abeedf9f
error rename
4 years ago
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov
342f55fb92
refactor emoji api with fixes
4 years ago
lain
db184a8eb4
DeleteValidator: Mastodon sends unaddressed deletes.
4 years ago
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
4 years ago
lain
42ce7c5164
ObjectValidator: Add actor fetcher.
4 years ago
lain
64bb72f98a
Typo fix.
4 years ago
lain
4c4344b7b1
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
...
[#1364 ] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
4 years ago
Egor Kislitsyn
9c1adb35de
Merge branch 'develop' into openapi/notifications
4 years ago
Egor Kislitsyn
1898054da4
Merge branch 'develop' into openapi/reports
4 years ago
rinpatch
8cf3a32463
Add exlude_replies to OpenAPI spec for account timelines
4 years ago
Egor Kislitsyn
39a78998d0
Change Pleroma.CaptchaTest to be a regular module instead of GenServer
4 years ago
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
Egor Kislitsyn
2f77842bd3
Fix account registration when captcha is enabled but not provided
4 years ago
lain
503de4b8df
ObjectValidator: Add validation for `Delete`s.
4 years ago
lain
78c864cbee
LikeValidator: Use Recipients Type.
4 years ago
lain
b8056e69e0
Object Validator Types: Add Recipients.
4 years ago
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController
4 years ago
Ivan Tashkinov
4c0e53367a
[ #2349 ] Post-merge fix.
4 years ago
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController
4 years ago
rinpatch
12bb7fc0dc
Merge branch 'openapi/account' into 'develop'
...
Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374
4 years ago
lain
9994768312
Merge branch 'mongoose-secure' into 'develop'
...
mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432
4 years ago
Maksim Pechnikov
ea5142b94b
convert markdown content to html
4 years ago
fence
5ff20793e7
formating
4 years ago
Egor Kislitsyn
dda65f7799
Move single used schemas to operation schema
4 years ago
fence
cc1e2e8d0f
requested changes to mongoose_im_controller.ex
4 years ago
Egor Kislitsyn
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
4 years ago
fence
5c7cc10917
add tests for deactivated users for mongoose auth
4 years ago
fence
a626cb682c
secure mongoose auth endpoint
4 years ago
lain
3635a9c9c2
InstanceController: Add extensions to `/api/v1/instance`
4 years ago
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
Alex Gleason
1bd9749a8f
Let blob: pass CSP
4 years ago
Ivan Tashkinov
e16437ff19
[ #1706 ] Formatting fix.
4 years ago
Ivan Tashkinov
0d05e1fe39
[ #1706 ] Prevented error on unresolved activity actors for timeline actions.
4 years ago
Ivan Tashkinov
b4139cc547
[ #2409 ] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
4 years ago
rinpatch
8addbd948c
Merge branch 'bugfix/announce-race-condition' into 'develop'
...
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
4 years ago
lain
c30b3b2dc5
Merge branch 'reply-filtering-refactor' into 'develop'
...
Reply filtering refactor
See merge request pleroma/pleroma!2424
4 years ago
lain
d89cd0a197
Reply Filtering: Refactor.
4 years ago
lain
d862c7156a
Merge branch 'openapi-improvements' into 'develop'
...
Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421
4 years ago
Ivan Tashkinov
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
4 years ago
Alexander
6e625a427c
reply filtering
4 years ago
lain
cb12585098
Announcements: Prevent race condition.
4 years ago
lain
1df6af2a4c
Credo fixes.
4 years ago
lain
bbf8554c97
ActivitPub: Remove `like` function.
...
We don't need another way to build likes.
4 years ago
Egor Kislitsyn
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
4 years ago
Ivan Tashkinov
89f38d94c7
[ #2409 ] Fixed before-action callback results persistence.
4 years ago
rinpatch
1b5f8d19ee
Merge branch 'bugfix/repeating-announce' into 'develop'
...
CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418
4 years ago
lain
7d38197894
CommonAPI: Don't make repeating announces possible
4 years ago
rinpatch
25eec6d72d
Merge branch 'bugfix/null-scheduled-at' into 'develop'
...
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
4 years ago
lain
850377a7b8
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
...
SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417
4 years ago
lain
1bcbdc7a9f
SideEffects: Use less cryptic syntax.
4 years ago
Haelwenn
af27e4dffd
Merge branch 'bugfix/1670-user-count' into 'develop'
...
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
4 years ago
lain
f5bda09de6
Stats: Use `invisible` property for filtering.
4 years ago
Ivan Tashkinov
e7fb593d13
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
e62173dfc8
SideEffects: Run in transaction.
...
This fixes race conditions.
4 years ago
Egor Kislitsyn
1b06a27746
Update Flake ID description
4 years ago
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
Ivan Tashkinov
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Ivan Tashkinov
2958a7d246
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
4 years ago
Haelwenn
28f8fcf8b0
Merge branch 'fix/follow-and-blocks-import' into 'develop'
...
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
4 years ago
Haelwenn
468cc977be
Merge branch 'bugfix/following-fix-status-code' into 'develop'
...
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
4 years ago
Haelwenn
238058ecae
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
...
Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415
4 years ago
Ivan Tashkinov
b03aeae8b9
Apply suggestion to lib/pleroma/notification.ex
4 years ago
Egor Kislitsyn
6db52c3b36
Fix Oban warning
...
Warning example:
[warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.
4 years ago
Egor Kislitsyn
e7771424a8
Fix blocks import
4 years ago
Egor Kislitsyn
88b82e5c3e
Fix follow import
4 years ago
lain
7a3a88a13e
Streamer: Stream boosts to the boosting user.
4 years ago
Haelwenn
1855c597c2
Merge branch 'feature/voters-count' into 'develop'
...
Polls: Persist and show voters' count
Closes #1702
See merge request pleroma/pleroma!2411
4 years ago
Haelwenn
2e73c19edc
Merge branch 'worker-messages' into 'develop'
...
Worker messages
Closes #1705
See merge request pleroma/pleroma!2410
4 years ago
Karol Kosek
452072ec95
static_fe: Add microformats2 classes
4 years ago
lain
8b88e2a6e2
Stats: Ignore internal users for user count.
4 years ago
lain
5b39526198
AccountController: Use code 400 for self-follow.
4 years ago
lain
69ecc39038
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
...
Fix migrate to db config
Closes #1689
See merge request pleroma/pleroma!2394
4 years ago
lain
c10485db16
StatusController: Ignore nil scheduled_at parameters.
4 years ago
lain
5102468d0f
Polls: Persist and show voters' count
4 years ago
lain
923513b641
Federator: Return proper values for jobs
4 years ago
lain
f719a5b23a
WebPush: Return proper values for jobs.
4 years ago
Egor Kislitsyn
11433cd38d
Add OpenAPI schema for FlakeID
4 years ago
Egor Kislitsyn
f0238d010a
Improve OpenAPI schema
...
- Removes unneeded wrapping in examples
- Adds `:format` attributes
4 years ago
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
4 years ago
Ivan Tashkinov
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
4 years ago
rinpatch
e57c1b60e4
Merge branch 'accept-deletes' into 'develop'
...
Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371
4 years ago
rinpatch
7e456ac7f6
Merge branch 'router-cleanup' into 'develop'
...
Cleanup and DRY the Router
See merge request pleroma/pleroma!2406
4 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
Egor Kislitsyn
ed3974af24
Add OpenAPI spec for `AccountController.identity_proofs` operation
4 years ago
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
4 years ago
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
4 years ago
Ilja
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
4 years ago
Egor Kislitsyn
258d897579
Cleanup and DRY the Router
4 years ago
rinpatch
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
4 years ago
Haelwenn
79445ae5d2
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
4 years ago
Haelwenn
24f760c2f7
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
Haelwenn (lanodan) Monnier
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
5 years ago
Ivan Tashkinov
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
5 years ago
Egor Kislitsyn
163341857a
Improve OpenAPI errors
5 years ago
rinpatch
e0d7847bc5
Merge branch 'sideeffects-test' into 'develop'
...
SideEffects: Test for notification creation.
See merge request pleroma/pleroma!2399
5 years ago
lain
26d9c83316
SideEffects: Test for notification creation.
5 years ago
rinpatch
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
5 years ago
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
5 years ago
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
5 years ago
Alexander Strizhakov
6cda360fea
don't restart postgrex
5 years ago
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
5 years ago
Haelwenn
d8142ee6fe
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
...
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
5 years ago
Haelwenn
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
5 years ago