sadposter
df500529e2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-30 12:12:08 +01:00
sadposter
d19b99009b
add instance resources
2019-05-30 12:11:56 +01:00
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
2019-05-25 04:43:11 +00:00
William Pitcock
80d55d428f
tests: websub: check only that signature validation succeeds or fails
2019-05-25 04:34:16 +00:00
William Pitcock
9bec891eb4
kill @httpoison
2019-05-25 04:24:21 +00:00
William Pitcock
baf72d6c58
mrf: simple policy: add the ability to strip avatars and banners from user profiles
2019-05-22 18:53:12 +00:00
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
William Pitcock
16b260fb19
add mix task to prune the object database using a configured retention period
2019-05-21 21:38:56 +00:00
Mark Felder
75c7bb9289
Additional reserved usernames
2019-05-20 17:18:59 -05:00
sadposter
3357780ea8
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-20 19:36:57 +01:00
Sadposter
daeae8e2e7
Move default mascot configuration to config/
2019-05-20 16:12:55 +01:00
Aaron Tinio
2375e9a95b
Add report filtering to MRF.SimplePolicy
2019-05-20 06:02:50 +08:00
William Pitcock
290f5b2cfe
config: make sending the user agent configurable, disable sending the user agent in tests
2019-05-17 20:28:58 +00:00
lain
8784a7d1b4
RUM: Set rum status by the environment.
2019-05-17 15:21:24 +02:00
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
lain
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
2019-05-17 11:33:04 +02:00
lain
e39c190f04
Configuration: disable migration lock.
2019-05-17 11:30:35 +02:00
sadposter
c0b7bc2927
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-16 20:24:43 +01:00
sadposter
7f40b66d51
add emojo
2019-05-16 20:24:29 +01:00
Alex S
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07: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
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
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
2019-05-15 15:28:01 +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
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
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
sadposter
cf2741e067
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-13 12:09:35 +01:00
William Pitcock
fedaca15a3
websub: adapt to work as a federator publishing module
2019-05-12 05:04:24 +00:00
William Pitcock
179293e51c
salmon: refactor to work as a federator publishing module
2019-05-12 05:04:21 +00:00
William Pitcock
10695a28d2
federator: publisher: add publish() wrapper
2019-05-12 05:04:16 +00:00
sadposter
4c11429520
Add mayushii
2019-05-12 00:51:01 +01:00
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
Alex S
f46295faa7
unused config paramater
2019-05-07 09:07:06 +07:00
sadposter
db0fefc167
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-06 20:40:42 +01:00
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
Sadposter
fa632f9c37
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-04-29 12:56:53 +01:00
William Pitcock
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00