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

7964 Commits

Author SHA1 Message Date
Mark Felder 89243fee8e Fix captcha time, which was meant to be 5 minutes 2020-01-09 15:45:46 -06:00
feld e8b0c7689a Merge branch 'update/adminfe-20201019' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2093
 2020-01-09 18:35:17 +00:00
Mark Felder fd3c23af63 Update AdminFE build 2020-01-09 10:00:15 -06:00
Maksim Pechnikov 70410dfafd fix create service actor 2020-01-08 16:40:49 +03:00
rinpatch fcd5dd259a Merge branch 'bugfix/smtp-config-examples' into 'develop' 
Fix SMTP mailer example

See merge request pleroma/pleroma!2091
 2020-01-07 11:43:22 +00:00
lain 180f257ced Update CHANGELOG.md 2020-01-06 14:10:07 +00:00
RX14 b55f2563d0
Fix SMTP mailer example 
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
 2020-01-05 19:00:48 +00:00
eugenijm 0b6d1292d2 Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list 2020-01-05 17:38:51 +03:00
Maksim Pechnikov fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate 2020-01-03 16:28:13 +03:00
Ivan Tashkinov badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests 2020-01-02 13:03:33 +03:00
rinpatch ee0c40831e Merge branch 'update-captcha' into 'develop' 
Update `captcha` dependency

Closes #1492

See merge request pleroma/pleroma!2088
 2019-12-28 12:57:21 +00:00
Egor Kislitsyn 520940d3e2
Update `captcha` dependency 2019-12-28 19:48:54 +07:00
Maksim Pechnikov 933dc12043 added code of mr#2067 2019-12-25 15:12:43 +03:00
Haelwenn 11e010fc77 Merge branch 'feat/doc-improvements' into 'develop' 
Documentation imrpovements

See merge request pleroma/pleroma!2084
 2019-12-24 19:57:41 +00: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
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 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
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
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
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