Commit graph

2712 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil 2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call 2019-03-02 06:57:28 +01:00
Haelwenn (lanodan) Monnier
3d22642352
Pleroma.User: Pass an array to profile_urls 2019-03-02 06:33:15 +01:00
Haelwenn (lanodan) Monnier
9b83236fb0
Pleroma.Web.RelMe: fixups 2019-03-02 06:32:03 +01:00
Haelwenn (lanodan) Monnier
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile 2019-03-02 05:36:48 +01:00
William Pitcock
689b0730f8 activitypub: fix date header format
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
2019-03-01 12:22:45 +00:00
lambda
2f00814475 Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
Bugfix #236 Prefer user look-up by nickname

See merge request pleroma/pleroma!860
2019-03-01 09:48:24 +00:00
William Pitcock
28b4093233 mastodon websocket: return errors using ok, not stop 2019-02-28 16:23:55 +00:00
William Pitcock
388a3f4ca2 mastodon websocket: bring back infinity timeout 2019-02-28 16:23:24 +00:00
William Pitcock
f1d37a5e23 mastodon websocket: use pattern match to get query data, robustly handle errors 2019-02-28 16:02:48 +00:00
William Pitcock
bc53dff5b6 mastodon api: websocket: update code for cowboy 2.x 2019-02-28 15:44:12 +00:00
href
a47cc5a2cf Merge branch 'customizable_auth' into 'develop'
Authenticator tweaks

See merge request pleroma/pleroma!875
2019-02-28 11:18:01 +00:00
Ivan Tashkinov
3281a3f074 Renamed *DatabaseAuthenticator to *Authenticator. 2019-02-28 14:12:41 +03:00
Ivan Tashkinov
4e77f68414 Added auth_template/0 to DatabaseAuthenticator. 2019-02-28 13:58:58 +03:00
kaniini
cf426a719d Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
href
90a24fbf95 Merge branch 'customizable_auth' into 'develop'
Auth customization support

See merge request pleroma/pleroma!852
2019-02-28 10:12:26 +00:00
kaniini
089e2588a3 Merge branch 'speedup-follow-requests' into 'develop'
Speedup follow requests

Closes #677

See merge request pleroma/pleroma!871
2019-02-28 10:10:03 +00:00
kaniini
3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop'
Add activation status to the regular user view

See merge request pleroma/pleroma!874
2019-02-28 10:08:31 +00:00
Ivan Tashkinov
b6f915313f Made auth customization be runtime-configurable. 2019-02-28 13:00:54 +03:00
eugenijm
6b11011039 Added deactivated to the user view 2019-02-28 09:08:34 +03:00
lain
bbbdbec4fd Remove parts of the old activity view.
Not used anymore.
2019-02-27 17:24:51 +01:00
lain
9ade1242c2 Add user muted status info to twitterapi. 2019-02-27 16:52:03 +01:00
lain
c1ae495878 Add user muted status info to MastodonAPI. 2019-02-27 16:46:47 +01:00
lain
c4235f96bd Add with_muted param. 2019-02-27 16:37:42 +01:00
lain
b24cc44e8d Follower requests: Utilize object index.
Closes #677
2019-02-27 15:01:54 +01:00
William Pitcock
1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience 2019-02-27 13:01:10 +00:00
Egor Kislitsyn
5d961d536c fix formatter 2019-02-27 15:40:30 +07:00
Egor
c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
Maxim Filippov
90d0d055fc Add more admin actions 2019-02-27 00:13:38 +03:00
Ivan Tashkinov
e98d34e5fb Added missing copyright headers. 2019-02-26 16:26:54 +03:00
Ivan Tashkinov
fd46edb473 Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth 2019-02-26 15:29:43 +03:00
Ivan Tashkinov
e82b70eb53 Database authenticator behaviour / Pleroma implementation refactoring. 2019-02-26 15:27:01 +03:00
William Pitcock
fc9d895ebc twitter card: remove IO.inspect() spam 2019-02-24 18:56:44 +00:00
11backslashes
efa506b874 delegate user retrieval to the User module 2019-02-24 13:23:47 -05:00
lain
9e0686efa6 Move visibility into own module. 2019-02-22 13:29:52 +01:00
lain
62296f5a25 Fix private post card handling. 2019-02-22 12:02:51 +01:00
Ivan Tashkinov
afddce45b3 Minor setting name adjustment (:app_template -> :app_layout). 2019-02-22 11:10:17 +03:00
kaniini
5a4e2905fe Merge branch 'fix/twittercards' into 'develop'
Fix Twitter Cards

See merge request pleroma/pleroma!815
2019-02-22 04:38:14 +00:00
KZ
7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty 2019-02-22 04:37:48 +00:00
Ivan Tashkinov
1097ce6d9f Auth customization support.
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
2019-02-21 18:55:19 +03:00
lambda
2813f28b6f Merge branch 'bugfix/httpsig-sign-date' into 'develop'
activitypub: sign date header

Closes #649 and #364

See merge request pleroma/pleroma!847
2019-02-21 08:20:06 +00:00
William Pitcock
f8a72f2997 activitypub: sign http date header 2019-02-21 00:23:17 +00:00
William Pitcock
1803d9a022 fix fetching AP objects with application/json 2019-02-20 20:45:40 +00:00
William Pitcock
22e2ed235d logging: only return ISE reasons in API responses when in dev or test mode 2019-02-20 17:36:47 +00:00
William Pitcock
8b08096436 logging: improve visibility into ISE errors 2019-02-20 17:14:18 +00:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
lain
59c27f29c8 Add some nicer urls in status view. 2019-02-20 17:36:16 +01:00
Ivan Tashkinov
b574d97c2e [#468] Added support for push OAuth scope (Mastodon 2.4+). 2019-02-20 17:27:41 +03:00
Ivan Tashkinov
6fe7acd58e [#468] Merged upstream/develop. 2019-02-20 16:48:59 +03:00
lambda
11b3c10c54 Merge branch 'muting' into 'develop'
Implement muting, add it to the whole mastodon API

See merge request pleroma/pleroma!319
2019-02-20 13:19:37 +00:00