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
5 years ago
kaniini
2be142ebec
Merge branch 'update-oauth-template-css-fix' into 'develop'
...
Update oauth template css fix
See merge request pleroma/pleroma!1238
5 years ago
kaniini
94d12a79c4
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
...
Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240
5 years ago
William Pitcock
7758148990
update CHANGELOG for mrf_subchain
5 years ago
Roman Chvanikov
f6036ce3b9
Fix tests
5 years ago
Roman Chvanikov
7718a215e9
Update changelog
5 years ago
Roman Chvanikov
bd325132ca
Fix tests
5 years ago
Roman Chvanikov
3e17610587
Add task to test emails
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov
64ada7f960
fix tests
5 years ago
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
5 years ago
Maksim Pechnikov
46c7e16512
updated changelog
5 years ago
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
5 years ago
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.
5 years ago
lain
804b6a4d8f
CommonAPI.Utils: Add tests.
5 years ago
rinpatch
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
5 years ago
eugenijm
f2c4c99e03
Remove repeated scope lists
5 years ago
lain
80d4d83aac
CommonAPI: Add explicit addressing.
5 years ago
lain
2b664b048e
User: Add function to get AP ids from nicknames.
5 years ago
eugenijm
243d8ed94e
Use workaround for the heavy checkmark symbol in iOS
5 years ago
Mark Felder
f4e2595592
Merge branch 'develop' into update-oauth-template
5 years ago
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
5 years ago
rinpatch
9789e000b0
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
...
Polls 2 Electric Boogalo
Closes #657
See merge request pleroma/pleroma!1190
5 years ago
rinpatch
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch
d33d248b69
Merge branch 'fix-dokku' into 'develop'
...
Fix dokku
See merge request pleroma/pleroma!1236
5 years ago
lain
9ded9443a3
CI: Actually push to correct repo.
5 years ago
lambda
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
5 years ago
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
5 years ago
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.
5 years ago
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch
5bd41fef8b
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
5 years ago
rinpatch
baefb97dc4
Add a changelog entry for polls
5 years ago
rinpatch
1fd8e19d76
Remove a TODO comment as the tests for poll view were written
5 years ago
rinpatch
2fe3a20638
Make error message about author's inability to vote more sensible
5 years ago
rinpatch
c47da0e65d
Add tests for poll view
5 years ago
rinpatch
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
5 years ago
Ivan Tashkinov
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
William Pitcock
561a21986d
formatting
5 years ago
William Pitcock
c724d8df98
docs: document mrf_subchain
5 years ago
William Pitcock
38a275b31f
test: add tests for subchain policy
5 years ago
William Pitcock
4087ccdab8
mrf: add subchain policy
5 years ago
William Pitcock
edf772d41e
mrf: allow a policy chain to be specified when filtering
5 years ago
kaniini
1236c5dbf5
Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'
...
reverse proxy: clean up some @hackney leftovers
See merge request pleroma/pleroma!1232
5 years ago
William Pitcock
52e09807d4
reverse proxy: clean up some @hackney leftovers
5 years ago
kaniini
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
5 years ago
Sachin Joshi
e394fc2eef
fix the flaky test for users creation by admin
5 years ago
rinpatch
67bcc3ccc4
Remove index on object name used for excluding poll votes (replaced by just rewriting Note to Answer)
5 years ago
rinpatch
cfa588e357
Fix Credo issues
5 years ago
rinpatch
6bc9e5c020
Mastodon API: Refresh the object before rendering it after voting
5 years ago
rinpatch
444406167b
Mastodon API: actually check for poll votes
5 years ago