Egor Kislitsyn
|
3dd1de61a7
|
Add url field to AdminAPI.AccountView
|
2020-06-09 16:02:42 +04:00 |
|
Roman Chvanikov
|
604a83ae3e
|
merge develop
|
2020-06-08 19:21:07 +03:00 |
|
lain
|
d192492658
|
Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
|
2020-06-08 11:07:01 +00:00 |
|
Egor Kislitsyn
|
b02df1803e
|
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
|
2020-06-05 23:15:10 +04:00 |
|
Haelwenn
|
54bae06b4f
|
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
Unifies all the similar functions to one and simplify some blocks with it.
|
2020-06-05 14:48:02 +00:00 |
|
Egor Kislitsyn
|
317e2b8d61
|
Use atoms as keys in ActivityPub.fetch_* functions options
|
2020-06-04 21:36:26 +04:00 |
|
minibikini
|
b57e4ad1ab
|
Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
2020-06-04 13:29:32 +00:00 |
|
Egor Kislitsyn
|
70f054b083
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-04 13:30:14 +04:00 |
|
Egor Kislitsyn
|
b4d5bdd6f1
|
Merge branch 'develop' into openapi/admin/config
|
2020-06-04 13:28:00 +04:00 |
|
Egor Kislitsyn
|
c16315d055
|
Add OpenAPI spec for AdminAPI.ReportController
|
2020-06-03 19:17:05 +04:00 |
|
Egor Kislitsyn
|
9d572f2f66
|
Move report actions to AdminAPI.ReportController
|
2020-06-03 19:17:04 +04:00 |
|
Haelwenn
|
18b050dfd1
|
Merge branch 'openapi/update-admin-api/status' into 'develop'
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
|
2020-06-03 14:04:12 +00:00 |
|
Egor Kislitsyn
|
8a43611e01
|
Use AdminAPI.StatusView in api/admin/users
|
2020-06-03 14:53:46 +04:00 |
|
Egor Kislitsyn
|
7922e63825
|
Update OpenAPI spec for AdminAPI.StatusController
|
2020-06-02 19:08:09 +04:00 |
|
Egor Kislitsyn
|
68cb152a08
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-02 18:50:37 +04:00 |
|
lain
|
5da38c15cd
|
Merge branch 'openapi/admin/oauth-apps' into 'develop'
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
|
2020-06-02 14:13:24 +00:00 |
|
lain
|
022d975a39
|
Merge branch 'openapi/admin/invites' into 'develop'
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
|
2020-06-02 14:10:21 +00:00 |
|
lain
|
cd2abcc0e3
|
Merge branch 'fix/invisible-repeats' into 'develop'
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
|
2020-06-02 11:32:03 +00:00 |
|
rinpatch
|
165a4b2a69
|
Do not include activities of invisible users unless explicitly requested
Closes #1833
|
2020-06-02 13:34:12 +03:00 |
|
lain
|
d111eae798
|
Merge branch 'feature/status-by-id-account-view' into 'develop'
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
|
2020-06-02 08:49:24 +00:00 |
|
Egor Kislitsyn
|
06f20e9181
|
Add OpenApi spec to AdminAPI.ConfigController
|
2020-05-28 23:11:12 +04:00 |
|
Egor Kislitsyn
|
d1ee3527ef
|
Move config actions to AdminAPI.ConfigController
|
2020-05-28 22:23:15 +04:00 |
|
Alexander Strizhakov
|
047a11c48f
|
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
2020-05-27 10:55:42 +00:00 |
|
Alexander Strizhakov
|
3249141588
|
validate actor type
|
2020-05-27 10:14:22 +03:00 |
|
Egor Kislitsyn
|
fca48154a2
|
Add AdminAPI.InviteView
|
2020-05-26 15:21:33 +04:00 |
|
Egor Kislitsyn
|
2a4f965191
|
Add OpenAPI spec for AdminAPI.InviteTokenController
|
2020-05-26 15:03:07 +04:00 |
|
Egor Kislitsyn
|
95ebfb9190
|
Move invite actions to AdminAPI.InviteTokenController
|
2020-05-26 15:03:07 +04:00 |
|
Alexander Strizhakov
|
8f08384d80
|
another view for account in admin-fe status_show
|
2020-05-26 13:48:39 +03:00 |
|
Egor Kislitsyn
|
0ba1f2631a
|
Add OpenAPI spec for AdminAPI.OAuthAppContoller
|
2020-05-25 22:04:06 +04:00 |
|
Egor Kislitsyn
|
cbcd592300
|
Add OpenAPI spec for AdminAPI.RelayController
|
2020-05-25 16:51:16 +04:00 |
|
Egor Kislitsyn
|
45d2c4157f
|
Add OpenAPI spec for AdminAPI.StatusController
|
2020-05-21 17:23:12 +04:00 |
|
Egor Kislitsyn
|
9de9760aa6
|
Move status actions to AdminAPI.StatusController
|
2020-05-21 13:52:30 +04:00 |
|
Roman Chvanikov
|
01bd6a1e54
|
Merge branch 'develop' into feature/admin-api-status-count-per-instance
|
2020-05-18 11:56:27 +03: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 |
|
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 |
|
Stephanie Wilde-Hobbs
|
20cbfb5cb5
|
Allow whitelisting whole groups
|
2020-05-14 12:43:53 +01:00 |
|
Steph
|
5c6f575315
|
Style fixes
|
2020-05-14 12:15:48 +01:00 |
|
Roman Chvanikov
|
8a383707ae
|
Merge develop
|
2020-05-13 19:56:40 +03: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 |
|
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 |
|
Stephanie Wilde-Hobbs
|
620247a015
|
Add database configuration whitelist
|
2020-05-12 17:12:27 +01:00 |
|
Ivan Tashkinov
|
b960a9430d
|
[#2456] credo fix.
|
2020-05-10 09:35:12 +03: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 |
|
Roman Chvanikov
|
cbe383ae83
|
Update stats admin endpoint
|
2020-05-09 11:30:37 +03:00 |
|
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
2020-05-08 21:37:55 +03:00 |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
2020-05-07 08:14:54 +00:00 |
|
rinpatch
|
473b0d9f3d
|
Merge branch 'feature/delete-validator' into 'develop'
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
|
2020-05-06 14:32:58 +00:00 |
|
lain
|
c3f1ce80eb
|
Merge branch 'fix/1726-user-pagination' into 'develop'
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
|
2020-05-06 09:01:42 +00:00 |
|
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
2020-05-05 16:18:56 +03:00 |
|
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.
|
2020-05-01 18:45:24 +03:00 |
|
lain
|
1ead5f49b8
|
AdminApiController: Use common pipeline for user deletion.
|
2020-05-01 14:30:39 +02:00 |
|
lain
|
ebbd9c7f36
|
AdminAPIController: Refactor.
|
2020-05-01 14:22:39 +02:00 |
|
Alexander Strizhakov
|
ecf37b46d2
|
pagination fix for service users filters
|
2020-05-01 14:31:24 +03:00 |
|
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
|
2020-04-28 19:56:20 +03:00 |
|
Ivan Tashkinov
|
0d05e1fe39
|
[#1706] Prevented error on unresolved activity actors for timeline actions.
|
2020-04-25 18:24:10 +03:00 |
|
Ivan Tashkinov
|
f685cbd309
|
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
|
2020-04-21 16:29:19 +03:00 |
|
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
|
2020-04-17 09:19:35 +00:00 |
|
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
2020-04-16 16:03:26 +03:00 |
|
Ivan Tashkinov
|
a21baf89d8
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
|
2020-04-13 09:16:51 +03:00 |
|
Alexander Strizhakov
|
f20a19de85
|
typo fix
|
2020-04-09 13:28:54 +03:00 |
|
Alexander Strizhakov
|
1cf0d5ab0d
|
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
|
2020-04-09 10:17:36 +00:00 |
|
Alexander Strizhakov
|
4c60fdcbb1
|
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
|
2020-04-09 10:17:31 +00:00 |
|
Alexander Strizhakov
|
2d64500a9d
|
error improvement for email_invite endpoint
|
2020-04-01 20:26:33 +03:00 |
|
Ivan Tashkinov
|
2f2bd7fe72
|
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
|
2020-04-01 19:49:09 +03:00 |
|
Alexander Strizhakov
|
b607ae1a1c
|
removing grouped reports admin api endpoint
|
2020-03-30 13:51:45 +03:00 |
|
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
2020-03-23 10:44:47 +03:00 |
|
eugenijm
|
13cce9c0de
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
|
2020-03-16 20:42:37 +03:00 |
|
eugenijm
|
d198e7fa2a
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password
|
2020-03-16 20:32:07 +03:00 |
|
Haelwenn (lanodan) Monnier
|
8176ca9e40
|
static_fe: Sanitize HTML in users
|
2020-03-15 20:44:04 +01:00 |
|
|
|
802b991814
|
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
|
2020-03-12 20:29:51 +00:00 |
|
Alexander Strizhakov
|
282a93554f
|
merging release default config on app start
|
2020-03-11 16:25:53 +03:00 |
|
eugenijm
|
ad22e94f33
|
Exclude private and direct statuses visible to the admin when using godmode
|
2020-03-05 15:15:27 +03:00 |
|
|
|
9b740cfb23
|
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
|
2020-03-04 18:22:37 +00:00 |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
2020-03-03 16:44:49 -06:00 |
|
eugenijm
|
7af431c150
|
Exclude reblogs from GET /api/pleroma/admin/statuses by default
|
2020-03-02 16:47:31 +03:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
|
|
f2216287a7
|
Merge branch 'admin-status-list' into 'develop'
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
|
2020-02-27 18:11:04 +00:00 |
|
eugenijm
|
4ab07cf0d5
|
Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses
|
2020-02-26 22:35:57 +03:00 |
|
eugenijm
|
e2a6a40367
|
Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)
|
2020-02-26 20:21:38 +03:00 |
|
Egor Kislitsyn
|
22018adae6
|
Fix Dialyzer warnings
|
2020-02-25 18:34:56 +04:00 |
|
eugenijm
|
7ad5c51f23
|
Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope
|
2020-02-24 21:46:37 +03:00 |
|
Alexander Strizhakov
|
dad23e3766
|
need_reboot flag
|
2020-02-08 13:00:02 +03:00 |
|
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
2020-02-06 12:50:36 +03:00 |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
2020-02-05 20:36:21 +03:00 |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
2020-01-25 18:42:04 +03:00 |
|
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
2020-01-22 15:14:11 +03:00 |
|
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
2020-01-21 18:42:00 +03:00 |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
2020-01-21 10:32:27 +03:00 |
|
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
2020-01-21 10:14:48 +03:00 |
|
Alexander Strizhakov
|
8023fa48db
|
merge fix
|
2020-01-20 18:25:00 +03:00 |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
2020-01-20 14:42:43 +00:00 |
|
lain
|
c814f22030
|
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
|
2020-01-20 12:07:12 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
2020-01-20 12:17:14 +01:00 |
|
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
2020-01-18 12:25:56 +03:00 |
|
Alexander Strizhakov
|
89e93fb33f
|
return db key on update requests
|
2020-01-17 18:15:41 +03:00 |
|
Alexander Strizhakov
|
60ba2339a2
|
saving to DB only added by user settings
|
2020-01-17 11:45:44 +03:00 |
|
Alexander Strizhakov
|
29155137fd
|
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
|
2020-01-16 08:50:27 +03:00 |
|
Alexander Strizhakov
|
59ba5c80b9
|
little cleanup
|
2020-01-15 17:10:33 +03:00 |
|
Ivan Tashkinov
|
76c1948880
|
[#1478] Adjusted AdminAPIController admin subscope requirements.
|
2020-01-15 12:11:23 +03:00 |
|
Alexander Strizhakov
|
1630ecaa20
|
Merge branch 'develop' into admin-be
|
2020-01-11 12:15:42 +03:00 |
|
Alexander Strizhakov
|
d933fd3d61
|
more renamings
|
2020-01-10 19:51:32 +03:00 |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
2020-01-10 19:34:19 +03:00 |
|
Alexander Strizhakov
|
958d0452e4
|
fix for pleroma assets group update
|
2020-01-10 18:18:09 +03:00 |
|
Alexander Strizhakov
|
88a16bb9fc
|
deep merge in config update
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
c841174de8
|
flag for delete fix
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
0b02040327
|
little fixes and typos fix
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
9c1f3bfeff
|
fixes for logger backends
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
063ab6d911
|
logger backends fix
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
583cee4607
|
parsing proxy url setting
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
fea734ca70
|
errors on endpoints
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
5cacb988b9
|
partially settings update
|
2020-01-10 15:52:00 +03:00 |
|
Alex S
|
2753285b77
|
config editing through database
|
2020-01-10 15:51:59 +03:00 |
|
Maksim Pechnikov
|
385356aad0
|
fix oauth scopes for AdminApi#reports_update
|
2019-12-24 20:51:52 +03:00 |
|
lain
|
8cb852523a
|
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
|
2019-12-12 09:28:27 +00:00 |
|
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
2019-12-12 02:16:23 +03:00 |
|
Maxim Filippov
|
82fae3e23f
|
AdminAPI: Merge account views for list instance statuses
|
2019-12-11 18:57:36 +03:00 |
|
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
2019-12-10 08:55:14 +03:00 |
|
Maxim Filippov
|
a7f77785c2
|
Implement report notes destruction
|
2019-12-08 11:27:23 +03:00 |
|
Ivan Tashkinov
|
40e1817f70
|
[#1427] Fixes / improvements of admin scopes support. Added tests.
|
2019-12-06 20:33:47 +03:00 |
|
Maxim Filippov
|
08c89fd2b8
|
Fix incorrect report count
|
2019-12-06 17:17:24 +09:00 |
|
Ivan Tashkinov
|
13926537b6
|
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
|
2019-12-06 00:26:31 +03:00 |
|
Ivan Tashkinov
|
af42c00cff
|
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
|
2019-12-06 00:25:44 +03:00 |
|
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
2019-12-04 00:26:37 +09:00 |
|
Ivan Tashkinov
|
51111e286b
|
[#1427] Initial support for OAuth admin scopes.
|
2019-11-29 18:57:19 +03:00 |
|
Maxim Filippov
|
fcabcab443
|
Fetch account from report, not from status (it might be deleted)
|
2019-11-28 00:09:00 +09:00 |
|
Maxim Filippov
|
5135656f57
|
Handle reopened reports with deleted statuses
|
2019-11-27 22:54:12 +09:00 |
|
Maxim Filippov
|
b62be2564c
|
Merge branch 'develop' into feature/admin-api-render-whole-status
|
2019-11-26 00:25:43 +09:00 |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:46:18 +09:00 |
|
Maxim Filippov
|
40059c9b1e
|
Typo
|
2019-11-25 00:05:52 +09:00 |
|
Maxim Filippov
|
2b341627da
|
Admin API: Render whole status in grouped reports
|
2019-11-25 00:04:29 +09:00 |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
2019-11-19 20:14:02 +09:00 |
|
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-14 23:45:29 +09:00 |
|
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
2019-11-14 23:44:07 +09:00 |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-08 18:30:49 +09:00 |
|
Maxim Filippov
|
7258db023e
|
Support old flag format
|
2019-11-08 18:21:29 +09:00 |
|
Maxim Filippov
|
f171095960
|
Grouped reports with status data baked in
|
2019-11-06 21:25:46 +10:00 |
|
Maxim Filippov
|
2cbfa256fd
|
Merge branch 'develop' into feature/multiple-users-force-password-reset
|
2019-11-05 11:36:47 +10:00 |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-05 02:12:48 +03:00 |
|
lain
|
556da92902
|
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity
See merge request pleroma/pleroma!1849
|
2019-11-04 14:11:44 +00:00 |
|
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
2019-11-01 18:45:47 +03:00 |
|
Maxim Filippov
|
d75934b0d0
|
Undo dialyzer fix
|
2019-11-01 15:14:43 +03:00 |
|
Maxim Filippov
|
ced9f92327
|
Fix count
|
2019-10-31 15:34:49 +03:00 |
|
Maxim Filippov
|
6f9d3d30fa
|
AdminAPI: Omit relay user from users list
|
2019-10-31 02:26:02 +03:00 |
|
Maxim Filippov
|
59a149c69a
|
Fix "the call ... will never return" warning
|
2019-10-31 02:25:15 +03:00 |
|
Maxim Filippov
|
d56bc62275
|
Fix report parsing
|
2019-10-27 16:33:58 +03:00 |
|
Maxim Filippov
|
791bcfd90f
|
Merge branch 'develop' into feature/store-statuses-data-inside-flag
|
2019-10-27 16:11:25 +03:00 |
|
Maxim Filippov
|
b08b1d5d91
|
Store status data inside Flag activity
|
2019-10-23 21:27:22 +02:00 |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
2019-10-20 22:29:56 +03:00 |
|
