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
84cc131b59
Add missing HTTP Request mocks
2019-06-04 05:46:19 +00:00
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
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
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
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
7758148990
update CHANGELOG for mrf_subchain
2019-06-04 05:37:31 +00:00
64ada7f960
fix tests
2019-06-03 22:51:14 +03:00
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
46c7e16512
updated changelog
2019-06-03 21:05:45 +03:00
f13d6c7f78
update api to set skip_thread_containment
2019-06-03 21:02:57 +03:00
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
804b6a4d8f
CommonAPI.Utils: Add tests.
2019-06-03 19:08:38 +02:00
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
2019-06-03 19:26:43 +03:00
f2c4c99e03
Remove repeated scope lists
2019-06-03 19:18:21 +03:00
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
2b664b048e
User: Add function to get AP ids from nicknames.
2019-06-03 18:16:11 +02:00
243d8ed94e
Use workaround for the heavy checkmark symbol in iOS
2019-06-03 18:28:36 +03:00
f4e2595592
Merge branch 'develop' into update-oauth-template
2019-06-03 09:12:17 -05:00
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
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
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 13:16:17 +03:00
d33d248b69
Merge branch 'fix-dokku' into 'develop'
...
Fix dokku
See merge request pleroma/pleroma!1236
2019-06-03 10:15:18 +00:00
9ded9443a3
CI: Actually push to correct repo.
2019-06-03 12:00:33 +02:00
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
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
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
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
5bd41fef8b
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
2019-06-03 10:58:37 +03:00
baefb97dc4
Add a changelog entry for polls
2019-06-03 10:55:16 +03:00
1fd8e19d76
Remove a TODO comment as the tests for poll view were written
2019-06-02 23:46:17 +03:00
2fe3a20638
Make error message about author's inability to vote more sensible
2019-06-02 23:33:15 +03:00
c47da0e65d
Add tests for poll view
2019-06-02 23:25:33 +03:00
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
2019-06-02 23:24:48 +03:00
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
2019-06-02 17:45:32 +03:00
561a21986d
formatting
2019-06-02 10:29:15 +00:00
c724d8df98
docs: document mrf_subchain
2019-06-02 10:14:56 +00:00
38a275b31f
test: add tests for subchain policy
2019-06-02 10:08:51 +00:00
4087ccdab8
mrf: add subchain policy
2019-06-02 10:07:42 +00:00
edf772d41e
mrf: allow a policy chain to be specified when filtering
2019-06-02 09:44:42 +00:00
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
52e09807d4
reverse proxy: clean up some @hackney leftovers
2019-06-02 09:09:58 +00:00
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
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
cfa588e357
Fix Credo issues
2019-06-01 21:42:29 +03:00
6bc9e5c020
Mastodon API: Refresh the object before rendering it after voting
2019-06-01 21:41:49 +03:00
444406167b
Mastodon API: actually check for poll votes
2019-06-01 21:41:23 +03:00
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
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
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