3d76420512
Merge branch 'feature/pleroma-ctl-rpc' into 'develop'
...
pleroma_ctl: Run mix tasks using rpc instead of eval
See merge request pleroma/pleroma!1297
2019-06-18 01:57:32 +00:00
448d739b25
pleroma_ctl: Run mix tasks using rpc instead of eval
...
This patch changes pleroma_ctl to call into a running instance instead of spinning up
a new one for mix task execution. This significantly decreases the time needed
for mix task execution (on my machine for `pleroma_ctl user set rin --no-admin`
the difference is 0.2s vs 4.2s) and allows mix tasks to affect the
instance context, for example, this allows to clear the cache after user
deletion
2019-06-18 00:22:58 +03:00
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
2019-06-17 14:16:23 +00:00
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
2019-06-16 18:05:00 +00:00
2e2edcb461
capturing errors
2019-06-16 20:10:12 +08:00
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
efa445a75b
Merge branch 'issues/570' into 'develop'
...
[#570 ] add user:notification stream
See merge request pleroma/pleroma!1274
2019-06-16 10:33:25 +00:00
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
57d54a9f09
Merge branch 'fix/991-version-generation' into 'develop'
...
version generation
Closes #991
See merge request pleroma/pleroma!1291
2019-06-16 10:18:47 +00:00
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
549a410fda
Merge branch 'fix-for-new-isntances' into 'develop'
...
fix for new instances
See merge request pleroma/pleroma!1294
2019-06-16 10:01:15 +00:00
7a4228be5a
fix for new instances
2019-06-16 10:01:15 +00:00
451593f45e
no print version to the shell
2019-06-16 11:48:15 +08:00
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
641bcaa44e
Sanitize HTML in ReportView
...
Closes #990
2019-06-16 01:30:32 +03:00
e943905bd7
Add tests for report view
2019-06-16 01:30:14 +03:00
135c196769
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
...
MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275
2019-06-15 15:13:48 +00:00
37ee6c6e2c
Merge branch 'update/phoenix-and-plug' into 'develop'
...
Update Phoenix
See merge request pleroma/pleroma!1290
2019-06-15 15:09:14 +00:00
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
2019-06-15 13:45:50 +00:00
9b908697dd
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
...
and this leftover artifact breaks compiling now.
2019-06-15 07:04:01 -05:00
2ad5a8511d
Update Phoenix to 1.4.8
2019-06-15 07:03:26 -05:00
fb4af26d75
Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'
...
Mastodon API: Return the token needed for the chat.
See merge request pleroma/pleroma!1292
2019-06-15 09:56:01 +00:00
0632ed2f87
Apply suggestion to CHANGELOG.md
2019-06-15 09:27:27 +00:00
6745bc951c
Documentation: Document chat token response.
2019-06-15 11:11:45 +02:00
5ea6e26da0
Changelog: Document chat token.
2019-06-15 11:02:05 +02:00
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
e02f22d779
bugfix
2019-06-15 16:36:13 +08:00
501705438f
little fix
2019-06-15 16:24:49 +08:00
baf58c1234
version generation
2019-06-15 12:02:21 +08:00
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
270f09dbc2
Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'
...
Feature/905 dynamic configuration in sql
Closes #905
See merge request pleroma/pleroma!1195
2019-06-14 15:45:05 +00:00
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
b7fc722a2e
Merge branch 'fix-rate-limit-test' into 'develop'
...
Fix rate limit test
See merge request pleroma/pleroma!1289
2019-06-14 14:50:19 +00:00
ce823fa88e
Fix rate limit test
2019-06-14 19:24:31 +07:00
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
2019-06-14 11:52:04 +00:00
a971b35785
Merge branch 'issues/948-account-search' into 'develop'
...
[#948 ] /api/v1/account_search added optional parameters (limit, offset, following)
See merge request pleroma/pleroma!1270
2019-06-14 11:39:57 +00:00
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
2019-06-14 11:39:57 +00:00
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
2019-06-14 14:34:42 +03:00
f045d1437c
Merge branch 'patch-2' into 'develop'
...
Add copyright info to containment.ex
See merge request pleroma/pleroma!1286
2019-06-14 09:42:04 +00:00
58a094b605
Add copyright info to containment.ex
2019-06-14 09:26:36 +00:00
28cb9edde9
Merge branch '986-document-how-to-disable-rate-limiting' into 'develop'
...
Resolve "Document how to disable rate limiting"
Closes #986
See merge request pleroma/pleroma!1285
2019-06-14 09:26:26 +00:00
774637a2f4
Mastodon API: Document changes.
2019-06-14 11:24:09 +02:00
eac298083f
MastodonAPI: Add a way to update the background image.
2019-06-14 11:19:22 +02:00
b22b10d3aa
Improve rate limiter documentation
...
Documents how to disable rate limiting
2019-06-14 15:02:10 +07:00
00cc4880ce
Merge branch 'feature/ci-release-build' into 'develop'
...
CI: build otp releases for master and develop branches
See merge request pleroma/pleroma!1279
2019-06-14 06:56:27 +00:00
a1bbeef55c
Merge branch 'release-move-out-application-dir' into 'develop'
...
Set instance static/uploads to be outside of application directory in release config
See merge request pleroma/pleroma!1283
2019-06-14 06:40:04 +00:00
ac3d43e620
Set instance static/uploads to be outside of application directory in release config
...
In case of releases the application directory changes with each version
so the contents will not be accessible
2019-06-14 01:42:56 +03:00
8fbe1a3b92
remove the feature branch from only
2019-06-13 22:31:15 +03:00
10c067cc47
Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop'
...
pleroma_ctl: fix == instead of = and double quote the path to prevent globing
See merge request pleroma/pleroma!1282
2019-06-13 19:25:48 +00:00
0876ac05ba
pleroma_ctl: fix == instead of = and double quote the path to prevent globing
2019-06-13 22:16:57 +03:00
Haelwenn
rinpatch
Alex S
Maksim
lain
kaniini
Mark Felder
Egor Kislitsyn