Ekaterina Vaartis
|
092b1b1453
|
Do not unfollow muted users
|
2019-02-19 21:49:55 +03:00 |
|
Ekaterina Vaartis
|
ad2cf4fd86
|
Add test for mastodon muting endpoints
|
2019-02-19 21:49:55 +03:00 |
|
Ekaterina Vaartis
|
da64ea4a55
|
Implement mastodon mutes endpoint
Aparently i forgot to add it, it gets a list of muted users
|
2019-02-19 21:49:55 +03:00 |
|
Ekaterina Vaartis
|
f41f017bbc
|
Implement muting, add it to the mastodon API
|
2019-02-19 21:49:55 +03:00 |
|
href
|
f4bfc628ca
|
Player: allow styles on CSP, loop videos
|
2019-02-19 18:56:57 +01:00 |
|
href
|
aa9af1d639
|
CSP: Allow iframes on embed player
|
2019-02-19 18:19:13 +01:00 |
|
Mark Felder
|
2d21ea1a0e
|
Merge branch 'develop' into fix/twittercards
|
2019-02-19 16:58:28 +00:00 |
|
href
|
10a11f083c
|
Embed player suitable for Twitter Cards
|
2019-02-19 17:47:48 +01:00 |
|
eugenijm
|
25b9e7a8c3
|
Added admin API for changing user activation status
|
2019-02-19 19:37:02 +03:00 |
|
Ivan Tashkinov
|
c0ecbf6669
|
[#468] Merged upstream/develop.
|
2019-02-19 19:10:55 +03:00 |
|
lambda
|
1dd718e83c
|
Merge branch 'set-cache-on-user-tag-update' into 'develop'
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
|
2019-02-19 14:20:58 +00:00 |
|
lambda
|
f25a3f4f78
|
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
|
2019-02-19 14:08:19 +00:00 |
|
lambda
|
f53dc5ee08
|
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
|
2019-02-19 14:07:16 +00:00 |
|
rinpatch
|
109b01a631
|
mark ap_id unique_constraint
|
2019-02-19 13:52:15 +03:00 |
|
rinpatch
|
96dcacade1
|
properly check for follower address in is_private?
|
2019-02-19 13:23:13 +03:00 |
|
eugenijm
|
fc35481445
|
Update user cache when user tags are updated
|
2019-02-19 10:43:38 +03:00 |
|
kaniini
|
833161b5d2
|
Merge branch 'feature/jobs' into 'develop'
Job Queue
See merge request pleroma/pleroma!732
|
2019-02-18 19:43:06 +00:00 |
|
kaniini
|
a39a094cda
|
Merge branch 'patch-image-description' into 'develop'
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
|
2019-02-18 04:11:46 +00:00 |
|
kaniini
|
7456338ed3
|
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
|
2019-02-18 04:02:41 +00:00 |
|
kaniini
|
c23bd05737
|
Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
|
2019-02-18 04:01:51 +00:00 |
|
kaniini
|
cd019a5927
|
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
|
2019-02-18 04:01:26 +00:00 |
|
kaniini
|
3f38a05571
|
Merge branch 'csv-export' into 'develop'
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
|
2019-02-18 03:59:46 +00:00 |
|
Maxim Filippov
|
fd17a0cc9b
|
Fix test
|
2019-02-18 00:10:48 +03:00 |
|
Maxim Filippov
|
94708d6370
|
Render only "id", "valid_until" and "app_name" in TokenView
|
2019-02-17 23:57:35 +03:00 |
|
lambda
|
28a249bef2
|
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'
mix.exs: Add docs/Clients.md to docs.extras
See merge request pleroma/pleroma!835
|
2019-02-17 17:53:57 +00:00 |
|
lambda
|
a2f4fc49fe
|
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
|
2019-02-17 17:39:45 +00:00 |
|
lambda
|
79e503b3f5
|
Merge branch 'docker-speedup' into 'develop'
Docker speedup
See merge request pleroma/pleroma!837
|
2019-02-17 17:38:25 +00:00 |
|
lambda
|
f26582aae9
|
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
|
2019-02-17 17:37:48 +00:00 |
|
lambda
|
6a8a8e90da
|
Update Differences-in-MastodonAPI-Responses.md
|
2019-02-17 17:01:22 +00:00 |
|
lambda
|
ae84af4ad0
|
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
|
2019-02-17 16:57:57 +00:00 |
|
lain
|
71c8c60ded
|
More speedup, test fixes.
|
2019-02-17 17:47:24 +01:00 |
|
rinpatch
|
d0a94f98e0
|
more tests for HellthreadPolicy
|
2019-02-17 14:33:44 +03:00 |
|
Ivan Tashkinov
|
d3fe2c8ec6
|
[#468] Formatting fix.
|
2019-02-17 14:07:35 +03:00 |
|
Ivan Tashkinov
|
bc4f77b10b
|
[#468] Merged upstream/develop, resolved conflicts.
|
2019-02-17 14:07:04 +03:00 |
|
Ivan Tashkinov
|
dcf24a3233
|
[#468] Refactored OAuth scopes' defaults & missing selection handling.
|
2019-02-17 13:49:14 +03:00 |
|
lain
|
fa191a658b
|
Speed up docker postgres.
|
2019-02-17 11:46:51 +01:00 |
|
rinpatch
|
8f98d970c1
|
Fix recipient count in hellthread policy
|
2019-02-17 13:46:40 +03:00 |
|
rinpatch
|
ccd30a1875
|
Fix formating
|
2019-02-17 12:07:49 +03:00 |
|
rinpatch
|
006bec8c6a
|
Add differences in MastoAPI responses to mix.exs extras
|
2019-02-17 10:34:00 +03:00 |
|
Haelwenn (lanodan) Monnier
|
72a4272d84
|
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
|
2019-02-16 19:52:46 +01:00 |
|
Haelwenn (lanodan) Monnier
|
4df455f69b
|
[MastoAPI] Add switching of frontend flavours
|
2019-02-16 19:50:13 +01:00 |
|
Haelwenn (lanodan) Monnier
|
25ab90edea
|
mix.exs: Add docs/Clients.md to docs.extras
[ci skip]
|
2019-02-16 19:39:03 +01:00 |
|
rinpatch
|
c788f1543c
|
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too
|
2019-02-16 21:14:07 +03:00 |
|
rinpatch
|
3b14119471
|
Merge branch 'welcome-message' into 'develop'
Add optional welcome message.
See merge request pleroma/pleroma!832
|
2019-02-16 17:39:04 +00:00 |
|
rinpatch
|
96c725328b
|
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
|
2019-02-16 20:38:25 +03:00 |
|
lain
|
27375e5575
|
WelcomeMessage: specify that the user has to be local.
|
2019-02-16 17:25:06 +01:00 |
|
lain
|
269d3e1ca6
|
WelcomeMessage: Get rid of Ecto reference.
|
2019-02-16 17:24:48 +01:00 |
|
lain
|
f469a8610f
|
Check that the welcome message is sent from the correct user.
|
2019-02-16 17:24:31 +01:00 |
|
lain
|
38e15930cb
|
Add option to return all friends in twitter api.
Mainly useful for user export.
|
2019-02-16 17:01:15 +01:00 |
|
lain
|
d812a347ca
|
Add optional welcome message.
|
2019-02-16 16:42:34 +01:00 |
|