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

3824 Commits

Author SHA1 Message Date
lain f53d464db0 Put deprecation warnings undre Pleroma.Config. 2019-01-28 14:39:54 +01:00
Ivan Tashkinov d3f9e6f6fe [#534] Merged `upstream/develop`. 2019-01-28 15:39:14 +03:00
Ivan Tashkinov 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. 2019-01-28 15:25:06 +03:00
lain 8e8a1e1ba8 Return new-style config if old-style config is set to false. 
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
 2019-01-28 13:07:12 +01:00
lain bcc559e4e6 Update config.md 2019-01-28 13:06:28 +01:00
lain f1d58c5c49 Don't run warnings in a task. 2019-01-28 13:05:17 +01:00
lain 39b2457734 Change default bg image in new config. 2019-01-28 13:04:51 +01:00
Haelwenn de0fb88a9c Merge branch 'safe-render-activities' into 'develop' 
remove unnecessary filter (re !723)

See merge request pleroma/pleroma!729
 2019-01-28 11:48:03 +00:00
href df2f7b39dd
re f83bae7c: remove unnecessary filter 2019-01-28 12:24:14 +01:00
lain f231313b70 Add deprecation warning mechanism. 2019-01-28 12:09:41 +01:00
href 74ed1b4d87 Merge branch 'oauth-login-failure-bug' into 'develop' 
Correctly handle invalid credentials on auth login.

Closes #407

See merge request pleroma/pleroma!728
 2019-01-28 10:49:03 +00:00
lain 1825118fd4 Correctly handle invalid credentials on auth login. 
Closes #407
 2019-01-28 11:41:47 +01:00
Haelwenn b380b4898d Merge branch 'patch-2' into 'develop' 
Update the openrc service's retry with the correct format

See merge request pleroma/pleroma!727
 2019-01-28 08:23:21 +00:00
vaartis 9e43a28bc3 Update the openrc service's retry with the correct format 2019-01-28 08:18:11 +00:00
Ivan Tashkinov 9560abea10 [#534] Refactoring / tweaks per MR review. 2019-01-28 11:03:52 +03:00
William Pitcock ddc7ae2c1a mastodon api: card: force OGP images through mediaproxy 2019-01-28 06:42:27 +00:00
William Pitcock 339c26e12b test: add status posting with OGP link preview test 2019-01-28 06:19:00 +00:00
William Pitcock ebeabdcc72 rich media: helpers: clean up unused aliases 2019-01-28 06:10:25 +00:00
William Pitcock 91ef64a1ec activitypub: prime OGP crawler cache when new messages are inserted into the database 2019-01-28 06:07:18 +00:00
William Pitcock 8e42251e06 rich media: add helpers module, use instead of MastodonAPI module 2019-01-28 06:04:54 +00:00
William Pitcock 24a103a1fe mastodon api: formatting 2019-01-28 05:53:17 +00:00
William Pitcock 6096846f5f API: kill /api/rich_media/parse endpoint 2019-01-28 05:53:17 +00:00
William Pitcock 020b3b29d9 test: update twitterapi tests 2019-01-28 05:53:17 +00:00
William Pitcock 07a9a891ad twitter api: fix up activity representer 2019-01-28 05:53:17 +00:00
William Pitcock 364cf5369b test: update mastodon status view tests 2019-01-28 05:53:17 +00:00
William Pitcock de42646634 rich media: add try/rescue to ensure we catch parsing and fetching failures 2019-01-28 05:53:17 +00:00
William Pitcock 5d895093fd twitter api: embed card in twitterapi posts 2019-01-28 05:53:17 +00:00
William Pitcock 5a37ddc2dc mastodon api: embed card in status object 2019-01-28 05:53:17 +00:00
William Pitcock 132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data 2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
Haelwenn (lanodan) Monnier 872241d7c5
/web/index template: Modify for glitch-soc 2019-01-28 04:43:36 +01:00
rinpatch 6db792124b Merge branch 'notice-404-to-fe' into 'develop' 
/notice/:id - send the FE index even if 404

See merge request pleroma/pleroma!725
 2019-01-27 22:01:20 +00:00
href 71bb90073b
/notice/:id - send the FE index even if 404 
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
 2019-01-27 22:51:50 +01:00
lambda 16ab1437d6 Merge branch 'safe-render-activities' into 'develop' 
Views: wrap activity rendering in a rescue

See merge request pleroma/pleroma!723
 2019-01-27 20:10:09 +00:00
lain 2e277dd4ad Fix objects. 2019-01-27 21:03:15 +01:00
kaniini ea12371a01 Merge branch 'discard-invalid-likes' into 'develop' 
Transmogrifier: fix incoming objects with invalid likes

See merge request pleroma/pleroma!724
 2019-01-27 19:10:15 +00:00
href 77f2137383
Transmogrifier: fix incoming objects with invalid likes 2019-01-27 19:33:21 +01:00
href f83bae7c22
Views: wrap activity rendering in a rescue 
this avoids complete timeline breakage when an activity fucks up
rendering.
 2019-01-27 19:16:20 +01:00
kaniini 00fd9c9e5c Merge branch 'hotfix/favorites-index' into 'develop' 
add activities likes index, fixes favorites API call

See merge request pleroma/pleroma!722
 2019-01-27 15:22:08 +00:00
kaniini 9af798ad40 Merge branch 'flake-random-worker-id' into 'develop' 
Flake: random worker id

See merge request pleroma/pleroma!721
 2019-01-27 15:16:06 +00:00
William Pitcock 15d12a69a4 add activities likes index, fixes favorites API call 2019-01-27 15:15:33 +00:00
href e0e0cc5ab0
Flake: random worker id 2019-01-27 16:04:36 +01:00
rinpatch 6c41c54d1b Merge branch 'docs/emoji-endpoint-similarities' into 'develop' 
docs/Pleroma-API.md: Add note about emoji endpoints similarities

See merge request pleroma/pleroma!720
 2019-01-27 14:28:51 +00:00
Haelwenn (lanodan) Monnier 37520e1e79
docs/Pleroma-API.md: Add note about emoji endpoints similarities 
[ci skip]
 2019-01-27 14:31:07 +01:00
kaniini 5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop' 
MastodonAPI multi-hashtag

See merge request pleroma/pleroma!652
 2019-01-27 12:45:50 +00:00
Haelwenn b58e4ddb10 Merge branch 'features/masto-account-view-rights' into 'develop' 
Web.MastodonAPI.AccountView: Add is_moderator and is_admin

Closes #557

See merge request pleroma/pleroma!718
 2019-01-27 09:45:51 +00:00
Haelwenn (lanodan) Monnier a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
 2019-01-27 10:33:22 +01:00
Haelwenn 7175793304 Merge branch 'hardening/mastodon-rich-media' into 'develop' 
rich media: minor hardening

See merge request pleroma/pleroma!717
 2019-01-26 17:30:51 +00:00
kaniini c410fe960c Merge branch 'webpush-endpoint-size' into 'develop' 
Change webpush endpoint to unlimited varchar

Closes #552

See merge request pleroma/pleroma!716
 2019-01-26 17:27:14 +00:00
William Pitcock 8f2f471e94 rich media: gracefully handle fetching nil URIs 2019-01-26 16:36:17 +00:00