moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,329 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

3329 Commits

Author SHA1 Message Date
Egor Kislitsyn 380e9fba21 add pinned posts 2019-01-07 20:45:33 +07:00
lambda b640cf0ce0 Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop' 
Scarlett/pleroma search visibility check

See merge request pleroma/pleroma!635
 2019-01-07 12:20:15 +00:00
lain 7dcafb4894 MastoAPI: Add test. 2019-01-07 13:13:37 +01:00
lain 7382adf407 Make TwAPI UserView more resilient to issues. 
Will work for missing users and badly migrated users.
 2019-01-07 12:41:31 +01:00
scarlett 36fa5e8802 Check visible_for_user when performing a search using a direct link. 2019-01-07 10:36:31 +00:00
scarlett 52493467ac Twitter API: Add a summary_html field. 
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
 2019-01-06 10:19:00 +00:00
Haelwenn (lanodan) Monnier c9b99d4486
config/config.exs: Add syslog backends 2019-01-06 01:11:53 +01:00
Haelwenn (lanodan) Monnier 5bcea0deca
Install ex_syslogger 2019-01-06 01:11:52 +01:00
kaniini b0e8e521fb Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop' 
Add check to prevent multiple follow notifications from the same user

Closes #397

See merge request pleroma/pleroma!591
 2019-01-05 22:54:25 +00:00
Sadposter 042852ecf3 Add check to prevent multiple follow notifications from the same user 2019-01-05 22:54:25 +00:00
kaniini 8d047c7a72 Merge branch 'fix/user-search-null-name' into 'develop' 
fix user search results for users with unset display name

Closes #499

See merge request pleroma/pleroma!625
 2019-01-05 22:34:47 +00:00
kaniini 0b54c3d643 Merge branch 'fix_486' into 'develop' 
fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive

See merge request pleroma/pleroma!627
 2019-01-05 22:33:38 +00:00
kaniini 576368237c Merge branch 'activitypub-tombstone-fix' into 'develop' 
Don't crash on AP request for tombstone

See merge request pleroma/pleroma!630
 2019-01-05 22:29:08 +00:00
scarlett 145d6fe6e9 Merge branch 'emoji-in-summary' into 'develop' 
Strip HTML in and allow emoji in summaries.

See merge request pleroma/pleroma!631
 2019-01-05 21:52:02 +00:00
scarlett 57df7d6e1d Add tests for emoji and lack of HTML in summaries. 2019-01-05 21:46:42 +00:00
scarlett 096e121879 Remove redundant comma. 2019-01-05 18:25:36 +00:00
scarlett 6556be344d Resolve some test failures. 2019-01-05 18:20:42 +00:00
scarlett 3c86d907d4 add some brakets to the emoji list. 2019-01-05 17:35:39 +00:00
scarlett 0787f0dfbe Strip HTML in and allow emoji in summaries. 2019-01-05 17:28:47 +00:00
sxsdv1 2d7da5f437 Don't crash on AP request for tombstone 
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
 2019-01-05 11:16:05 +01:00
cascode a81307251c Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name 2019-01-04 20:32:55 -08:00
rinpatch ba17518a0a Merge branch 'feature/rich-media-cachex' into 'develop' 
rich media: use cachex to avoid flooding remote servers

See merge request pleroma/pleroma!629
 2019-01-04 23:56:42 +00:00
William Pitcock 487c00d36d rich media: disable cachex in test mode 2019-01-04 23:53:26 +00:00
kaniini bf5aaefbb5 Merge branch 'fix/html-cache-content-collision' into 'develop' 
Different caches based on the module. Remove scrubber version since it is not relevant anymore

See merge request pleroma/pleroma!628
 2019-01-04 23:35:56 +00:00
William Pitcock 0964c207eb rich media: use cachex to avoid flooding remote servers 2019-01-04 23:32:01 +00:00
Rin Toshaka 1e2d58982e oopsies 2019-01-05 00:25:31 +01:00
Rin Toshaka 846082e54f Different caches based on the module. Remove scrubber version since it is not relevant anymore 2019-01-05 00:19:46 +01:00
spctrl 4aa977d3b3 fix 486: Add option --assume-yes to allow it to work non-interactive 2019-01-04 22:11:46 +01:00
kaniini 4258dd8633 Merge branch 'feature/rich-media' into 'develop' 
URL previews in posts

Closes #402

See merge request pleroma/pleroma!617
 2019-01-04 20:50:18 +00:00
kaniini ffea81b84f Merge branch 'activitypub-c2s-delete-activity' into 'develop' 
Activitypub c2s delete activity

See merge request pleroma/pleroma!618
 2019-01-04 20:32:10 +00:00
cascode 4c5ee4c62b formatted 2019-01-04 10:18:43 -08:00
cascode ab6ebbae67 added test for #499 2019-01-04 10:14:13 -08: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