Commit graph

5333 commits

Author SHA1 Message Date
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
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
lain 8ac104cde0 Merge branch 'fix/fetch-votes-restrict-create' into 'develop'
Restrict `get_existing_votes` to only get Create activities

See merge request pleroma/pleroma!1244
2019-06-04 10:55:45 +00:00
rinpatch bbff7554de Add tests for get_existing_votes 2019-06-04 13:47:53 +03: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
Maksim Pechnikov 96121315f3 fix merge 2019-06-04 12:41:24 +03:00
kaniini d977d73b91 Merge branch 'fix/poll-performance' into 'develop'
utils: access inReplyTo as an explicit string when fetching poll results`

See merge request pleroma/pleroma!1243
2019-06-04 08:55:04 +00: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
kaniini 0f8f63c6bb Merge branch 'feature/nodeinfo-polls' into 'develop'
nodeinfo: add pollLimits to metadata

See merge request pleroma/pleroma!1242
2019-06-04 06:29:03 +00: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 59f6e794e1 Merge branch 'fix/mock-errors-in-tests' into 'develop'
Add missing HTTP Request mocks

See merge request pleroma/pleroma!1231
2019-06-04 05:46:20 +00:00
Sergey Suprunenko 84cc131b59 Add missing HTTP Request mocks 2019-06-04 05:46:19 +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
kaniini a536f515dd 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
2019-06-04 05:42:49 +00:00
kaniini 2be142ebec Merge branch 'update-oauth-template-css-fix' into 'develop'
Update oauth template css fix

See merge request pleroma/pleroma!1238
2019-06-04 05:39:38 +00:00
kaniini 94d12a79c4 Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
Add index on inReplyTo for objects

See merge request pleroma/pleroma!1240
2019-06-04 05:38:13 +00:00
William Pitcock 7758148990 update CHANGELOG for mrf_subchain 2019-06-04 05:37:31 +00:00
Maksim Pechnikov 64ada7f960 fix tests 2019-06-03 22:51:14 +03:00
lambda 662e95e948 Merge branch 'fix/tag-timeline-missing-index' into 'develop'
Add missing tag index on objects

Closes #867

See merge request pleroma/pleroma!1241
2019-06-03 19:03:35 +00:00
Maksim Pechnikov 46c7e16512 updated changelog 2019-06-03 21:05:45 +03:00
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment 2019-06-03 21:02:57 +03:00
rinpatch cfc3c62b2f 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.
2019-06-03 20:42:13 +03:00
rinpatch be56801dda Add index on inReplyTo for objects
Fixes the performance of `get_existing_votes`
2019-06-03 19:26:43 +03:00
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
Maksim Pechnikov 080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03: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
Ivan Tashkinov 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. 2019-06-02 17:45:32 +03:00
William Pitcock 561a21986d formatting 2019-06-02 10:29:15 +00:00
William Pitcock c724d8df98 docs: document mrf_subchain 2019-06-02 10:14:56 +00:00