mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-26 01:50:30 +00:00
Code Issues Projects Releases Wiki Activity
7949 commits 262 branches 60 tags 347 MiB
Commit graph

7949 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maksim Pechnikov
b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
feld
a431e8c9f7 Merge branch 'feature/attachments-cleanup' into 'develop' 
Delete attachments when status is deleted

See merge request pleroma/pleroma!2036
 2020-01-12 18:48:59 +00:00
Roman Chvanikov
88f0eed0f2 Delete attachments when status is deleted 2020-01-12 18:48:58 +00:00
feld
8b4d81609d Merge branch 'updated-at-on-conversation-read' into 'develop' 
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)

See merge request pleroma/pleroma!2080
 2020-01-12 18:37:52 +00:00
feld
6cc5341d26 Merge branch 'config/benchmark' into 'develop' 
Benchmark env uses test database so we should be able to use test.secret.exs

See merge request pleroma/pleroma!2057
 2020-01-12 18:31:10 +00:00
feld
bb5862ea2f Merge branch 'issue/1354' into 'develop' 
[#1354] fix remote follow

See merge request pleroma/pleroma!2079
 2020-01-12 18:20:31 +00:00
Mark Felder
e64059d218 Assign token that can write to follows 2020-01-12 12:14:09 -06:00
Mark Felder
2f5b8fbeb3 Merge branch 'develop' into issue/1354 2020-01-12 12:12:15 -06:00
feld
ea4a462858 Merge branch 'issue/1487' into 'develop' 
[#1487] fixed clear  HTML entities after scrub html and truncate

See merge request pleroma/pleroma!2090
 2020-01-12 17:25:25 +00:00
rinpatch
ecb8fe183c Merge branch 'patch-1' into 'develop' 
docs: API: update Mastodon API link

See merge request pleroma/pleroma!2100
 2020-01-11 17:38:12 +00:00
rinpatch
a0bf928c98 Merge branch 'remove/remove-mdii-uploader' into 'develop' 
Remove MDII uploader

See merge request pleroma/pleroma!2099
 2020-01-11 17:19:54 +00:00
Hakaba Hitoyo
0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
Alibek Omarov
e1308f10bd docs: API: update Mastodon API link 2020-01-11 05:06:40 +00:00
lain
05ca420c09 Merge branch 'issue/1490' into 'develop' 
[#1490] fixed create  service user   (relay, internal.fetch)

See merge request pleroma/pleroma!2092
 2020-01-10 13:14:20 +00:00
lain
9b5cd8b1b7 Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop' 
OAuth tweaks and tests rework

See merge request pleroma/pleroma!2068
 2020-01-10 13:07:20 +00:00
lain
e118d639a0 Merge branch 'fix/captcha-time' into 'develop' 
Fix captcha time, which was meant to be 5 minutes

See merge request pleroma/pleroma!2094
 2020-01-10 11:09:07 +00:00
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
Maksim Pechnikov
54c9db38c8 Merge branch 'develop' into issue/1383 2019-12-21 20:38:59 +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