Egor Kislitsyn
|
08cbd655d1
|
Merge branch 'develop' into frontend-admin-api
|
2020-11-11 19:53:40 +04:00 |
|
lain
|
88f6b61a5e
|
Merge branch '2260-wrong-report-link' into 'develop'
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
|
2020-11-10 11:04:19 +00:00 |
|
lain
|
5ddf0be208
|
Changelog: Add info about admin email user link changes.
|
2020-11-04 17:13:34 +01:00 |
|
lain
|
dd2b3a8da9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
|
2020-11-04 16:51:42 +01:00 |
|
lain
|
4800ee656b
|
Merge branch 'features/federation-status' into 'develop'
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
|
2020-11-04 15:00:52 +00:00 |
|
lain
|
5db4c823b2
|
Merge branch 'restrict-domain' into 'develop'
View a remote server's timeline
See merge request pleroma/pleroma!2713
|
2020-11-04 14:54:53 +00:00 |
|
lain
|
eb1e1e7494
|
Changelog: Add info about federation status endpoint
|
2020-11-04 15:39:32 +01:00 |
|
lain
|
329aa19c9f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
|
2020-11-04 15:05:01 +01:00 |
|
lain
|
e46c95b826
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
|
2020-11-04 13:23:18 +01:00 |
|
lain
|
f09bb814a9
|
Changelog: Add info about poll view changes
|
2020-11-04 10:14:48 +01:00 |
|
lain
|
91f6c32430
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
|
2020-11-03 13:45:09 +01:00 |
|
minibikini
|
6163fbf553
|
Merge branch 'develop' into 'frontend-admin-api'
# Conflicts:
# lib/pleroma/web/router.ex
|
2020-11-02 10:43:45 +00:00 |
|
feld
|
38b481d112
|
Merge branch 'feature/account-export' into 'develop'
Add account export
Closes #847
See merge request pleroma/pleroma!2918
|
2020-10-31 17:03:40 +00:00 |
|
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
2020-10-31 05:50:59 +03:00 |
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
2020-10-30 19:34:02 +04:00 |
|
Alibek Omarov
|
5591dc0248
|
Add entry in changelog
|
2020-10-30 13:59:53 +01:00 |
|
feld
|
1cce1bd729
|
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
|
2020-10-29 21:06:15 +00:00 |
|
Egor Kislitsyn
|
75d131ba18
|
Add documentation and update CHANGELOG
|
2020-10-29 16:37:51 +04:00 |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
2020-10-29 15:35:42 +04:00 |
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
2020-10-28 19:03:40 +03:00 |
|
Egor Kislitsyn
|
4a2d7a7a5d
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
2020-10-28 15:33:36 +04:00 |
|
feld
|
1204aaa2e3
|
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames
See merge request pleroma/pleroma!3087
|
2020-10-27 22:55:31 +00:00 |
|
Haelwenn
|
d8d4bd15d0
|
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
|
2020-10-27 22:44:31 +00:00 |
|
feld
|
03a318af9a
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 22:13:50 +00:00 |
|
Mark Felder
|
291189357b
|
Merge branch 'develop' into feature/account-export
|
2020-10-27 12:54:33 -05:00 |
|
Mark Felder
|
9e54ef086b
|
Merge branch 'develop' into feature/account-export
|
2020-10-27 12:51:31 -05:00 |
|
feld
|
5aff479951
|
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
|
2020-10-27 17:47:56 +00:00 |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 17:42:24 +00:00 |
|
lain
|
a999e8b0b7
|
Changelog: Add info about whitespace name remote users.
|
2020-10-23 13:55:08 +02:00 |
|
lain
|
3fdc2a0d1e
|
Changelog: Add information about self-chats
|
2020-10-22 12:23:07 +02:00 |
|
Maksim Pechnikov
|
add26817e3
|
update changelog
|
2020-10-22 11:54:32 +03:00 |
|
Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
2020-10-20 17:27:29 +04:00 |
|
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
2020-10-19 15:40:03 +04:00 |
|
Ivan Tashkinov
|
524fb0e4c2
|
[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
Added tests and documentation.
|
2020-10-18 21:22:21 +03:00 |
|
Mark Felder
|
d16336e7fb
|
Document autofollowing_nicknames
|
2020-10-17 16:54:05 +00:00 |
|
Mark Felder
|
cb3ee4d543
|
Fix duplicate Added sections in the changelog
|
2020-10-17 11:52:52 -05:00 |
|
Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
2020-10-17 13:12:39 +03:00 |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
2020-10-14 15:27:15 -05:00 |
|
Egor Kislitsyn
|
2b58b0dbce
|
Update CHANGELOG
|
2020-10-13 21:58:26 +04:00 |
|
Ivan Tashkinov
|
2498e569f1
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
|
2020-10-11 22:34:48 +03:00 |
|
Ivan Tashkinov
|
89c595b772
|
[#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
|
2020-10-11 22:34:28 +03:00 |
|
Mark Felder
|
04b514c567
|
Merge branch 'develop' into feature/gen-magic
|
2020-10-09 11:26:10 -05:00 |
|
Alex Gleason
|
9c672ecbb5
|
Remote Timeline: add Streaming support
|
2020-10-08 20:07:03 -05:00 |
|
Egor Kislitsyn
|
563801716a
|
Update changelog
|
2020-10-07 18:35:26 +04:00 |
|
Mark Felder
|
21a73ce9f2
|
Document the NSFW link preview change
|
2020-10-06 14:54:21 -05:00 |
|
Mark Felder
|
346cc3ac24
|
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
|
2020-10-05 12:40:53 -05:00 |
|
rinpatch
|
9e96c9ae48
|
Merge branch 'fix/empty-params-openapi' into 'develop'
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
|
2020-10-03 12:35:49 +00:00 |
|
rinpatch
|
006b62fd12
|
OpenAPI CastAndValidate: filter out empty params
Closes #2198
|
2020-09-29 21:52:16 +03:00 |
|
lain
|
2a11068a11
|
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
|
2020-09-29 14:48:30 +00:00 |
|
Ivan Tashkinov
|
ae26284638
|
[#3031] Adjusted changelog entry.
|
2020-09-29 17:34:49 +03:00 |
|