Maksim Pechnikov
385356aad0
fix oauth scopes for AdminApi#reports_update
2019-12-24 20:51:52 +03:00
lain
10ce7185c2
Merge branch 'increase-captcha-expiry-time' into 'develop'
...
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
2019-12-23 16:31:15 +00:00
Maksim Pechnikov
969769730e
update tests
2019-12-23 17:12:55 +03:00
Egor Kislitsyn
b012e66e4e
Increase CAPTCHA expiration time to 5 minutes
2019-12-23 15:14:46 +07:00
Maksim Pechnikov
bdd71669da
update test
2019-12-22 21:21:31 +03:00
Maksim
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
2019-12-22 17:58:54 +00:00
Maksim
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-22 17:58:45 +00:00
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
2019-12-21 21:27:42 +03:00
rinpatch
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
2019-12-21 11:56:24 +00:00
rinpatch
7447c80e33
Merge branch 'revert-a54aa5af' into 'develop'
...
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
Closes #1488
See merge request pleroma/pleroma!2083
2019-12-21 11:49:35 +00:00
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
feld
0193b0862f
Merge branch 'fix/twitter-card-without-attachments' into 'develop'
...
Posts without media attachments should get the Summary TwitterCard
See merge request pleroma/pleroma!2082
2019-12-20 22:40:52 +00:00
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
2019-12-20 16:32:04 -06:00
feld
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
2019-12-20 16:30:26 +00:00
feld
60819fd973
Merge branch 'fix/remote-user-no-follower-counter' into 'develop'
...
Do not crash when remote user follower and following counters are hidden
See merge request pleroma/pleroma!2077
2019-12-20 16:30:00 +00:00
Maksim Pechnikov
7bd0bca2ab
fixed remote follow
2019-12-20 16:33:44 +03:00
Haelwenn
c7848b6326
Merge branch 'remove-outdated-doc' into 'develop'
...
Remove `/api/account/register` documentation from pleroma_api.md
Closes #1486
See merge request pleroma/pleroma!2078
2019-12-20 13:24:24 +00:00
Egor Kislitsyn
fc79c69173
Remove /api/account/register
documentation from pleroma_api.md
2019-12-20 19:47:44 +07:00
Mark Felder
b7811dfb7b
Instead allow a dedicated benchmark config
2019-12-19 12:16:53 -06:00
Mark Felder
50638525db
Merge branch 'develop' into config/benchmark
2019-12-19 12:16:33 -06:00
Maxim Filippov
5fc84552d3
Fix all count
2019-12-19 19:52:55 +03:00
Maxim Filippov
4079d66f00
Expose issue via failing test
2019-12-19 19:47:36 +03:00
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2019-12-19 17:24:08 +03:00
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
2019-12-19 17:23:27 +03:00
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
2019-12-19 20:45:44 +07:00
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
2019-12-18 23:17:34 +03:00
Maksim Pechnikov
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
rinpatch
d23a80e691
Merge branch 'feature/add-event-support' into 'develop'
...
Add ActivityPub Object Event type support
See merge request pleroma/pleroma!2075
2019-12-17 15:31:10 +00:00
rinpatch
086250ac5b
Merge branch 'ci/rum-testing-no-recompilation' into 'develop'
...
CI: Add a cache policy for test jobs and fix rum tests recompiling everything
See merge request pleroma/pleroma!2074
2019-12-17 15:29:38 +00:00
rinpatch
407449158f
CI: Add a cache policy for test jobs and fix rum tests recompiling
...
everything
2019-12-17 18:24:16 +03:00
Thomas Citharel
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
Egor Kislitsyn
6c39fa20b1
Add support for account_id
param to filter notifications by the account
2019-12-17 17:00:46 +07:00
Maxim Filippov
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2019-12-17 12:36:56 +03:00
Haelwenn
38ad407395
Merge branch 'hide-followers-count' into 'develop'
...
Hide follower counter when hiding is activated
Closes #1450
See merge request pleroma/pleroma!2072
2019-12-17 06:43:15 +00:00
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
Maksim Pechnikov
a879c396bb
Merge branch 'develop' into feature/tag_feed
2019-12-17 09:24:08 +03:00
lain
804b961d3c
Merge branch 'fix/remove-useless-sleep' into 'develop'
...
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
2019-12-16 17:07:13 +00:00
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-16 22:34:21 +07:00
rinpatch
e659fbfbf9
Merge branch 'kocaptcha-default-endpoint' into 'develop'
...
Add default endpoint to Pleroma.Captcha.Kocaptcha
See merge request pleroma/pleroma!2070
2019-12-16 13:08:00 +00:00
Egor Kislitsyn
fc484e5ce6
Add Kocaptcha endpoint to config.exs
2019-12-16 19:35:10 +07:00
Egor Kislitsyn
8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
...
This reverts commit 82c62c5028
.
2019-12-16 19:33:51 +07:00
Egor Kislitsyn
82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha
2019-12-16 15:32:33 +07:00
rinpatch
eae65e3216
formatting
2019-12-16 01:37:33 +03:00
rinpatch
6ffbfdeeb2
tests: significantly reduce streamer timeout
...
there is no reason IPC between two processes on the same node should
take 4 seconds
2019-12-16 01:22:01 +03:00
rinpatch
54029fe212
tests: remove a useless sleep in rate limiter tests
...
It was used to check that authenticated and unauthenticated users have
different limits. Instead of sleeping a super low limit for
unauthenticated users was set, preventing them from doing 5 requests in
the first place.
2019-12-16 01:03:13 +03:00
rinpatch
137a3d220b
tests: remove a useless 1 second sleep
...
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
2019-12-16 00:51:59 +03:00
rinpatch
814a99c80f
tests: remove a useless 3 second sleep
...
the ids favs use are accurate down to a microsecond, there is no need
for it
2019-12-16 00:50:39 +03:00
rinpatch
c8046e1080
tests: Replace 2 second sleep with offseting updated_at
2019-12-16 00:50:15 +03:00
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
2019-12-15 22:32:42 +03:00