William Pitcock
|
75b6c4b004
|
mrf: defang policy modules for filtering user profile objects
|
2019-05-22 18:53:12 +00:00 |
|
rinpatch
|
ac7702f800
|
Exclude Answers from fetching by default
|
2019-05-22 21:52:12 +03:00 |
|
rinpatch
|
19c90d47c4
|
Normalize poll votes to Answer objects
|
2019-05-22 21:17:57 +03:00 |
|
Maksim
|
620908a2db
|
[#699] add worker to clean expired oauth tokens
|
2019-05-22 15:44:50 +00:00 |
|
lambda
|
ff363f70b5
|
Merge branch 'refactor/keys' into 'develop'
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
|
2019-05-22 06:28:16 +00:00 |
|
William Pitcock
|
1344c85e2f
|
salmon: fix credo
|
2019-05-22 05:58:51 +00:00 |
|
rinpatch
|
cdac5efd10
|
Merge branch 'bugfix/account_view_source.note' into 'develop'
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
|
2019-05-22 05:39:01 +00:00 |
|
Haelwenn (lanodan) Monnier
|
0e2c215a00
|
MastoAPI AccountView: fill source.note with plaintext version of note
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
|
2019-05-22 07:22:19 +02:00 |
|
kaniini
|
79c2cef2fb
|
Merge branch 'mongooseim-support' into 'develop'
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
|
2019-05-22 04:06:54 +00:00 |
|
William Pitcock
|
045803346d
|
move key generation functions into Pleroma.Keys module
|
2019-05-22 03:58:15 +00:00 |
|
Aaron Tinio
|
3ab9255eda
|
Respond with a 404 Not implemented JSON error message
when requested API is not implemented
|
2019-05-22 07:15:52 +08:00 |
|
rinpatch
|
63b0b7190c
|
MastoAPI: Add GET /api/v1/polls/:id
|
2019-05-21 20:40:35 +03:00 |
|
rinpatch
|
5f67c26baf
|
Accept strings in expires_in because sasuga javascript
|
2019-05-21 17:30:51 +03:00 |
|
rinpatch
|
0407ffe75f
|
Change validation error status codes to be more appropriate
|
2019-05-21 17:12:38 +03:00 |
|
rinpatch
|
ee68244141
|
Do not stream out poll replies
|
2019-05-21 16:58:15 +03:00 |
|
rinpatch
|
d7c4d029c8
|
Restrict poll replies when fetching activiites for context
|
2019-05-21 14:35:20 +03:00 |
|
rinpatch
|
f28747858b
|
Actual vote count in poll view
|
2019-05-21 14:27:09 +03:00 |
|
rinpatch
|
a53d062730
|
Fix posting non-polls from mastofe
|
2019-05-21 14:19:03 +03:00 |
|
rinpatch
|
aafe30d94e
|
Handle poll votes
|
2019-05-21 14:12:10 +03:00 |
|
rinpatch
|
3f96b3e4b8
|
Enforce poll limits and add error handling for MastodonAPI's post endpoint
|
2019-05-21 10:54:20 +03:00 |
|
rinpatch
|
76a7429bef
|
Add poll limits to /api/v1/instance and initial state
|
2019-05-21 09:13:10 +03:00 |
|
kaniini
|
d4847b17ca
|
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
|
2019-05-20 23:30:19 +00:00 |
|
Aaron Tinio
|
eb02edcad9
|
Add virtual :thread_muted? field
that may be set when fetching activities
|
2019-05-21 00:35:46 +08:00 |
|
Sadposter
|
daeae8e2e7
|
Move default mascot configuration to config/
|
2019-05-20 16:12:55 +01:00 |
|
Sadposter
|
e81f0fc6d4
|
Add mascot get/set tests
|
2019-05-20 12:58:06 +01:00 |
|
Sadposter
|
54e9cb5c2d
|
Add API endpoints for a custom user mascot
|
2019-05-20 12:39:23 +01:00 |
|
Aaron Tinio
|
2375e9a95b
|
Add report filtering to MRF.SimplePolicy
|
2019-05-20 06:02:50 +08:00 |
|
rinpatch
|
6430cb1bf7
|
Restrict poll replies from fetch queries by default
|
2019-05-19 17:44:18 +03:00 |
|
rinpatch
|
1d90f9b969
|
Remove tags/mentions/rich text from poll options because Mastodon and
add custom emoji
|
2019-05-19 17:06:44 +03:00 |
|
rinpatch
|
5ece901af3
|
Resolve merge conflicts and remove IO.inspects
|
2019-05-18 13:37:38 +03:00 |
|
rinpatch
|
fd920c8973
|
Mastodon API: Add support for posting polls
|
2019-05-18 13:29:28 +03:00 |
|
William Pitcock
|
c4a55e167a
|
add Changelog entry
|
2019-05-17 23:00:14 +00:00 |
|
William Pitcock
|
dc08159538
|
also suppress link previews from posts marked #nsfw
|
2019-05-17 22:13:24 +00:00 |
|
William Pitcock
|
0da1233e8e
|
rich media: suppress link previews if post is marked as sensitive
|
2019-05-17 18:49:43 +00:00 |
|
William Pitcock
|
78588dbd80
|
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
|
2019-05-17 18:49:10 +00:00 |
|
lain
|
075eecec90
|
Linting.
|
2019-05-17 18:32:30 +02:00 |
|
lain
|
f959bf7aa6
|
MongooseIM: Add basic integration endpoints.
|
2019-05-17 18:21:11 +02:00 |
|
lain
|
412a3d8a0f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
|
2019-05-17 12:26:59 +02:00 |
|
lambda
|
1dcdcd8871
|
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
|
2019-05-17 10:07:51 +00:00 |
|
lambda
|
46684db84d
|
Update account_view.ex
|
2019-05-17 09:53:44 +00:00 |
|
rinpatch
|
642a67dd44
|
Render polls in statuses
|
2019-05-17 11:44:47 +03:00 |
|
Alexander Strizhakov
|
7ed682213f
|
Fix/902 random compile failing
|
2019-05-17 07:25:20 +00:00 |
|
Haelwenn (lanodan) Monnier
|
68c75a08e8
|
MastoAPI account_view.ex: requested is false when following is true
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
|
2019-05-17 07:44:09 +02:00 |
|
Aaron Tinio
|
70235ce840
|
Fix typo: s/"tags"/"tag"/g
|
2019-05-17 09:02:34 +08:00 |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
feld
|
e190b3022b
|
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
|
2019-05-16 18:57:14 +00:00 |
|
Mark Felder
|
ebb0482116
|
Merge branch 'develop' into conversations-import
|
2019-05-16 13:11:17 -05:00 |
|
lambda
|
fde30aee43
|
Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver
See merge request pleroma/pleroma!971
|
2019-05-16 13:44:22 +00:00 |
|
William Pitcock
|
c31026423c
|
publisher: use the correct queue name for outgoing federation
|
2019-05-16 04:41:27 +00:00 |
|
Aaron Tinio
|
793f1834d2
|
Use named binding to conditionally join object
|
2019-05-16 06:25:14 +08:00 |
|