Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,435 Commits 1 Branch 0 Tags 222 MiB
e509519db4
Commit Graph

16435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wim Vanderbauwhede
fe2dceb66d Patch to support image descriptions in Pleroma FE 2019-01-04 15:22:02 +00:00
cascode
5b23dfa1c5 handle null 2019-01-04 01:35:26 -08:00
kaniini
d9d62a110c Merge branch 'mr/retry-queue-remove-fold' into 'develop' 
rewrites List.foldl to Enum.each in RetryQueue

See merge request pleroma/pleroma!621
 2019-01-03 22:30:02 +00:00
kaniini
ccdc916f95 Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop' 
Remove media proxy examples in config/config.exs

See merge request pleroma/pleroma!624
 2019-01-03 22:29:36 +00:00
href
53f56039e5
Remove media proxy examples in config/config.exs 
1. this was overriding the real defaults
2. it's documented in `config/config.md`
 2019-01-03 20:22:22 +01:00
kaniini
eaaf701319 Merge branch 'fix/follow-requests-deleted-accounts' into 'develop' 
user: check that the follow request actually has an active account associated with it

See merge request pleroma/pleroma!623
 2019-01-03 18:53:30 +00:00
rinpatch
b73a1a33de Merge branch 'captcha' into 'develop' 
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
 2019-01-03 17:04:27 +00:00
rinpatch
9ef664ffce Merge branch 'fix-chat' into 'develop' 
Add handler for Phoenix-style socket.

See merge request pleroma/pleroma!619
 2019-01-03 08:59:05 +00:00
William Pitcock
eb1a18d22f user: check that the follow request actually has an active account associated with it 
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
 2019-01-02 22:47:12 +00:00
Michael Loftis
943211b035 rewrites List.foldl to Enum.each 2019-01-02 21:21:40 +00:00
rinpatch
d1983ed028 Merge branch 'fix/reserve-media-username' into 'develop' 
Reserve /media

See merge request pleroma/pleroma!620
 2019-01-02 16:23:46 +00:00
Rin Toshaka
5142b50f39 reserve /media 2019-01-02 17:16:26 +01:00
Maxim Filippov
48e81d3d40 Add RichMediaController and tests 2019-01-02 17:02:50 +03:00
lain
8910e103ce Add handler for Phoenix-style socket. 2019-01-02 11:39:11 +01:00
sxsdv1
4e1cc2bab6 Implement delete activity 2019-01-01 23:20:43 +01:00
sxsdv1
551c3d9391 Split create activity specifics from update_outbox 2019-01-01 23:20:28 +01:00
Maxim Filippov
917d48d09b Better variable name 2019-01-01 23:29:47 +03:00
Maxim Filippov
2aab4e03c3 Add OGP parser 2019-01-01 23:26:40 +03:00
kaniini
32bed66471 Merge branch 'pool-usage' into 'develop' 
Update of hackney and tesla, removal of superflous default options.

See merge request pleroma/pleroma!614
 2019-01-01 20:12:34 +00:00
rinpatch
34fa709015 Merge branch 'configurable-federator' into 'develop' 
Make Federator options configurable.

See merge request pleroma/pleroma!615
 2019-01-01 18:55:59 +00:00
lambda
b9ac7067eb Merge branch '2019-1-1-update-frontend' into 'develop' 
update frontend

See merge request pleroma/pleroma!616
 2019-01-01 16:55:37 +00:00
lain
1dd0e0ed4c update frontend 2019-01-01 17:45:03 +01:00
lain
1a0391c8a4 Add documentation. 2019-01-01 17:40:42 +01:00
lambda
32541172cd Merge branch 'cleanup/admin-api-useless-if' into 'develop' 
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete

See merge request pleroma/pleroma!612
 2019-01-01 13:48:59 +00:00
lain
400337b0a7 Make Federator options configurable. 2019-01-01 14:46:55 +01:00
lain
096a927805 Merge remote-tracking branch 'origin/develop' into pool-usage 2019-01-01 14:19:55 +01:00
lain
91afbbe4ea Update Tesla and Hackney. 2019-01-01 13:49:48 +01:00
lain
d4799e0dc2 Remove default pool, it's used automatically anyway. 2019-01-01 13:49:24 +01:00
Haelwenn (lanodan) Monnier
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete 2018-12-31 19:50:14 +01:00
kaniini
90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop' 
User/Account views: Add rights.admin

Closes #472

See merge request pleroma/pleroma!589
 2018-12-31 15:49:34 +00:00
kaniini
1b1e928667 Merge branch 'docs/admin-api' into 'develop' 
Add docs/Admin-API.md

See merge request pleroma/pleroma!611
 2018-12-31 15:49:01 +00:00
kaniini
ede3fd7459 Merge branch 'maintenance/copyright-2019' into 'develop' 
update copyright years to 2019

See merge request pleroma/pleroma!613
 2018-12-31 15:43:07 +00:00
William Pitcock
980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
Haelwenn (lanodan) Monnier
286632dfa2
Add docs/Admin-API.md 
[ci skip]
 2018-12-31 12:27:46 +01:00
lambda
33e3a7ba7d Merge branch 'fix/scrubber-cache' into 'develop' 
[#481] Store scrubbed posts in Cachex

Closes #481

See merge request pleroma/pleroma!610
 2018-12-31 09:56:26 +00:00
Rin Toshaka
9f5881cbb1 Fix a typo in user_test.ex 2018-12-31 08:34:14 +01:00
Rin Toshaka
6ed9b31a5f Eh? 2018-12-31 08:25:48 +01:00
Rin Toshaka
7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML 2018-12-31 08:19:48 +01:00
kaniini
8e7da98b18 Merge branch 'mr/retry-queue' into 'develop' 
Improves RetryQueue behavior

See merge request pleroma/pleroma!609
 2018-12-30 21:47:50 +00:00
rinpatch
05743e2000 Get default scrubbers from config instead of hardcoded 2018-12-31 00:12:14 +03:00
rinpatch
91d5a7e81c Fix test failure 2018-12-31 00:03:03 +03:00
Rin Toshaka
dec23500d8 Resolve merge conflict 2018-12-30 21:00:40 +01:00
Rin Toshaka
ab3089d6a7 Fix comment in object.ex 2018-12-30 20:51:31 +01:00
kaniini
dfde2622d0 Merge branch 'activitypub-c2s' into 'develop' 
Activitypub c2s

See merge request pleroma/pleroma!608
 2018-12-30 19:50:15 +00:00
Rin Toshaka
c50353e6ae shame on me for not testing after revert 2018-12-30 20:44:17 +01:00
Rin Toshaka
3f9da55adc Fix formating. Aparently my pre-commit hook broke. 2018-12-30 20:16:42 +01:00
Rin Toshaka
62af23bd26 Revert some changes in html.ex 2018-12-30 20:12:12 +01:00
Rin Toshaka
c119ea3a57 Friendship ended with Postgresql now Cachex is my best friend 2018-12-30 20:00:01 +01:00
Rin Toshaka
535fddd286 Friendship ended with Postgresql now Cachex is my best friend 2018-12-30 19:33:36 +01:00
Rin Toshaka
d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things 2018-12-30 16:51:16 +01:00