stwf
c43152f6c1
fix formatting
2019-08-14 14:01:11 -04:00
stwf
d81f63845a
Implement Pleroma.Stats as GenServer
2019-08-14 11:59:33 -04:00
stwf
574856ef01
streamline Streamer pings
2019-08-14 11:58:32 -04:00
stwf
15ef521009
Isolate OAuth.Token.CleanWorker
2019-08-14 11:57:50 -04:00
stwf
51bdf0cab6
use default child_specs
2019-08-14 11:55:17 -04:00
lain
4a5b0965a0
Merge branch 'fix/revert-tzdata-1.8' into 'develop'
...
Switch to pre-1.8 version of tzdata.
Closes #1183
See merge request pleroma/pleroma!1566
2019-08-14 15:07:03 +00:00
lain
d3af9e19ed
Conversations: Load relations in one query.
2019-08-14 17:01:11 +02:00
rinpatch
6a101f0361
Switch to pre-1.8 version of tzdata.
...
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
2019-08-14 17:05:21 +03:00
Egor Kislitsyn
c9970feee2
Fix compatibility with Elixir 1.8
2019-08-14 21:03:25 +07:00
lain
f73212b2a3
Conversation: Render new participation on update.
2019-08-14 15:56:15 +02:00
lain
df81abb68c
Conversations: Use correct oauth paths for extended api.
2019-08-14 15:55:43 +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
a2e1db5632
Increase max account fields limits
2019-08-14 14:58:38 +07:00
Egor Kislitsyn
672fcbc7b7
Limit custom fields for old remote users
2019-08-14 14:58:06 +07: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
8ab87ce40b
Apply suggestion to CHANGELOG.md
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
a22f540fc4
Add custom fields to TwitterAPI.UserView
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
069951722f
Update CHANGELOG
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
744e2ce8b4
Merge branch 'backport/describe-api-changelog' into 'develop'
...
Backport the describe API changelog entry to develop
See merge request pleroma/pleroma!1564
2019-08-14 02:12:09 +00:00
Ariadne Conill
8fab9c5c1c
update changelog to cover MRF describe API.
2019-08-14 04:59:31 +03:00
kaniini
5c35d2f1d8
Merge branch 'preload-user-timelines' into 'develop'
...
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
2019-08-14 01:04:07 +00:00
kaniini
fe42844bda
Merge branch 'get-context-optimizations' into 'develop'
...
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
2019-08-14 01:03:54 +00:00
rinpatch
8202f1634a
Preload thread mutes/bookmarks in user_statuses
2019-08-14 03:02:09 +03:00
rinpatch
f4e087ee48
Preload thread mutes/bookmarks in get_context
...
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
2019-08-14 02:36:54 +03: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
Ariadne Conill
5983f98f26
docs tweak
2019-08-13 22:40:18 +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
abfbcfdcb3
mrf_vocabulary: add describe API support
2019-08-13 22:39:26 +00:00
Ariadne Conill
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
Haelwenn
47c20ab796
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
...
Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558
2019-08-13 22:32:49 +00:00
Ariadne Conill
10fef2fcee
tests: fix up nodeinfo tests
2019-08-13 22:32:40 +00:00
kaniini
f5aacaf4d3
Merge branch 'feature/nicer-safe-render-errors' into 'develop'
...
Nicer formatting for safe_render errors
See merge request pleroma/pleroma!1560
2019-08-13 22:25:15 +00:00
Ariadne Conill
dd0b71ea6d
tests: add tests for MRF.describe()
2019-08-13 22:19:15 +00:00
rinpatch
46d7bef7e7
Nicer formatting for safe_render errors
2019-08-14 01:15:18 +03:00
Ariadne Conill
f305e97eeb
nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff
2019-08-13 22:09:02 +00:00
Ariadne Conill
c574b7a1fc
MRF: add describe() to all modules, add base MRF configuration to base describe()
2019-08-13 22:08:58 +00:00
Ariadne Conill
7089400675
test: add mock MRF module for describe() testing
2019-08-13 21:29:15 +00:00
Ariadne Conill
694bc43123
MRF: add describe() for gathering and describing the MRF configuration
2019-08-13 21:26:24 +00:00
kaniini
943da97d6b
Merge branch 'test/web_activity_pub_relay' into 'develop'
...
tests for Web/ActivityPub/Relay
See merge request pleroma/pleroma!1557
2019-08-13 21:12:59 +00:00
Maksim
fea4d89e9f
tests for Web/ActivityPub/Relay
2019-08-13 21:12:59 +00:00
