alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,407 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

6407 Commits

Author SHA1 Message Date
Egor Kislitsyn fd076def0a Fix typo 2019-08-27 02:24:14 +07:00
rinpatch 3da278375d Merge branch 'fix/sporadic-test' into 'develop' 
Fix sporadic test

Closes #1221

See merge request pleroma/pleroma!1602
 2019-08-26 14:44:11 +00:00
Maxim Filippov c338224c93 Fix sporadic test 2019-08-26 17:24:22 +03:00
kaniini 8c7b1c076c Merge branch 'disable-rate-limiter' into 'develop' 
Disable rate limiter by default

Closes #1217

See merge request pleroma/pleroma!1601
 2019-08-26 14:01:51 +00:00
Egor Kislitsyn 66c1966688 Disable rate limiter by default 2019-08-26 20:36:44 +07:00
kaniini 6dc24422dc Merge branch 'issue/1177' into 'develop' 
[#1177] fixed unfollow for relay actor

See merge request pleroma/pleroma!1589
 2019-08-25 19:43:27 +00:00
kaniini 897bd7a15e Merge branch 'feature/moderation-log' into 'develop' 
Log admin/moderator actions

See merge request pleroma/pleroma!1582
 2019-08-25 19:39:37 +00:00
Maxim Filippov 37dd3867bb Log admin/moderator actions 2019-08-25 19:39:37 +00:00
kaniini 503139b343 Merge branch 'fix-all-custom-fields-deleted' into 'develop' 
Fix not to use unupdated attachments when all fields are deleted

See merge request pleroma/pleroma!1596
 2019-08-25 19:35:28 +00:00
kPherox d74efde94e
Update test for custom profile fields 2019-08-26 02:06:52 +09:00
lain 5e7098cf69 Merge branch 'bugfix/rel_me_missing_mocks' into 'develop' 
Implement missing mocks for rel=me

See merge request pleroma/pleroma!1598
 2019-08-25 16:12:13 +00:00
rinpatch 5853d9c843 Merge branch 'bugfix/log_non_implemented_mocks' into 'develop' 
HttpRequestMock: Log non-implemented mock responses

Closes #1088

See merge request pleroma/pleroma!1416
 2019-08-25 08:09:18 +00:00
Haelwenn (lanodan) Monnier 20c3f613d8
HttpRequestMock: Remove useless `error = error` 2019-08-25 08:55:29 +02:00
Haelwenn (lanodan) Monnier f3b1266273
user_test.exs: fix rel=me tests 2019-08-25 08:48:38 +02:00
Haelwenn (lanodan) Monnier 211e163770
Implement missing mocks for rel=me 2019-08-25 08:03:25 +02:00
Haelwenn (lanodan) Monnier e22737ffb5
HttpRequestMock: Improve non-implemented error message 2019-08-25 07:33:46 +02:00
Haelwenn (lanodan) Monnier 18668447d2
HttpRequestMock: Log mock errors as warnings 2019-08-25 07:33:13 +02:00
kPherox 3549cd9754
Change to use attachment only when fields do not exist 2019-08-25 01:28:38 +09:00
lain 90986667ce Merge branch 'admin-create-users' into 'develop' 
user creation admin api will create multiple users

See merge request pleroma/pleroma!1170
 2019-08-24 16:04:19 +00:00
kaniini 83aeb60900 Merge branch 'activity-expiration' into 'develop' 
Activity expiration

See merge request pleroma/pleroma!1595
 2019-08-24 16:01:57 +00:00
lain 1d7033d962 Update CHANGELOG.md 2019-08-24 15:33:17 +00:00
lain 24994f3e0c Activity expiration: Fix docs. 2019-08-24 17:28:19 +02:00
lain efb8818e9e Activity Expiration: Switch to 'expires_in' system. 2019-08-24 17:22:48 +02:00
lain 1692fa8945 ActivityExpirationWorker: Fix merge issues. 2019-08-24 17:22:26 +02:00
Maksim Pechnikov 654d291b6d update tests 2019-08-24 17:41:53 +03:00
Maksim Pechnikov 6062017493 put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json") 2019-08-24 17:17:17 +03:00
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
Maksim Pechnikov 73bcbf4fa3 add tests 2019-08-24 11:03:13 +03:00
kaniini bc78a875c8 Merge branch 'fix-default-config-account_field' into 'develop' 
Fix default config of account fields length

See merge request pleroma/pleroma!1593
 2019-08-23 21:28:52 +00:00
aries e5f76a54e6 Fix default config of account fields length 2019-08-23 21:28:52 +00:00
kaniini 7a2a1ddfe4 Merge branch 'fix/add-likes-index-objects' into 'develop' 
Add an index on object likes

See merge request pleroma/pleroma!1592
 2019-08-23 01:41:18 +00:00
rinpatch 05e7d0a438 Add an index on object likes 
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
 2019-08-23 03:17:20 +03:00
Maksim Pechnikov 8dc6a6b210 fix /inbox for Relay 2019-08-22 22:48:07 +03:00
Maksim Pechnikov 399ca9133b fix test 2019-08-22 21:54:37 +03:00
Maksim Pechnikov f95b67c933 Merge branch 'develop' into issue/1177 2019-08-22 21:13:03 +03:00
feld 0e50e9e4fa Merge branch 'support/tests' into 'develop' 
fixed clear config after test

See merge request pleroma/pleroma!1588
 2019-08-22 17:37:01 +00:00
lain 01653f618d Merge branch 'improve-ap-routes-rate-limit' into 'develop' 
Improve AP routes rate limit

See merge request pleroma/pleroma!1590
 2019-08-22 10:20:50 +00:00
Egor Kislitsyn a79ebac592 Improve AP routes rate limit 2019-08-22 16:03:43 +07:00
Maksim Pechnikov 64bfb41c55 fixed unfollow for relay actor 2019-08-22 06:57:55 +03:00
Sachin Joshi 37229af15f remove old user create and delete routes for admin 2019-08-22 00:15:00 +05:45
Maksim Pechnikov 85bd8a4e31 fixed clear config after test 2019-08-21 21:24:35 +03:00
lain f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop' 
[#1174] Rate limit AP routes

See merge request pleroma/pleroma!1586
 2019-08-21 16:45:20 +00:00
kaniini 73884441f3 Merge branch 'chore/fix-flakey-aws-test' into 'develop' 
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1

See merge request pleroma/pleroma!1587
 2019-08-20 20:28:54 +00:00
Ariadne Conill 76bb3572dd test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1 2019-08-20 20:20:12 +00:00
lain 74f7f308f8 Merge branch 'fix/admin-api-user-deletion' into 'develop' 
Fix deactivated user deletion

See merge request pleroma/pleroma!1546
 2019-08-20 19:34:47 +00:00
Egor Kislitsyn 8d899d6197 Add `:ap_routes` rate limit 2019-08-20 22:10:36 +07:00
lain 8340fe8fcc Merge branch 'digest-template' into 'develop' 
Improve digest email template

See merge request pleroma/pleroma!1565
 2019-08-20 12:55:51 +00:00
Egor Kislitsyn cd2fd225dc Update CHANGELOG 2019-08-20 19:50:50 +07:00
lain ef43016b2c Merge branch 'feature/custom-fields' into 'develop' 
Add custom profile fields

See merge request pleroma/pleroma!1488
 2019-08-20 12:44:14 +00:00
Maxim Filippov 5171aa5b4d Refactor check_actor_is_active 2019-08-19 20:36:25 +03:00