itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
5845 commits 3 branches 2 tags 276 MiB
Commit graph

5845 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
William Pitcock
38a275b31f test: add tests for subchain policy 2019-06-02 10:08:51 +00:00
William Pitcock
4087ccdab8 mrf: add subchain policy 2019-06-02 10:07:42 +00:00
William Pitcock
edf772d41e mrf: allow a policy chain to be specified when filtering 2019-06-02 09:44:42 +00: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
feld
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
feld
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
feld
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
lain
7591a8928d Setting Store: Document in changelog. 2019-05-31 19:15:44 +02: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
lain
10fe02acef Documentation: Document Settings store mechanism. 2019-05-31 14:59:24 +02:00
lain
7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store. 2019-05-31 14:50:18 +02:00
lain
aaad85c4d9 AccountView: settings -> settings_store 2019-05-31 14:49:46 +02:00
lain
eb2963bc43 User: Add settings store to Info, AccountView 
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
 2019-05-31 14:27:15 +02: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
feld
3cc00fd2e9 Merge branch 'fix/install-guide' into 'develop' 
Formatting

See merge request pleroma/pleroma!1219
 2019-05-30 21:35:31 +00:00
feld
88414151b4 Formatting 2019-05-30 21:35:31 +00:00
feld
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
feld
75a37a68d4 Install docs should clone from master branch 2019-05-30 21:30:42 +00:00
feld
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