rinpatch
103f205097
Merge branch 'feature/896-toggling-confirmation' into 'develop'
...
Feature/896 toggling confirmation
Closes #896
See merge request pleroma/pleroma!1165
2019-05-16 13:23:42 +00:00
Alexander Strizhakov
73ae58fdfa
Feature/896 toggling confirmation
2019-05-16 13:23:41 +00:00
kaniini
a2771869a3
Merge branch 'docs/update_debian_instructions' into 'develop'
...
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
2019-05-16 05:03:37 +00:00
kaniini
2180136039
Merge branch 'chore/docs-update' into 'develop'
...
Update Admin API docs
See merge request pleroma/pleroma!1162
2019-05-16 05:02:50 +00:00
kaniini
3a96c29c65
Merge branch 'fix/slow-federation' into 'develop'
...
publisher: use the correct queue name for outgoing federation
See merge request pleroma/pleroma!1163
2019-05-16 04:50:15 +00:00
William Pitcock
c31026423c
publisher: use the correct queue name for outgoing federation
2019-05-16 04:41:27 +00:00
Angelina Filippova
107c83ab2b
Note that nicknames is an array
2019-05-16 01:48:53 +03:00
Angelina Filippova
0641e685c1
Note that nicknames is an array
2019-05-16 01:46:43 +03:00
Angelina Filippova
1d2923e5d0
Update tag/untag docs
2019-05-16 01:36:26 +03:00
PolymerWitch
0ae15c2306
Added package to dependency list
...
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
2019-05-15 15:36:20 -07:00
kaniini
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
2019-05-15 15:42:21 +00:00
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
William Pitcock
4429c1b7da
tests: fixup
2019-05-15 15:29:42 +00:00
kaniini
18f2d2024d
Merge branch 'prevent-public-answers' into 'develop'
...
Prevent public answers to direct messages
See merge request pleroma/pleroma!1159
2019-05-15 15:26:07 +00:00
lambda
0992094bd6
Merge branch 'cleanup' into 'develop'
...
Remove unused queue from the config
See merge request pleroma/pleroma!1158
2019-05-15 15:23:13 +00:00
lambda
3456f643a8
Merge branch 'ci/coverage' into 'develop'
...
Excoveralls for code coverage
See merge request pleroma/pleroma!1156
2019-05-15 15:19:20 +00:00
feld
f831acf912
Excoveralls for code coverage
2019-05-15 15:19:20 +00:00
lain
7a92e701b9
CommonAPI: Visibility refactor.
2019-05-15 16:35:33 +02:00
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
2019-05-15 16:30:08 +02:00
rinpatch
153c15cdb2
Merge branch 'legacy-fe-config' into 'develop'
...
remove deprecated PleromaFE configuration
See merge request pleroma/pleroma!1152
2019-05-15 10:56:19 +00:00
Sachin Joshi
ee22fff5ac
remove deprecated PleromaFE configuration
2019-05-15 15:29:59 +05:45
Egor Kislitsyn
6c9f45f4dd
Remove unused queue from the config
2019-05-15 14:40:20 +07:00
Aaron Tinio
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
2019-05-15 05:09:32 +08:00
Aaron Tinio
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
2019-05-15 05:09:29 +08:00
lambda
c133c32ef0
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'
...
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
See merge request pleroma/pleroma!1154
2019-05-14 20:33:35 +00:00
rinpatch
2ca8d20053
Fix rate-limiting tests
2019-05-14 23:16:34 +03:00
William Pitcock
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
rinpatch
38f3393e93
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
...
As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)
Also in this commit: minor changelog improvements.
2019-05-14 22:48:16 +03:00
lambda
8e721706c2
Merge branch 'fix-the-build' into 'develop'
...
Group def perform() together to fix the build
See merge request pleroma/pleroma!1151
2019-05-14 17:40:08 +00:00
Mark Felder
1caa6331ea
Group def perform() together to fix the build
2019-05-14 12:33:03 -05:00
lambda
fa4bd898f1
Merge branch 'fix/gopher' into 'develop'
...
gopher: fix rendering of post content (closes #895 )
Closes #895
See merge request pleroma/pleroma!1150
2019-05-14 15:41:37 +00:00
William Pitcock
51325fd60c
gopher: fix rendering of post content ( closes #895 )
2019-05-14 15:35:06 +00:00
lambda
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
2019-05-14 15:27:34 +00:00
William Pitcock
ac3a3abf6b
clean up follow/block imports a little
2019-05-14 15:07:38 +00:00
kaniini
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
2019-05-14 14:58:45 +00:00
lambda
37dc1cc431
Merge branch 'refactor/oauth_controller_response' into 'develop'
...
Refactoring oauth response.
See merge request pleroma/pleroma!1149
2019-05-14 14:49:45 +00:00
Maksim
52297920e7
Refactoring oauth response.
2019-05-14 14:49:45 +00:00
kaniini
4e69d1239a
Merge branch 'feature/disable-account' into 'develop'
...
[#694 ] allow users to disable their own account
See merge request pleroma/pleroma!895
2019-05-14 12:06:08 +00:00
Egor Kislitsyn
c1665fd94d
Update CHANGELOG
2019-05-14 18:40:21 +07:00
Egor Kislitsyn
b92c004ea8
Reuse query from User.restrict_deactivated/1
2019-05-14 18:29:10 +07:00
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
Aaron Tinio
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
2019-05-14 06:40:59 +08:00
rinpatch
cdcdbd88da
Merge branch 'changelog/adminfe' into 'develop'
...
Document AdminFE in changelog
See merge request pleroma/pleroma!1147
2019-05-13 21:27:07 +00:00
Mark Felder
6e1538cb76
Document AdminFE in changelog
2019-05-13 16:11:06 -05:00
kaniini
119b758412
Merge branch 'bump-mastoapi' into 'develop'
...
Bump Mastodon API level
See merge request pleroma/pleroma!1146
2019-05-13 21:07:50 +00:00
Mark Felder
bbacdf2352
Bump Mastodon API level
2019-05-13 15:52:16 -05:00
kaniini
a0ec7326f9
Merge branch 'refactor/jason' into 'develop'
...
Switch to Jason over Poison
See merge request pleroma/pleroma!1145
2019-05-13 20:47:26 +00:00
Mark Felder
498bfdf403
Switch to Jason over Poison
2019-05-13 15:37:38 -05:00
William Pitcock
69a9e0563c
user: migrate follow/blocks import to job queue
2019-05-13 19:36:00 +00:00
William Pitcock
57d11ac9db
activitypub: move post rich media fetching to job queue
2019-05-13 19:36:00 +00:00