lain
|
873ff5ce14
|
Merge branch 'hide-reactions' into 'develop'
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
|
2020-07-30 12:41:47 +00:00 |
|
lain
|
20d89472e3
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-07-30 08:00:07 +00:00 |
|
Mark Felder
|
33f0427809
|
Expose seconds_valid in Pleroma Captcha API endpoint
|
2020-07-29 16:07:22 -05:00 |
|
Alex Gleason
|
026a51cb27
|
:show_reactions, add CHANGELOG.md, refactor test
|
2020-07-29 12:45:32 -05:00 |
|
Alex Gleason
|
6747bf2e16
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
2020-07-27 12:29:18 -05:00 |
|
lain
|
2a3abfd326
|
Merge branch 'issue/1934-welcome-email' into 'develop'
[#1934] welcome email
See merge request pleroma/pleroma!2786
|
2020-07-27 12:34:36 +00:00 |
|
Alex Gleason
|
6931dbfa58
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
2020-07-26 15:46:14 -05:00 |
|
|
|
51627a10e5
|
Merge branch 'unblock-domain-via-query' into 'develop'
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
|
2020-07-23 20:06:11 +00:00 |
|
Mark Felder
|
4bfad0b483
|
Support blocking via query parameters as well and document the change.
|
2020-07-23 12:59:40 -05:00 |
|
Maksim Pechnikov
|
67ab9a7928
|
Merge branch 'develop' into issue/1934-welcome-email
|
2020-07-23 16:36:27 +03:00 |
|
lain
|
a81581472f
|
Merge branch 'linkify' into 'develop'
Fix Linkify
See merge request pleroma/pleroma!2792
|
2020-07-23 10:28:52 +00:00 |
|
Maksim Pechnikov
|
7991ddad58
|
added warning to use old keys
|
2020-07-23 09:01:37 +03:00 |
|
lain
|
1c9752cff4
|
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
|
2020-07-22 15:09:32 +00:00 |
|
Maksim Pechnikov
|
b620290dd9
|
update description
|
2020-07-22 09:20:00 +03:00 |
|
Mark Felder
|
b157b7dab3
|
Document the emoji packs API fix
|
2020-07-21 17:29:11 -05:00 |
|
lain
|
5b1eeb06d8
|
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
This reverts merge request !2784
|
2020-07-21 22:18:17 +00:00 |
|
lain
|
696c13ce54
|
Revert "Merge branch 'linkify' into 'develop'"
This reverts merge request !2677
|
2020-07-21 22:17:34 +00:00 |
|
lain
|
2b5d9eb105
|
Merge branch 'linkify' into 'develop'
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
|
2020-07-21 19:35:43 +00:00 |
|
Maksim Pechnikov
|
3edaecae96
|
added welcome email
|
2020-07-21 09:25:53 +03:00 |
|
Dym Sohin
|
531c3ab9f3
|
fix markdown rendering withing <details>; typo parent**s**_visible
|
2020-07-20 11:41:43 +00:00 |
|
Mark Felder
|
20a496d2cb
|
Expose the post formats in /api/v1/instance
|
2020-07-17 10:45:41 -05:00 |
|
Alex Gleason
|
38425ebdbf
|
Merge remote-tracking branch 'upstream/develop' into linkify
|
2020-07-16 14:51:36 -05:00 |
|
Mark Felder
|
9d30bacace
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-15 09:30:23 -05:00 |
|
Alex Gleason
|
48983e9421
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
2020-07-14 18:56:40 -05:00 |
|
Alex Gleason
|
e82060c472
|
Update CHANGELOG.md
|
2020-07-14 18:47:23 -05:00 |
|
|
|
3f65f2ea79
|
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
|
2020-07-14 18:07:44 +00:00 |
|
Mark Felder
|
80c21100db
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-13 13:32:21 -05:00 |
|
Alexander Strizhakov
|
b376442325
|
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
|
2020-07-12 12:41:40 +03:00 |
|
Mark Felder
|
6167593881
|
Support Exiftool for stripping EXIF data
We really only want to strip location data anyway, and mogrify strips color profiles.
|
2020-07-10 16:46:26 -05:00 |
|
Mark Felder
|
0517d3252e
|
Probably worth documenting the MediaProxy fix
|
2020-07-10 11:22:29 -05:00 |
|
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-10 12:26:53 +02:00 |
|
Haelwenn
|
4ac6e6283f
|
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
|
2020-07-10 08:55:15 +00:00 |
|
Mark Felder
|
49c4e24953
|
Merge branch 'develop' into fix/csp-for-captcha
|
2020-07-09 09:08:59 -05:00 |
|
eugenijm
|
c2be0da79f
|
Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated
|
2020-07-09 14:57:40 +03:00 |
|
Haelwenn (lanodan) Monnier
|
31fef95e35
|
Add changelog and documentation
|
2020-07-08 06:29:24 +02:00 |
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
2020-07-08 03:25:30 +00:00 |
|
Mark Felder
|
18438a9bf0
|
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
|
2020-07-07 11:21:05 -05:00 |
|
lain
|
92e6801c17
|
Changelog: Add info about avatar removal
|
2020-07-07 16:53:54 +02:00 |
|
Haelwenn
|
fa0fa4552f
|
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
|
2020-07-07 08:23:49 +00:00 |
|
lain
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-06 11:27:06 +02:00 |
|
lain
|
58da575935
|
Changelog: Document description limits.
|
2020-07-06 11:18:01 +02:00 |
|
Sergey Suprunenko
|
8277b29790
|
Restrict thread statuses that contain user's irreversible filters
|
2020-07-06 09:30:39 +03:00 |
|
Mark Felder
|
991bd78dda
|
Document the Captcha CSP fix
|
2020-07-03 17:19:43 -05:00 |
|
lain
|
cbf2fe9649
|
Update changelog
|
2020-07-03 16:46:11 +02:00 |
|
lain
|
ef4c16f6f1
|
Update changelog
|
2020-07-03 15:59:42 +02:00 |
|
Mark Felder
|
8121e46f25
|
Merge branch 'develop' into activation-meta
|
2020-07-02 13:01:22 -05:00 |
|
Mark Felder
|
02d855b2b9
|
Document the new API extension of /api/v1/instance
|
2020-07-02 12:59:45 -05:00 |
|
lain
|
ce9b7c0e0f
|
Changelog: Update with stream changes.
|
2020-07-02 09:54:48 +02:00 |
|
Alex Gleason
|
8daacc9114
|
AutoLinker --> Linkify, update to latest version
https://git.pleroma.social/pleroma/elixir-libraries/linkify
|
2020-06-30 16:39:15 -05:00 |
|
lain
|
577da132da
|
Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
|
2020-06-29 08:39:51 +00:00 |
|
