fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-30 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
5396 commits 26 branches 108 tags 316 MiB
Commit graph

379 commits

Author SHA1 Message Date
sadposter ee7459ec8c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-06 15:54:38 +01:00
sadposter febd2fdfd3 add emojo 2019-06-06 15:54:32 +01:00
Egor f82382de22 [#943] Make the unauthenticated users limitation optional 2019-06-06 12:17:49 +00:00
Ivan Tashkinov 3eefb274f4 OAuth consumer: tests fix, comments, Keycloak config notes. 2019-06-05 13:02:13 +03:00
sadposter 9bc0f51e51 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-05 01:25:52 +01:00
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop' 
MRF: subchain policy

See merge request pleroma/pleroma!1233
 2019-06-04 05:49:54 +00:00
kaniini a536f515dd Merge branch 'ueberauth_config_extension' into 'develop' 
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification

See merge request pleroma/pleroma!1234
 2019-06-04 05:42:49 +00:00
Maksim Pechnikov 080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03:00
sadposter c4151feb48 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-03 13:29:35 +01:00
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 11:14:52 +03:00
Ivan Tashkinov 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. 2019-06-02 17:45:32 +03:00
William Pitcock 561a21986d formatting 2019-06-02 10:29:15 +00:00
William Pitcock 4087ccdab8 mrf: add subchain policy 2019-06-02 10:07:42 +00:00
rinpatch 65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
Haelwenn f1890d2cac Merge branch 'dokku' into 'develop' 
Dokku CI support - On-Demand review instances

See merge request pleroma/pleroma!1216
 2019-05-31 23:09:06 +00:00
lain 4e45f7bc87 CI: Add auto-deployment via dokku. 2019-05-31 10:55:35 +02:00
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
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state 2019-05-21 09:13:10 +03: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