Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,720 Commits 1 Branch 0 Tags 222 MiB
da4923f2e5
Commit Graph

8720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sachin Joshi
e394fc2eef fix the flaky test for users creation by admin 2019-06-02 09:49:59 +05:45
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
Sachin Joshi
ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users 2019-06-01 11:42:37 +05:45
Sachin Joshi
5534d4c676 make bulk user creation from admin works as a transaction 2019-06-01 11:17:53 +05:45
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
Sergey Suprunenko
1690be991e Replace missing non-nullable Card attributes with empty strings 2019-05-30 21:03:31 +00:00
lambda
91ac8b075b Merge branch 'use-pleroma-config' into 'develop' 
Use Pleroma.Config everywhere

See merge request pleroma/pleroma!1214
 2019-05-30 13:16:08 +00:00
Egor Kislitsyn
99f70c7e20 Use Pleroma.Config everywhere 2019-05-30 15:33:58 +07:00
kaniini
ab3f3af7cf Merge branch 'revert-57e58d26' into 'develop' 
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"

See merge request pleroma/pleroma!1212
 2019-05-29 22:19:13 +00:00
kaniini
6aec0d1b58 Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" 
This reverts merge request !1209
 2019-05-29 22:10:16 +00:00
Roman Chvanikov
5cee2fe9fe Replace Application.get_env/2 with Pleroma.Config.get/1 2019-05-29 21:31:27 +03:00
Mark Felder
e912f81c82 Update docs to reflect we accept nickname for id for both of these endpoints 2019-05-29 12:22:14 -05:00
Mark Felder
e7edfd9fec Permit fetching statuses from API with nickname or id 2019-05-29 12:20:18 -05:00
Roman Chvanikov
ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
lambda
7e889786b8 Merge branch 'fix/mastodon-search-limit' into 'develop' 
Default search limit should be 40

See merge request pleroma/pleroma!1210
 2019-05-29 14:25:53 +00:00
lambda
6fb67b74da Merge branch 'issue/936' into 'develop' 
[#936] fix tests

See merge request pleroma/pleroma!1208
 2019-05-29 14:04:58 +00:00
Maksim
db94294dfb [#936] fix tests 2019-05-29 14:04:58 +00:00