Roman Chvanikov
|
01fe5abad1
|
Resolve conflicts
|
2019-06-07 01:20:50 +03:00 |
|
kaniini
|
62cdf701f4
|
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'
Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252
|
2019-06-06 14:54:29 +00:00 |
|
lain
|
cb2bcee842
|
User Search: Boost friends more strongly.
|
2019-06-06 16:18:27 +02:00 |
|
rinpatch
|
9ae8f012a5
|
Switch to manual Supervisor child specifications instead of Supervisor.Spec
Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html
|
2019-06-06 16:37:44 +03:00 |
|
Egor
|
f82382de22
|
[#943] Make the unauthenticated users limitation optional
|
2019-06-06 12:17:49 +00:00 |
|
kaniini
|
3f6da9c45a
|
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
|
2019-06-05 15:52:40 +00:00 |
|
kaniini
|
a511d2f900
|
Merge branch 'improve-search' into 'develop'
[#943] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
|
2019-06-05 15:51:32 +00:00 |
|
lain
|
e1370ba131
|
Utils: Use update_follow_state_for_all when appropriate.
|
2019-06-05 16:51:28 +02:00 |
|
lain
|
ad19bfc7fe
|
Utils: Split update_follow_state and update_follow_state_for_all.
|
2019-06-05 16:43:35 +02:00 |
|
lain
|
076c9ae40e
|
User: Remove superfluous maybe_follow.
|
2019-06-05 14:24:31 +02:00 |
|
lain
|
3115b64cfe
|
Transmogrifier: Add tests for incoming follows to locked accounts.
|
2019-06-05 14:10:46 +02:00 |
|
rinpatch
|
50afe5ab9e
|
Merge branch 'fix-stuck-follows' into 'develop'
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
|
2019-06-05 11:07:54 +00:00 |
|
lain
|
024dfdc39c
|
Typo + Linting.
|
2019-06-05 12:45:28 +02:00 |
|
lain
|
8b9a0dd4a7
|
User: Don't error out when following a user that's already followed.
This leads to a few situations where it is impossible to follow a user.
|
2019-06-05 12:06:45 +02:00 |
|
Ivan Tashkinov
|
3eefb274f4
|
OAuth consumer: tests fix, comments, Keycloak config notes.
|
2019-06-05 13:02:13 +03:00 |
|
Egor Kislitsyn
|
1cb245c982
|
Fix formatting
|
2019-06-05 16:55:17 +07:00 |
|
Egor Kislitsyn
|
5b04f07a1e
|
Limit search for unauthenticated users to local users only
|
2019-06-05 16:51:04 +07:00 |
|
Egor Kislitsyn
|
94b9e9d844
|
Update benchmark mix task
|
2019-06-05 16:37:43 +07:00 |
|
Egor Kislitsyn
|
93397fce3d
|
Contain search for unauthenticated users
|
2019-06-05 16:37:43 +07:00 |
|
kaniini
|
e4babb1c9f
|
Merge branch 'explicit-addressing' into 'develop'
Explicit addressing
See merge request pleroma/pleroma!1239
|
2019-06-05 08:28:20 +00:00 |
|
Roman Chvanikov
|
b1b1a270e8
|
Fix conflict
|
2019-06-05 02:45:21 +03:00 |
|
Haelwenn
|
ab4915edcb
|
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
|
2019-06-04 15:34:55 +00:00 |
|
lain
|
18c35d84fd
|
NodeInfo: Add explicit addressing to nodeinfo.
|
2019-06-04 17:14:25 +02:00 |
|
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 |
|
lain
|
a3a7178b60
|
Participations: Filter out participations without activities.
|
2019-06-04 13:58:36 +02: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 |
|
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 |
|
lain
|
4cab98b7bf
|
Merge remote-tracking branch 'origin/develop' into explicit-addressing
|
2019-06-04 11:23:46 +02: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 |
|
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
|
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 |
|
Roman Chvanikov
|
3e17610587
|
Add task to test emails
|
2019-06-04 02:48:21 +03:00 |
|
Mark Felder
|
6ef145b4fc
|
Merge branch 'develop' into feature/digest-email
|
2019-06-03 15:29:53 -05:00 |
|
Maksim Pechnikov
|
f13d6c7f78
|
update api to set skip_thread_containment
|
2019-06-03 21:02:57 +03:00 |
|
eugenijm
|
f2c4c99e03
|
Remove repeated scope lists
|
2019-06-03 19:18:21 +03:00 |
|
lain
|
80d4d83aac
|
CommonAPI: Add explicit addressing.
|
2019-06-03 18:17:08 +02:00 |
|
lain
|
2b664b048e
|
User: Add function to get AP ids from nicknames.
|
2019-06-03 18:16:11 +02: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
|
dc91bcc0af
|
Merge branch 'develop' into feature/polls-2-electric-boogalo
|
2019-06-03 13:16:17 +03: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
|
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 |
|