sadposter [Wed, 5 Jun 2019 00:25:52 +0000 (01:25 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn [Tue, 4 Jun 2019 15:46:38 +0000 (15:46 +0000)]
Merge branch 'remove-tag-warning' into 'develop'
Mix: Swallow git error messages during version number handling.
See merge request pleroma/pleroma!1247
Haelwenn [Tue, 4 Jun 2019 15:34:55 +0000 (15:34 +0000)]
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
lain [Tue, 4 Jun 2019 14:44:56 +0000 (16:44 +0200)]
Mix: Swallow git error messages during version number handling.
Otherwise sometimes a 'fatal' message will be printed, confusing users.
lain [Tue, 4 Jun 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'issue/941' into 'develop'
[#941] add option skip_thread_containment
See merge request pleroma/pleroma!1237
Maksim Pechnikov [Tue, 4 Jun 2019 12:20:24 +0000 (15:20 +0300)]
update ActivityPub#fetch_activities_query
Maksim Pechnikov [Tue, 4 Jun 2019 12:06:58 +0000 (15:06 +0300)]
Merge branch 'develop' into issue/941
Maksim Pechnikov [Tue, 4 Jun 2019 12:04:36 +0000 (15:04 +0300)]
update ActivityPub#fetch_activities_query
lain [Tue, 4 Jun 2019 11:58:36 +0000 (13:58 +0200)]
Participations: Filter out participations without activities.
Haelwenn [Tue, 4 Jun 2019 11:26:42 +0000 (11:26 +0000)]
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
lain [Tue, 4 Jun 2019 10:55:45 +0000 (10:55 +0000)]
Merge branch 'fix/fetch-votes-restrict-create' into 'develop'
Restrict `get_existing_votes` to only get Create activities
See merge request pleroma/pleroma!1244
rinpatch [Tue, 4 Jun 2019 10:47:53 +0000 (13:47 +0300)]
Add tests for get_existing_votes
rinpatch [Tue, 4 Jun 2019 10:38:24 +0000 (13:38 +0300)]
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
lain [Tue, 4 Jun 2019 10:01:21 +0000 (12:01 +0200)]
Emoji: Don't die when files are present in the emoji folder.
rinpatch [Tue, 4 Jun 2019 09:42:10 +0000 (12:42 +0300)]
Restrict `get_existing_votes` to only get Create activities
Maksim Pechnikov [Tue, 4 Jun 2019 09:41:24 +0000 (12:41 +0300)]
fix merge
kaniini [Tue, 4 Jun 2019 08:55:04 +0000 (08:55 +0000)]
Merge branch 'fix/poll-performance' into 'develop'
utils: access inReplyTo as an explicit string when fetching poll results`
See merge request pleroma/pleroma!1243
William Pitcock [Tue, 4 Jun 2019 08:45:03 +0000 (08:45 +0000)]
utils: access inReplyTo as an explicit string when fetching poll results`
Maksim Pechnikov [Tue, 4 Jun 2019 06:49:08 +0000 (09:49 +0300)]
Merge branch 'develop' into issue/941
kaniini [Tue, 4 Jun 2019 06:29:03 +0000 (06:29 +0000)]
Merge branch 'feature/nodeinfo-polls' into 'develop'
nodeinfo: add pollLimits to metadata
See merge request pleroma/pleroma!1242
William Pitcock [Tue, 4 Jun 2019 06:19:44 +0000 (06:19 +0000)]
nodeinfo: add pollLimits to metadata
kaniini [Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)]
Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy
See merge request pleroma/pleroma!1233
kaniini [Tue, 4 Jun 2019 05:46:20 +0000 (05:46 +0000)]
Merge branch 'fix/mock-errors-in-tests' into 'develop'
Add missing HTTP Request mocks
See merge request pleroma/pleroma!1231
Sergey Suprunenko [Tue, 4 Jun 2019 05:46:19 +0000 (05:46 +0000)]
Add missing HTTP Request mocks
kaniini [Tue, 4 Jun 2019 05:43:43 +0000 (05:43 +0000)]
Merge branch 'generic-fe-settings' into 'develop'
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
kaniini [Tue, 4 Jun 2019 05:42:49 +0000 (05:42 +0000)]
Merge branch 'ueberauth_config_extension' into 'develop'
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
kaniini [Tue, 4 Jun 2019 05:39:38 +0000 (05:39 +0000)]
Merge branch 'update-oauth-template-css-fix' into 'develop'
Update oauth template css fix
See merge request pleroma/pleroma!1238
kaniini [Tue, 4 Jun 2019 05:38:13 +0000 (05:38 +0000)]
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240
William Pitcock [Tue, 4 Jun 2019 05:37:31 +0000 (05:37 +0000)]
update CHANGELOG for mrf_subchain
Maksim Pechnikov [Mon, 3 Jun 2019 19:51:14 +0000 (22:51 +0300)]
fix tests
lambda [Mon, 3 Jun 2019 19:03:35 +0000 (19:03 +0000)]
Merge branch 'fix/tag-timeline-missing-index' into 'develop'
Add missing tag index on objects
Closes #867
See merge request pleroma/pleroma!1241
Maksim Pechnikov [Mon, 3 Jun 2019 18:05:45 +0000 (21:05 +0300)]
updated changelog
Maksim Pechnikov [Mon, 3 Jun 2019 18:02:02 +0000 (21:02 +0300)]
update api to set skip_thread_containment
rinpatch [Mon, 3 Jun 2019 17:42:08 +0000 (20:42 +0300)]
Add missing tag index on objects
The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.
rinpatch [Mon, 3 Jun 2019 16:26:43 +0000 (19:26 +0300)]
Add index on inReplyTo for objects
Fixes the performance of `get_existing_votes`
eugenijm [Mon, 3 Jun 2019 15:58:04 +0000 (18:58 +0300)]
Remove repeated scope lists
eugenijm [Mon, 3 Jun 2019 15:00:32 +0000 (18:00 +0300)]
Use workaround for the heavy checkmark symbol in iOS
Mark Felder [Mon, 3 Jun 2019 14:12:17 +0000 (09:12 -0500)]
Merge branch 'develop' into update-oauth-template
Maksim Pechnikov [Mon, 3 Jun 2019 13:04:39 +0000 (16:04 +0300)]
add option skip_thread_containment
sadposter [Mon, 3 Jun 2019 12:29:35 +0000 (13:29 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Mon, 3 Jun 2019 12:19:19 +0000 (12:19 +0000)]
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
Polls 2 Electric Boogalo
Closes #657
See merge request pleroma/pleroma!1190
rinpatch [Mon, 3 Jun 2019 10:16:17 +0000 (13:16 +0300)]
Merge branch 'develop' into feature/polls-2-electric-boogalo
rinpatch [Mon, 3 Jun 2019 10:15:18 +0000 (10:15 +0000)]
Merge branch 'fix-dokku' into 'develop'
Fix dokku
See merge request pleroma/pleroma!1236
lain [Mon, 3 Jun 2019 09:47:10 +0000 (11:47 +0200)]
CI: Actually push to correct repo.
lambda [Mon, 3 Jun 2019 09:48:37 +0000 (09:48 +0000)]
Merge branch 'align-mastodon-conversations' into 'develop'
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
rinpatch [Mon, 3 Jun 2019 08:35:24 +0000 (08:35 +0000)]
Merge branch 'chore/ci-speedup' into 'develop'
CI: Replace mix test and mix coveralls with just mix coveralls
See merge request pleroma/pleroma!1235
rinpatch [Mon, 3 Jun 2019 08:24:03 +0000 (11:24 +0300)]
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.
rinpatch [Mon, 3 Jun 2019 08:14:52 +0000 (11:14 +0300)]
Merge branch 'develop' into feature/polls-2-electric-boogalo
rinpatch [Mon, 3 Jun 2019 07:58:37 +0000 (10:58 +0300)]
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
rinpatch [Mon, 3 Jun 2019 07:55:16 +0000 (10:55 +0300)]
Add a changelog entry for polls
rinpatch [Sun, 2 Jun 2019 20:46:17 +0000 (23:46 +0300)]
Remove a TODO comment as the tests for poll view were written
rinpatch [Sun, 2 Jun 2019 20:30:36 +0000 (23:30 +0300)]
Make error message about author's inability to vote more sensible
rinpatch [Sun, 2 Jun 2019 20:25:33 +0000 (23:25 +0300)]
Add tests for poll view
rinpatch [Sun, 2 Jun 2019 20:24:48 +0000 (23:24 +0300)]
Refresh the object in CommonAPI.vote instead of MastoAPI controller
Ivan Tashkinov [Sun, 2 Jun 2019 14:45:32 +0000 (17:45 +0300)]
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
William Pitcock [Sun, 2 Jun 2019 10:29:15 +0000 (10:29 +0000)]
formatting
William Pitcock [Sun, 2 Jun 2019 10:14:56 +0000 (10:14 +0000)]
docs: document mrf_subchain
William Pitcock [Sun, 2 Jun 2019 10:08:51 +0000 (10:08 +0000)]
test: add tests for subchain policy
William Pitcock [Sun, 2 Jun 2019 09:50:16 +0000 (09:50 +0000)]
mrf: add subchain policy
William Pitcock [Sun, 2 Jun 2019 09:44:42 +0000 (09:44 +0000)]
mrf: allow a policy chain to be specified when filtering
kaniini [Sun, 2 Jun 2019 09:19:15 +0000 (09:19 +0000)]
Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'
reverse proxy: clean up some @hackney leftovers
See merge request pleroma/pleroma!1232
William Pitcock [Sun, 2 Jun 2019 09:09:58 +0000 (09:09 +0000)]
reverse proxy: clean up some @hackney leftovers
kaniini [Sun, 2 Jun 2019 08:25:37 +0000 (08:25 +0000)]
Merge branch 'feature/notification-control-part-2' into 'develop'
notification controls, part 2
See merge request pleroma/pleroma!1204
rinpatch [Sat, 1 Jun 2019 18:49:18 +0000 (21:49 +0300)]
Remove index on object name used for excluding poll votes (replaced by just rewriting Note to Answer)
rinpatch [Sat, 1 Jun 2019 18:42:29 +0000 (21:42 +0300)]
Fix Credo issues
rinpatch [Sat, 1 Jun 2019 18:41:49 +0000 (21:41 +0300)]
Mastodon API: Refresh the object before rendering it after voting
rinpatch [Sat, 1 Jun 2019 18:41:23 +0000 (21:41 +0300)]
Mastodon API: actually check for poll votes
rinpatch [Sat, 1 Jun 2019 13:29:58 +0000 (16:29 +0300)]
Resolve merge conflicts
rinpatch [Sat, 1 Jun 2019 13:07:01 +0000 (16:07 +0300)]
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
kaniini [Sat, 1 Jun 2019 03:39:13 +0000 (03:39 +0000)]
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
kaniini [Sat, 1 Jun 2019 03:26:46 +0000 (03:26 +0000)]
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
Sergey Suprunenko [Sat, 1 Jun 2019 03:26:45 +0000 (03:26 +0000)]
Remove all follower collections but actor's from "cc"
kaniini [Sat, 1 Jun 2019 03:26:05 +0000 (03:26 +0000)]
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
Bugfix: remove vanilla flavour
See merge request pleroma/pleroma!1228
kaniini [Sat, 1 Jun 2019 03:25:33 +0000 (03:25 +0000)]
Merge branch 'add-missing-mock' into 'develop'
add the missing mock file [Fix the warning]
See merge request pleroma/pleroma!1229
William Pitcock [Sat, 1 Jun 2019 03:23:21 +0000 (03:23 +0000)]
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
Sachin Joshi [Sat, 1 Jun 2019 02:52:10 +0000 (08:37 +0545)]
add the missing mock file
Haelwenn (lanodan) Monnier [Fri, 31 May 2019 23:42:46 +0000 (01:42 +0200)]
Remove now useless flavours switching
Haelwenn (lanodan) Monnier [Fri, 31 May 2019 23:37:11 +0000 (01:37 +0200)]
mastodon_api_controller.ex: Remove vanilla from supported_flavours
Haelwenn [Fri, 31 May 2019 23:09:06 +0000 (23:09 +0000)]
Merge branch 'dokku' into 'develop'
Dokku CI support - On-Demand review instances
See merge request pleroma/pleroma!1216
feld [Fri, 31 May 2019 20:36:33 +0000 (20:36 +0000)]
Merge branch 'doc/mongoose-im-config' into 'develop'
Sample Mongoose IM config
See merge request pleroma/pleroma!1226
feld [Fri, 31 May 2019 20:36:33 +0000 (20:36 +0000)]
Sample Mongoose IM config.
Change domain, ensure paths to PEM files are correct, and this is good to go.
lambda [Fri, 31 May 2019 18:46:57 +0000 (18:46 +0000)]
Merge branch 'fix/mastodon-user-search' into 'develop'
Fix/mastodon user search
See merge request pleroma/pleroma!1224
feld [Fri, 31 May 2019 18:46:57 +0000 (18:46 +0000)]
Mastodon API search default value for "resolve" is false
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
lain [Fri, 31 May 2019 17:15:44 +0000 (19:15 +0200)]
Setting Store: Document in changelog.
sadposter [Fri, 31 May 2019 15:53:59 +0000 (16:53 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
lambda [Fri, 31 May 2019 13:26:48 +0000 (13:26 +0000)]
Merge branch 'hotfix/leaking-lists' into 'develop'
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
lain [Fri, 31 May 2019 12:58:28 +0000 (14:58 +0200)]
Documentation: Document Settings store mechanism.
lain [Fri, 31 May 2019 12:50:18 +0000 (14:50 +0200)]
MastodonAPI: Add extension to set and get pleroma_settings_store.
lain [Fri, 31 May 2019 12:49:46 +0000 (14:49 +0200)]
AccountView: settings -> settings_store
lain [Fri, 31 May 2019 12:27:15 +0000 (14:27 +0200)]
User: Add settings store to Info, AccountView
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
rinpatch [Fri, 31 May 2019 12:25:17 +0000 (15:25 +0300)]
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
rinpatch [Fri, 31 May 2019 11:17:05 +0000 (14:17 +0300)]
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
lain [Fri, 31 May 2019 09:27:14 +0000 (11:27 +0200)]
Mastodon Conversation API: Don't return own account in 'accounts'.
lain [Fri, 31 May 2019 08:55:35 +0000 (10:55 +0200)]
CI: Add auto-deployment via dokku.
feld [Thu, 30 May 2019 21:35:31 +0000 (21:35 +0000)]
Merge branch 'fix/install-guide' into 'develop'
Formatting
See merge request pleroma/pleroma!1219
feld [Thu, 30 May 2019 21:35:31 +0000 (21:35 +0000)]
Formatting
feld [Thu, 30 May 2019 21:30:42 +0000 (21:30 +0000)]
Merge branch 'fix/install-guide' into 'develop'
Install docs should clone from master branch
See merge request pleroma/pleroma!1218
feld [Thu, 30 May 2019 21:30:42 +0000 (21:30 +0000)]
Install docs should clone from master branch
feld [Thu, 30 May 2019 21:03:31 +0000 (21:03 +0000)]
Merge branch 'fix/ogp-missing-data' into 'develop'
Replace missing non-nullable Card attributes with empty strings
See merge request pleroma/pleroma!1217
Sergey Suprunenko [Thu, 30 May 2019 21:03:31 +0000 (21:03 +0000)]
Replace missing non-nullable Card attributes with empty strings
projects / akkoma / log