Roman Chvanikov
|
880a92ccc7
|
Merge branch 'develop' into feature/expire-mutes
|
2020-09-08 15:16:43 +03:00 |
|
|
Roman Chvanikov
|
e3f845b243
|
Add expiring mutes for activities
|
2020-09-08 15:13:50 +03:00 |
|
|
Roman Chvanikov
|
c56e3d4f3b
|
Add expires_in param for account mutes
|
2020-09-08 13:26:44 +03:00 |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
2020-09-07 19:59:17 +03:00 |
|
|
Alexander Strizhakov
|
a83916fdac
|
adapter options unification
not needed options deletion
|
2020-09-07 19:59:17 +03:00 |
|
lain
|
fdab01ab56
|
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
|
2020-09-07 10:19:19 +00:00 |
|
rinpatch
|
170599c390
|
RichMedia: do not log webpages missing metadata as errors
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
|
2020-09-05 22:05:35 +03:00 |
|
|
rinpatch
|
e198ba492e
|
Rich Media: Do not cache URLs for preview statuses
Closes #1987
|
2020-09-05 20:53:46 +03:00 |
|
|
lain
|
9433311923
|
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
|
2020-09-03 11:50:30 +00:00 |
|
 feld
|
d1a6f67b1d
|
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
|
2020-09-02 17:11:24 +00:00 |
|
|
lain
|
119e11f455
|
Merge branch 'bugfix/mastoapi-lists' into 'develop'
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
|
2020-09-02 17:03:45 +00:00 |
|
|
lain
|
581f382e71
|
ListController: DRY up stuff.
|
2020-09-02 18:32:00 +02:00 |
|
Mark Felder
|
cbf7f0e029
|
Disallow password resets for deactivated accounts.
Ensure all responses to password reset events are identical.
|
2020-09-02 09:09:13 -05:00 |
|
|
rinpatch
|
d48fc90978
|
StatusView: Start fetching rich media cards as soon as possible
|
2020-09-02 16:45:54 +03:00 |
|
|
rinpatch
|
19691389b9
|
Rich media: Add failure tracking
|
2020-09-02 14:59:52 +03:00 |
|
|
rinpatch
|
47ff425cfd
|
Merge branch 'fix/2047-rich-media-parser' into 'develop'
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
|
2020-09-02 09:38:43 +00:00 |
|
|
Alexander Strizhakov
|
79f65b4374
|
correct pool and uniform headers format
|
2020-09-02 09:16:51 +03:00 |
|
|
Alexander Strizhakov
|
03d06062ab
|
don't fail on url fetch
|
2020-09-01 19:39:07 +03:00 |
|
Haelwenn (lanodan) Monnier
|
d872858046
|
Fix removing an account from a list
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
|
2020-09-01 12:49:32 +02:00 |
|
|
rinpatch
|
126461942b
|
User table: ensure bio is always a string
Gets rid of '|| ""' in multiple places and fixes #2067
|
2020-09-01 10:45:42 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
b960cede9a
|
common_fixes: Force inserting context and context_id
|
2020-09-01 08:35:00 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
a142da3e4f
|
Add new Emoji Ecto.Type and fix emoji in Question
|
2020-09-01 08:34:57 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
2ecc7d9230
|
transmogrifier: Remove mastodon emoji-format from emoji field
|
2020-09-01 08:29:53 +02:00 |
|
Haelwenn
|
9d63b2c9db
|
Merge branch 'chat-relation-constraints' into 'develop'
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
|
2020-08-31 20:55:05 +00:00 |
|
|
lain
|
0b621a834a
|
Chats: Add cascading delete on both referenced users.
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
|
2020-08-31 16:48:17 +02:00 |
|
|
lain
|
d91c4feebe
|
Notification: Small refactor.
|
2020-08-31 11:02:54 +02:00 |
|
Maksim Pechnikov
|
f0fefc4f5c
|
marks notifications as read after mute
|
2020-08-28 18:17:44 +03:00 |
|
|
Haelwenn
|
6b01a09a08
|
Merge branch '2078-list-fixes' into 'develop'
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
|
2020-08-27 17:05:53 +00:00 |
|
|
lain
|
78939c1d16
|
ChatController: Don't die if the recipient is gone.
|
2020-08-27 12:13:18 +02:00 |
|
|
lain
|
cfc99fe05c
|
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
|
2020-08-26 15:37:30 +02:00 |
|
|
feld
|
fb33321fa2
|
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
|
2020-08-25 21:32:32 +00:00 |
|
|
lain
|
112bec5225
|
Webfinger: Handle bogus ids better.
|
2020-08-25 17:35:59 +02:00 |
|
|
lain
|
c1d51944c7
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
|
2020-08-25 11:44:51 +02:00 |
|
|
feld
|
d39abd02ac
|
Merge branch 'relay-fix-admin-fe' into 'develop'
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
|
2020-08-24 17:03:18 +00:00 |
|
|
lain
|
e1c8c599ff
|
Merge branch 'features/validators-event' into 'develop'
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
|
2020-08-21 16:10:30 +00:00 |
|
|
Alexander Strizhakov
|
1f8c32b773
|
adding actor type in user show
|
2020-08-21 10:38:56 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
36c125a071
|
Pipeline Ingestion: Event
|
2020-08-20 21:49:26 +02:00 |
|
|
Alexander Strizhakov
|
7dc275b69b
|
relay fix for admin-fe
|
2020-08-19 08:41:39 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
5316e231b0
|
Pipeline Ingestion: Audio (Part 2)
|
2020-08-19 00:06:31 +02:00 |
|
|
lain
|
3998ef9d64
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
|
2020-08-18 13:31:42 +02:00 |
|
|
lain
|
548ca43bcf
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
|
2020-08-18 12:38:13 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
2f8c3c842d
|
common_fixes: Remove Utils.make_date call
|
2020-08-18 02:24:48 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
c9d6638461
|
common_fixes: Get fixes common from Audio and Question
|
2020-08-18 02:24:48 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
2bc08d5573
|
Pipeline Ingestion: Audio
|
2020-08-18 02:02:34 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
7a273087ed
|
object_validators: Use ecto_types where available
|
2020-08-17 23:47:00 +02:00 |
|
|
lain
|
34b099fffa
|
Merge branch 'issue/1936' into 'develop'
[#1936] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
|
2020-08-17 13:05:20 +00:00 |
|
Sergey Suprunenko
|
25c69e271a
|
Make notifications about new statuses from muted threads read
|
2020-08-17 00:11:33 +02:00 |
|
|
Maksim Pechnikov
|
f6da12f45d
|
fix search media proxy urls
|
2020-08-16 06:54:48 +03:00 |
|
Ivan Tashkinov
|
95529ab709
|
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
|
2020-08-14 20:55:45 +03:00 |
|
|
feld
|
14a06e63f6
|
Merge branch 'fix/activity-expirations-again' into 'develop'
Fix activity expirations again
See merge request pleroma/pleroma!2866
|
2020-08-13 17:38:19 +00:00 |
|