eugenijm
f2c4c99e03
Remove repeated scope lists
2019-06-03 19:18:21 +03: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
rinpatch
9789e000b0
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
...
Polls 2 Electric Boogalo
Closes #657
See merge request pleroma/pleroma!1190
2019-06-03 12:19:19 +00:00
rinpatch
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 13:16:17 +03:00
rinpatch
d33d248b69
Merge branch 'fix-dokku' into 'develop'
...
Fix dokku
See merge request pleroma/pleroma!1236
2019-06-03 10:15:18 +00:00
lain
9ded9443a3
CI: Actually push to correct repo.
2019-06-03 12:00:33 +02: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
e71da4468e
Merge branch 'chore/ci-speedup' into 'develop'
...
CI: Replace mix test and mix coveralls with just mix coveralls
See merge request pleroma/pleroma!1235
2019-06-03 08:35:24 +00:00
rinpatch
c3bcc4f6a2
CI: Replace mix test and mix coveralls with just mix coveralls
...
`mix coveralls` runs the tests by itself, exits with failure if one of them
fails and accepts the same args, so there is no reason to run two of
them at the same time.
2019-06-03 11:24:03 +03: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
baefb97dc4
Add a changelog entry for polls
2019-06-03 10:55:16 +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
c47da0e65d
Add tests for poll view
2019-06-02 23:25:33 +03:00
rinpatch
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
2019-06-02 23:24:48 +03:00
kaniini
1236c5dbf5
Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'
...
reverse proxy: clean up some @hackney leftovers
See merge request pleroma/pleroma!1232
2019-06-02 09:19:15 +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
67bcc3ccc4
Remove index on object name used for excluding poll votes (replaced by just rewriting Note to Answer)
2019-06-01 21:49:18 +03:00
rinpatch
cfa588e357
Fix Credo issues
2019-06-01 21:42:29 +03: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
kaniini
14ef35f402
Merge branch 'bugfix/remove-others-follower-collections' into 'develop'
...
Remove all follower collections but actor's from "cc"
Closes #858
See merge request pleroma/pleroma!1225
2019-06-01 03:26:46 +00:00
Sergey Suprunenko
2bbc2a801f
Remove all follower collections but actor's from "cc"
2019-06-01 03:26:45 +00:00
kaniini
d46cc7896e
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
...
Bugfix: remove vanilla flavour
See merge request pleroma/pleroma!1228
2019-06-01 03:26:05 +00:00
kaniini
88df629689
Merge branch 'add-missing-mock' into 'develop'
...
add the missing mock file [Fix the warning]
See merge request pleroma/pleroma!1229
2019-06-01 03:25:33 +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
Sachin Joshi
d4304a3945
add the missing mock file
2019-06-01 08:37:10 +05:45
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
Haelwenn
f1890d2cac
Merge branch 'dokku' into 'develop'
...
Dokku CI support - On-Demand review instances
See merge request pleroma/pleroma!1216
2019-05-31 23:09:06 +00:00
f8d4c02431
Merge branch 'doc/mongoose-im-config' into 'develop'
...
Sample Mongoose IM config
See merge request pleroma/pleroma!1226
2019-05-31 20:36:33 +00:00
abedcca349
Sample Mongoose IM config.
...
Change domain, ensure paths to PEM files are correct, and this is good to go.
2019-05-31 20:36:33 +00:00
lambda
3415962d60
Merge branch 'fix/mastodon-user-search' into 'develop'
...
Fix/mastodon user search
See merge request pleroma/pleroma!1224
2019-05-31 18:46:57 +00: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
lambda
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
2019-05-31 13:26:48 +00:00
rinpatch
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
2019-05-31 15:25:17 +03:00
rinpatch
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
2019-05-31 14:17:05 +03:00
lain
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
2019-05-31 11:27:14 +02:00
lain
4e45f7bc87
CI: Add auto-deployment via dokku.
2019-05-31 10:55:35 +02:00
3cc00fd2e9
Merge branch 'fix/install-guide' into 'develop'
...
Formatting
See merge request pleroma/pleroma!1219
2019-05-30 21:35:31 +00:00
88414151b4
Formatting
2019-05-30 21:35:31 +00:00
3c1c478125
Merge branch 'fix/install-guide' into 'develop'
...
Install docs should clone from master branch
See merge request pleroma/pleroma!1218
2019-05-30 21:30:42 +00:00
75a37a68d4
Install docs should clone from master branch
2019-05-30 21:30:42 +00:00
73a7420c23
Merge branch 'fix/ogp-missing-data' into 'develop'
...
Replace missing non-nullable Card attributes with empty strings
See merge request pleroma/pleroma!1217
2019-05-30 21:03:31 +00:00
