kPherox
|
45e21a9df4
|
Rename fields to fields_attributes
|
2019-08-25 07:34:11 +09:00 |
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
2019-08-21 21:24:35 +03:00 |
Ariadne Conill
|
76bb3572dd
|
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
|
2019-08-20 20:20:12 +00:00 |
lain
|
74f7f308f8
|
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
|
2019-08-20 19:34:47 +00:00 |
lain
|
8340fe8fcc
|
Merge branch 'digest-template' into 'develop'
Improve digest email template
See merge request pleroma/pleroma!1565
|
2019-08-20 12:55:51 +00:00 |
lain
|
ef43016b2c
|
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
|
2019-08-20 12:44:14 +00:00 |
lain
|
d2c9befc64
|
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
|
2019-08-19 17:00:59 +00:00 |
Sergey Suprunenko
|
75a5dd41ee
|
Add more tests for Database tasks and DigestEmailWorker
|
2019-08-19 16:10:00 +00:00 |
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
2019-08-19 15:34:29 +00:00 |
lain
|
49ae3191df
|
Merge branch 'hotfix/user_unfollow' into 'develop'
[#1177] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
|
2019-08-19 14:36:10 +00:00 |
Maksim Pechnikov
|
e652cef76b
|
removes duplicates from relay subscription list
|
2019-08-19 13:39:18 +03:00 |
Ariadne Conill
|
a2fdc32368
|
tests: activitypub: fix typo
|
2019-08-18 22:31:59 +00:00 |
kaniini
|
475fcb3e6c
|
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
|
2019-08-18 21:59:22 +00:00 |
kaniini
|
18c8c8d176
|
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
|
2019-08-18 21:57:55 +00:00 |
Sadposter
|
58c1391c4d
|
use commonAPI in tests
|
2019-08-18 22:54:40 +01:00 |
Sadposter
|
94e336d9d5
|
clear follow requests when blocking a user
|
2019-08-18 20:30:57 +01:00 |
Maksim Pechnikov
|
3315a2a1c3
|
fixed User.unfollow with synchronization external user
|
2019-08-16 15:58:42 +03:00 |
lain
|
7ab2dbbdb6
|
Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
|
2019-08-16 12:55:33 +00:00 |
Mark Felder
|
6a3b1a526e
|
max_body_size -> max_body_length, as it should be
|
2019-08-15 15:34:41 -05:00 |
rinpatch
|
a4a3e3becd
|
Hide muted theads from home/public timelines unless `with_muted` is set
|
2019-08-15 17:37:30 +03:00 |
Maxim Filippov
|
ec969eec51
|
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
|
2019-08-14 22:45:32 +00:00 |
Maxim Filippov
|
2b94ae3b39
|
Do not check if actor is active when deleting a user
|
2019-08-15 01:35:29 +03:00 |
stwf
|
d81f63845a
|
Implement Pleroma.Stats as GenServer
|
2019-08-14 11:59:33 -04:00 |
stwf
|
51bdf0cab6
|
use default child_specs
|
2019-08-14 11:55:17 -04:00 |
lain
|
d3af9e19ed
|
Conversations: Load relations in one query.
|
2019-08-14 17:01:11 +02:00 |
Egor Kislitsyn
|
4b7f1c6995
|
Improve digest email template
|
2019-08-14 20:46:05 +07:00 |
lain
|
560dbad538
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
2019-08-14 15:30:40 +02:00 |
Egor Kislitsyn
|
e457fcc479
|
Add `:max_remote_account_fields` config option
|
2019-08-14 14:58:06 +07:00 |
Egor Kislitsyn
|
f7bbf99caa
|
Use info.fields instead of source_data for remote users
|
2019-08-14 14:52:54 +07:00 |
Egor Kislitsyn
|
2c35d4b0b0
|
Add configurable account field name length limit
|
2019-08-14 14:52:54 +07:00 |
Egor Kislitsyn
|
db3c05f6b4
|
Add configurable account field value length limit
|
2019-08-14 14:52:54 +07:00 |
Egor Kislitsyn
|
7d6f8a7fd7
|
Linkify custom fields values in ActivityPub.UserViewx
|
2019-08-14 14:52:54 +07:00 |
Egor Kislitsyn
|
5178f960c3
|
Support user attachment update in Transmogrifier
|
2019-08-14 14:52:54 +07:00 |
Egor Kislitsyn
|
88598c9baf
|
Add profile custom fields to ActivityPub.UserView
|
2019-08-14 14:52:54 +07:00 |
Egor Kislitsyn
|
d6094b405d
|
Fix tests
|
2019-08-14 14:52:54 +07:00 |
Egor Kislitsyn
|
e0ac5c7a66
|
Add custom profile fields
|
2019-08-14 14:52:54 +07:00 |
rinpatch
|
9ef31767f2
|
Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary
See merge request pleroma/pleroma!1559
|
2019-08-13 22:51:15 +00:00 |
kaniini
|
c3a54cc34d
|
Merge branch 'feature/mrf-describe' into 'develop'
MRF describe API
See merge request pleroma/pleroma!1561
|
2019-08-13 22:46:19 +00:00 |
rinpatch
|
83a3de8cc4
|
Merge branch 'length-limit-bio' into 'develop'
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
|
2019-08-13 22:40:13 +00:00 |
Ariadne Conill
|
4244e17de0
|
fix credo
|
2019-08-13 22:36:24 +00:00 |
Ariadne Conill
|
10fef2fcee
|
tests: fix up nodeinfo tests
|
2019-08-13 22:32:40 +00:00 |
Ariadne Conill
|
dd0b71ea6d
|
tests: add tests for MRF.describe()
|
2019-08-13 22:19:15 +00:00 |
Ariadne Conill
|
7089400675
|
test: add mock MRF module for describe() testing
|
2019-08-13 21:29:15 +00:00 |
Maksim
|
fea4d89e9f
|
tests for Web/ActivityPub/Relay
|
2019-08-13 21:12:59 +00:00 |
Maksim
|
04da1166db
|
tests for /web/mastodon_api/mastodon_api.ex
|
2019-08-13 21:12:37 +00:00 |
Ariadne Conill
|
f7e3b7ff75
|
tests: add tests for mrf_vocabulary
|
2019-08-13 20:55:42 +00:00 |
lain
|
511ccea5aa
|
ConversationView: Align parameter names with other views.
|
2019-08-12 14:23:06 +02:00 |
lain
|
60231ec7bd
|
Conversation: Add endpoint to get a conversation by id.
|
2019-08-12 13:58:04 +02:00 |
lain
|
23c46f7e72
|
Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
|
2019-08-12 12:51:08 +02:00 |
Ariadne Conill
|
9cfc289594
|
MRF: ensure that subdomain_match calls are case-insensitive
|
2019-08-10 21:19:26 +00:00 |