1c00eb4a90
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
8 years ago
a9b3f99d48
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name
8 years ago
f51a672ac4
Return object id in Ostatus create activties.
8 years ago
424e0e7779
Add Websub verification.
8 years ago
9afc672009
Quick fix for activities without 'to'.
8 years ago
1e88f102c4
Fix specs, add some user info.
8 years ago
7a018a8d3b
Add /statuses/mentions_timeline route
8 years ago
1b9cc721a0
Websub controller beginnings.
8 years ago
3a56d7318f
Add statuses/mentions endpoint
8 years ago
5e7ceeba94
Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
8 years ago
cc330421fd
Better activities in ostatus.
8 years ago
b248fc7dfb
Refactor unfollow/2
8 years ago
01901d9835
Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
8 years ago
d952b6cd7b
Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
8 years ago
9167a2ebe3
Send frontend through phoenix.
8 years ago
eda742c78b
Merge branch 'feature/user-timeline' into 'develop'
...
Feature/user timeline
See merge request !8
8 years ago
d23f3e3cf3
Add webfinger and basic feed support.
8 years ago
36e883cd4b
Add basic Ostatus user representer.
8 years ago
ce6cc84a4a
Add basic webfinger.
8 years ago
ac9817bdb0
Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
...
Add error messages for repeated follows and unfollows
See merge request !7
8 years ago
ef5033d7a7
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
8 years ago
f6547f7b7f
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
8 years ago
82914e1e4d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
8 years ago
85bd480be3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
8 years ago
5229b01944
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
8 years ago
eb9358c8d6
Add basic Avatar updating code.
8 years ago
63f04b314d
Fix typo
8 years ago
4b4ece2c74
Add user timeline fetching without credentials
8 years ago
03a9c11d25
Display the users avatar if he has one set.
8 years ago
7617a593b9
Support data uris in uploads.
8 years ago
7a0046d127
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
8 years ago
9a8c348aed
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
8 years ago
ce1eef9c98
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
8 years ago
b41f3eff84
Preserve newlines in messages.
8 years ago
5dac3727f1
Add registration to the TwAPI controller.
8 years ago
b1edd94baa
Add user registration to TwAPI.
8 years ago
4f7adb343c
Address liking / announcing to the original author.
8 years ago
4799dc6991
Add retweeting to TwAPI controller.
8 years ago
60c60de330
Add announcements / retweets to TwAPI.
8 years ago
21c397820f
Add announcements to activitypub.
8 years ago
7a47afed3c
Update object correctly after setting context.
8 years ago
c83f279a7d
Add unliking to TwAPI controller.
8 years ago
f4eea0847b
Add unfavoriting to TwAPI.
8 years ago
a926038cd0
Add unliking to activitypub.
8 years ago
03ddaead7e
Add basic user caching.
...
Expires after 5 seconds.
8 years ago
90b38fd51b
Fix uploads and favorites in twidere / twittnuker.
8 years ago
18cd04ade5
Add user timeline
8 years ago
fa0c279139
Favorite changes.
...
- Add 'likes' to activity, collection of ids of people who liked it.
- show if you favorited something or not.
- Don't allow double favorites
- Address favorites to the followers of the liked activity's author.
8 years ago
5cb446a148
Add favoriting to TwAPI controller.
8 years ago
d0da40dc81
Display like activities.
8 years ago
653d605e14
Add favoriting to twitter api.
8 years ago
443381d0a0
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
8 years ago
1388054796
Add liking to ActivityPub.
8 years ago
1ccbe562c9
Add actor to objects.
8 years ago
a8e50d602b
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
8 years ago
594dd01ab2
Refactor follow API
8 years ago
3ff917b5dd
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
8 years ago
84c2012810
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
8 years ago
d2bf099ae6
Fix twitter api date.
8 years ago
f3e7771fd6
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
8 years ago
129e30f465
Add basic config endpoint.
8 years ago
bf22b1547c
Merge branch 'feature/home-timeline' into 'develop'
...
Add home timeline
See merge request !6
8 years ago
7469616f44
Merge branch 'bugfix/verify_credentials_get' into 'develop'
...
account/verify_credentials bugfix
See merge request !2
8 years ago
1b086834bd
Don't return html in the text field.
8 years ago
b666f11d2f
Add max_id fetching to activity fetching.
8 years ago
8eea09889b
Return directly addressed activities in friends timeline.
8 years ago
15655d992e
Fix user representation after following.
8 years ago
65ef18a715
Add error messages for repeated follows and unfollows
8 years ago
a7e74ee012
Add user timeline
8 years ago
6f99765fba
Add home timeline
8 years ago
c0e5b3459f
Add unfollowing using screen_name parameter
8 years ago
896e40cd2b
Add following using screen_name parameter
8 years ago
59a406d94c
Add test for help/test resource
8 years ago
9383c0aada
Add help/test resource
8 years ago
48b6ae2314
Add GET route for verify_credentials
8 years ago
0016589aea
Remove ambiguity in call to make_date/0
8 years ago
57795f7332
Refactor lib/pleroma/web/twitter_api/twitter_api.ex
8 years ago
8f43992121
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
8 years ago
f45dc475c7
Fix replies.
8 years ago
b502d7981c
Add Follow Activity representer
8 years ago
8075badafe
Add Follow activity insertion
8 years ago
a83fa053de
Parse mentions, save them, output them in TwAPI.
8 years ago
2e89d505d3
Connect attachments with objects, not activities.
8 years ago
6aa1523bb3
Put objects in inserted activties into the db.
8 years ago
73df2f8e5e
Add attachments to the TwAPI.
8 years ago
42c90855ba
Basic ObjectRepresenter.
8 years ago
4a6d48b0fe
Return mimetype with attachment.
8 years ago
d18473f0c3
Add port if specified.
8 years ago
e7dc39e40c
Basic file uploading via TwAPI.
8 years ago
d2cdcc097b
Add conversation fetching to TwAPI controller.
8 years ago
0dd3373304
Return statusnet_conversation_id in TwAPI.
8 years ago
e25aea3fa7
Add conversation id to activities.
...
This is for compatibility with the TwAPI.
8 years ago
e4de0ddc77
Add single status fetching to TwAPI.
8 years ago
866a2663d4
Add fetching of activities in context.
8 years ago
ae50b165cc
Add inReplyToStatus to TwAPI.
8 years ago
e56dba1563
Add context and inReplyTo.
8 years ago
74112ef99e
Add id to objects, too.
8 years ago
1f0f79d959
Generate ids for activities.
8 years ago
9ad045fd58
Return user specific json for logged in users.
8 years ago
30650e5bc6
Add unfollowing to TwAPI.
8 years ago
75e51b190d
Add following TwAPI endpoint.
8 years ago
e2e0cd75b7
Add friends timeline.
8 years ago
37e443ce6c
Add friends status fetching.
8 years ago
569d9bac17
Add fetching for recipients.
8 years ago
2db28df4cf
Add public timeline TwAPI.
8 years ago
b9d0e34506
Add since_id for activitypub fetching.
8 years ago
d4cf273f28
Add limiting to activity pub fetching.
8 years ago
ad303783af
Add status posting via TwAPI.
8 years ago
9a8850eb9e
Basic status creation and retrieval.
8 years ago
8de523c8ae
Basic AP objects.
8 years ago
093fd1832d
Add Twitter API verify_credentials endpoint.
8 years ago
980717fdce
Add Twitter API user representer.
8 years ago
a93f3421a7
Phoenix skeleton
8 years ago
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
8 years ago
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
36c0a10fdf
adding language tag
6 years ago
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
6 years ago
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
6 years ago
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
6 years ago
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
6 years ago
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
1c2e4f88d1
fix credo
6 years ago
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
6 years ago
bc3618a38d
Set up telemetry and prometheus
6 years ago
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
6 years ago
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
804173fc92
[ #923 ] Minor code readability fix.
6 years ago
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
8d21859717
[ #923 ] External User registration refactoring, password randomization.
6 years ago
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
Roger Braun