rinpatch
|
50afe5ab9e
|
Merge branch 'fix-stuck-follows' into 'develop'
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
|
2019-06-05 11:07:54 +00:00 |
|
lain
|
024dfdc39c
|
Typo + Linting.
|
2019-06-05 12:45:28 +02:00 |
|
lain
|
8b9a0dd4a7
|
User: Don't error out when following a user that's already followed.
This leads to a few situations where it is impossible to follow a user.
|
2019-06-05 12:06:45 +02:00 |
|
Ivan Tashkinov
|
3eefb274f4
|
OAuth consumer: tests fix, comments, Keycloak config notes.
|
2019-06-05 13:02:13 +03:00 |
|
kaniini
|
e4babb1c9f
|
Merge branch 'explicit-addressing' into 'develop'
Explicit addressing
See merge request pleroma/pleroma!1239
|
2019-06-05 08:28:20 +00:00 |
|
Haelwenn
|
ab4915edcb
|
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
|
2019-06-04 15:34:55 +00:00 |
|
lain
|
18c35d84fd
|
NodeInfo: Add explicit addressing to nodeinfo.
|
2019-06-04 17:14:25 +02:00 |
|
Maksim Pechnikov
|
1e7bb69a95
|
update ActivityPub#fetch_activities_query
|
2019-06-04 15:21:18 +03:00 |
|
Maksim Pechnikov
|
d3d1704e84
|
Merge branch 'develop' into issue/941
|
2019-06-04 15:06:58 +03:00 |
|
Maksim Pechnikov
|
0acfcf6c52
|
update ActivityPub#fetch_activities_query
|
2019-06-04 15:04:36 +03:00 |
|
lain
|
a3a7178b60
|
Participations: Filter out participations without activities.
|
2019-06-04 13:58:36 +02:00 |
|
Haelwenn
|
0eb7464c10
|
Merge branch 'emoji-loader-fix' into 'develop'
Emoji: Don't die when files are present in the emoji folder.
Closes #957
See merge request pleroma/pleroma!1245
|
2019-06-04 11:26:42 +00:00 |
|
rinpatch
|
17383861ed
|
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
|
2019-06-04 13:38:32 +03:00 |
|
lain
|
e74581a5c4
|
Emoji: Don't die when files are present in the emoji folder.
|
2019-06-04 12:14:43 +02:00 |
|
rinpatch
|
29b022bb59
|
Restrict get_existing_votes to only get Create activities
|
2019-06-04 12:42:10 +03:00 |
|
lain
|
4cab98b7bf
|
Merge remote-tracking branch 'origin/develop' into explicit-addressing
|
2019-06-04 11:23:46 +02:00 |
|
William Pitcock
|
37a4ba0624
|
utils: access inReplyTo as an explicit string when fetching poll results`
|
2019-06-04 08:45:03 +00:00 |
|
Maksim Pechnikov
|
4f2e359687
|
Merge branch 'develop' into issue/941
|
2019-06-04 09:49:08 +03:00 |
|
William Pitcock
|
1c6cf0a348
|
nodeinfo: add pollLimits to metadata
|
2019-06-04 06:19:44 +00:00 |
|
kaniini
|
9f0d0d0805
|
Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy
See merge request pleroma/pleroma!1233
|
2019-06-04 05:49:54 +00:00 |
|
kaniini
|
9d2563a3de
|
Merge branch 'generic-fe-settings' into 'develop'
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
|
2019-06-04 05:43:43 +00:00 |
|
Maksim Pechnikov
|
f13d6c7f78
|
update api to set skip_thread_containment
|
2019-06-03 21:02:57 +03:00 |
|
eugenijm
|
f2c4c99e03
|
Remove repeated scope lists
|
2019-06-03 19:18:21 +03:00 |
|
lain
|
80d4d83aac
|
CommonAPI: Add explicit addressing.
|
2019-06-03 18:17:08 +02:00 |
|
lain
|
2b664b048e
|
User: Add function to get AP ids from nicknames.
|
2019-06-03 18:16:11 +02:00 |
|
eugenijm
|
243d8ed94e
|
Use workaround for the heavy checkmark symbol in iOS
|
2019-06-03 18:28:36 +03:00 |
|
Mark Felder
|
f4e2595592
|
Merge branch 'develop' into update-oauth-template
|
2019-06-03 09:12:17 -05:00 |
|
Maksim Pechnikov
|
080e1aa70e
|
add option skip_thread_containment
|
2019-06-03 16:13:37 +03:00 |
|
rinpatch
|
dc91bcc0af
|
Merge branch 'develop' into feature/polls-2-electric-boogalo
|
2019-06-03 13:16:17 +03:00 |
|
lambda
|
314758c25b
|
Merge branch 'align-mastodon-conversations' into 'develop'
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
|
2019-06-03 09:48:37 +00:00 |
|
rinpatch
|
026b245dbc
|
Merge branch 'develop' into feature/polls-2-electric-boogalo
|
2019-06-03 11:14:52 +03:00 |
|
rinpatch
|
5bd41fef8b
|
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
|
2019-06-03 10:58:37 +03:00 |
|
rinpatch
|
1fd8e19d76
|
Remove a TODO comment as the tests for poll view were written
|
2019-06-02 23:46:17 +03:00 |
|
rinpatch
|
2fe3a20638
|
Make error message about author's inability to vote more sensible
|
2019-06-02 23:33:15 +03:00 |
|
rinpatch
|
e3c460353d
|
Refresh the object in CommonAPI.vote instead of MastoAPI controller
|
2019-06-02 23:24:48 +03:00 |
|
William Pitcock
|
561a21986d
|
formatting
|
2019-06-02 10:29:15 +00:00 |
|
William Pitcock
|
4087ccdab8
|
mrf: add subchain policy
|
2019-06-02 10:07:42 +00:00 |
|
William Pitcock
|
edf772d41e
|
mrf: allow a policy chain to be specified when filtering
|
2019-06-02 09:44:42 +00:00 |
|
William Pitcock
|
52e09807d4
|
reverse proxy: clean up some @hackney leftovers
|
2019-06-02 09:09:58 +00:00 |
|
kaniini
|
5402d04e3c
|
Merge branch 'feature/notification-control-part-2' into 'develop'
notification controls, part 2
See merge request pleroma/pleroma!1204
|
2019-06-02 08:25:37 +00:00 |
|
rinpatch
|
6bc9e5c020
|
Mastodon API: Refresh the object before rendering it after voting
|
2019-06-01 21:41:49 +03:00 |
|
rinpatch
|
444406167b
|
Mastodon API: actually check for poll votes
|
2019-06-01 21:41:23 +03:00 |
|
rinpatch
|
65db5e9f52
|
Resolve merge conflicts
|
2019-06-01 16:29:58 +03:00 |
|
rinpatch
|
300d94c628
|
Add poll votes
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
|
2019-06-01 16:17:46 +03:00 |
|
kaniini
|
e706b42f51
|
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
|
2019-06-01 03:39:13 +00:00 |
|
Sergey Suprunenko
|
2bbc2a801f
|
Remove all follower collections but actor's from "cc"
|
2019-06-01 03:26:45 +00:00 |
|
William Pitcock
|
f2efe24cf8
|
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
|
2019-06-01 03:24:08 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5d3ece2861
|
Remove now useless flavours switching
|
2019-06-01 01:44:10 +02:00 |
|
Haelwenn (lanodan) Monnier
|
aa9f52edd2
|
mastodon_api_controller.ex: Remove vanilla from supported_flavours
|
2019-06-01 01:44:10 +02:00 |
|
|
|
6872c5f88f
|
Mastodon API search default value for "resolve" is false
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
|
2019-05-31 18:46:57 +00:00 |
|
