dtluna
|
0016589aea
|
Remove ambiguity in call to make_date/0
|
2017-04-10 15:22:49 +03:00 |
|
dtluna
|
57795f7332
|
Refactor lib/pleroma/web/twitter_api/twitter_api.ex
|
2017-04-08 17:19:57 +03:00 |
|
dtluna
|
8f43992121
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
|
2017-04-08 16:28:50 +03:00 |
|
Roger Braun
|
f45dc475c7
|
Fix replies.
|
2017-04-05 11:59:38 +02:00 |
|
dtluna
|
b502d7981c
|
Add Follow Activity representer
|
2017-04-05 02:04:54 +03:00 |
|
dtluna
|
8075badafe
|
Add Follow activity insertion
|
2017-04-04 03:30:07 +03:00 |
|
Roger Braun
|
a83fa053de
|
Parse mentions, save them, output them in TwAPI.
|
2017-04-03 18:28:19 +02:00 |
|
Roger Braun
|
2e89d505d3
|
Connect attachments with objects, not activities.
|
2017-03-30 18:07:38 +02:00 |
|
Roger Braun
|
6aa1523bb3
|
Put objects in inserted activties into the db.
|
2017-03-30 18:07:29 +02:00 |
|
Roger Braun
|
73df2f8e5e
|
Add attachments to the TwAPI.
|
2017-03-30 17:07:22 +02:00 |
|
Roger Braun
|
42c90855ba
|
Basic ObjectRepresenter.
|
2017-03-30 16:08:49 +02:00 |
|
Roger Braun
|
4a6d48b0fe
|
Return mimetype with attachment.
|
2017-03-30 16:08:23 +02:00 |
|
Roger Braun
|
d18473f0c3
|
Add port if specified.
|
2017-03-30 14:32:36 +02:00 |
|
Roger Braun
|
e7dc39e40c
|
Basic file uploading via TwAPI.
|
2017-03-29 02:07:56 +02:00 |
|
Roger Braun
|
d2cdcc097b
|
Add conversation fetching to TwAPI controller.
|
2017-03-28 17:22:44 +02:00 |
|
Roger Braun
|
0dd3373304
|
Return statusnet_conversation_id in TwAPI.
|
2017-03-28 14:49:21 +02:00 |
|
Roger Braun
|
e25aea3fa7
|
Add conversation id to activities.
This is for compatibility with the TwAPI.
|
2017-03-28 14:40:09 +02:00 |
|
Roger Braun
|
e4de0ddc77
|
Add single status fetching to TwAPI.
|
2017-03-24 01:16:28 +01:00 |
|
Roger Braun
|
866a2663d4
|
Add fetching of activities in context.
|
2017-03-24 00:09:08 +01:00 |
|
Roger Braun
|
ae50b165cc
|
Add inReplyToStatus to TwAPI.
|
2017-03-24 00:00:06 +01:00 |
|
Roger Braun
|
e56dba1563
|
Add context and inReplyTo.
|
2017-03-23 23:34:10 +01:00 |
|
Roger Braun
|
74112ef99e
|
Add id to objects, too.
|
2017-03-23 21:22:49 +01:00 |
|
Roger Braun
|
1f0f79d959
|
Generate ids for activities.
|
2017-03-23 17:56:49 +01:00 |
|
Roger Braun
|
9ad045fd58
|
Return user specific json for logged in users.
|
2017-03-23 15:51:34 +01:00 |
|
Roger Braun
|
30650e5bc6
|
Add unfollowing to TwAPI.
|
2017-03-23 13:13:09 +01:00 |
|
Roger Braun
|
75e51b190d
|
Add following TwAPI endpoint.
|
2017-03-23 12:09:27 +01:00 |
|
Roger Braun
|
e2e0cd75b7
|
Add friends timeline.
|
2017-03-22 17:25:59 +01:00 |
|
Roger Braun
|
37e443ce6c
|
Add friends status fetching.
|
2017-03-22 16:51:20 +01:00 |
|
Roger Braun
|
569d9bac17
|
Add fetching for recipients.
|
2017-03-22 14:45:17 +01:00 |
|
Roger Braun
|
2db28df4cf
|
Add public timeline TwAPI.
|
2017-03-21 21:09:20 +01:00 |
|
Roger Braun
|
b9d0e34506
|
Add since_id for activitypub fetching.
|
2017-03-21 20:31:48 +01:00 |
|
Roger Braun
|
d4cf273f28
|
Add limiting to activity pub fetching.
|
2017-03-21 20:22:05 +01:00 |
|
Roger Braun
|
ad303783af
|
Add status posting via TwAPI.
|
2017-03-21 18:17:35 +01:00 |
|
Roger Braun
|
9a8850eb9e
|
Basic status creation and retrieval.
|
2017-03-21 17:53:20 +01:00 |
|
Roger Braun
|
8de523c8ae
|
Basic AP objects.
|
2017-03-21 09:21:52 +01:00 |
|
Roger Braun
|
093fd1832d
|
Add Twitter API verify_credentials endpoint.
|
2017-03-20 21:30:44 +01:00 |
|
Roger Braun
|
980717fdce
|
Add Twitter API user representer.
|
2017-03-20 21:30:18 +01:00 |
|
Roger Braun
|
a93f3421a7
|
Phoenix skeleton
|
2017-03-17 17:09:58 +01:00 |
|
rinpatch
|
4a6855d9ee
|
Provide plaintext representations of content/cw in MastoAPI
|
2017-01-01 03:10:08 +03:00 |
|
Egor Kislitsyn
|
9abf832b03
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 18:48:10 +07:00 |
|
lambda
|
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
|
2019-04-08 11:42:20 +00:00 |
|
lambda
|
fd45cab9ec
|
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
|
2019-04-08 11:41:50 +00:00 |
|
Alexander Strizhakov
|
36c0a10fdf
|
adding language tag
|
2019-04-08 11:03:10 +00:00 |
|
lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
2019-04-08 09:50:00 +00:00 |
|
Egor Kislitsyn
|
c3d5c3513a
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 16:46:59 +07:00 |
|
Egor Kislitsyn
|
a1a854646e
|
Merge branch 'develop' into use-jobs-in-webpush
|
2019-04-08 16:29:20 +07:00 |
|
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
2019-04-08 12:20:26 +03:00 |
|
lambda
|
b4da2bc1d0
|
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
|
2019-04-08 09:18:01 +00:00 |
|
lambda
|
b177e1e7f3
|
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
|
2019-04-08 09:08:18 +00:00 |
|
Ivan Tashkinov
|
e3328bc138
|
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
|
2019-04-07 11:08:37 +03:00 |
|
feld
|
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
|
2019-04-06 22:19:30 +00:00 |
|
eugenijm
|
2056efa714
|
Add scheduler for sending scheduled activities to the queue
|
2019-04-06 23:56:29 +03:00 |
|
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
2019-04-06 23:55:58 +03:00 |
|
eugenijm
|
b3870df51f
|
Handle scheduled_at on status creation.
|
2019-04-06 23:55:58 +03:00 |
|
eugenijm
|
7bf622ce73
|
Add scheduled activities
|
2019-04-06 23:55:58 +03:00 |
|
eugenijm
|
7aa53d52bd
|
Return 403 on oauth token exchange for a deactivated user
|
2019-04-06 23:27:55 +03:00 |
|
feld
|
9aeac7dcca
|
Merge branch 'feature/prometheus' into 'develop'
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
|
2019-04-06 14:51:46 +00:00 |
|
Alex S
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
2019-04-06 20:34:00 +07:00 |
|
Egor Kislitsyn
|
1c2e4f88d1
|
fix credo
|
2019-04-05 19:46:28 +07:00 |
|
Egor Kislitsyn
|
f1712cd2f1
|
Use PleromaJobQueue in Pleroma.Web.Push
|
2019-04-05 19:38:44 +07:00 |
|
Ivan Tashkinov
|
47a236f753
|
[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
|
2019-04-05 15:12:02 +03:00 |
|
Ivan Tashkinov
|
3e7f2bfc2f
|
[#923] OAuthController#callback adjustments (with tests).
|
2019-04-05 09:19:17 +03:00 |
|
Ivan Tashkinov
|
45765918c3
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-04 23:43:08 +03:00 |
|
Ivan Tashkinov
|
f7cd9131d4
|
[#923] OAuth consumer controller tests. Misc. improvements.
|
2019-04-04 22:41:03 +03:00 |
|
href
|
bc3618a38d
|
Set up telemetry and prometheus
|
2019-04-04 11:30:43 -05:00 |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
2019-04-04 16:10:43 +07:00 |
|
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
2019-04-02 20:39:52 +07:00 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
|
Ivan Tashkinov
|
37925cbe78
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
|
2019-04-02 14:05:34 +03:00 |
|
Ivan Tashkinov
|
590c935d95
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-02 13:50:12 +03:00 |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
2019-04-01 17:17:57 +07:00 |
|
Ivan Tashkinov
|
804173fc92
|
[#923] Minor code readability fix.
|
2019-04-01 09:45:44 +03:00 |
|
Ivan Tashkinov
|
eadafc88b8
|
[#923] Deps config adjustment (no override for httpoison), code analysis issues fixes.
|
2019-04-01 09:28:56 +03:00 |
|
Ivan Tashkinov
|
baffdcc480
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-01 08:49:32 +03:00 |
|
Ivan Tashkinov
|
20e0f36605
|
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
|
2019-03-27 15:41:40 +03:00 |
|
Ivan Tashkinov
|
2a95014b9d
|
[#923] OAuth consumer improvements, fixes, refactoring.
|
2019-03-27 15:39:35 +03:00 |
|
Ivan Tashkinov
|
af68a42ef7
|
[#923] Support for multiple OAuth consumer strategies.
|
2019-03-20 20:25:48 +03:00 |
|
Ivan Tashkinov
|
e17a9a1f66
|
[#923] Nickname & email selection for external registrations, option to connect to existing account.
|
2019-03-20 10:35:31 +03:00 |
|
Ivan Tashkinov
|
8d21859717
|
[#923] External User registration refactoring, password randomization.
|
2019-03-18 18:09:53 +03:00 |
|
Ivan Tashkinov
|
26b6354095
|
[#923] Support for multiple (external) registrations per user via Registration.
|
2019-03-18 17:23:38 +03:00 |
|
Ivan Tashkinov
|
2a96283efb
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
|
2019-03-18 10:26:41 +03:00 |
|
Ivan Tashkinov
|
2739057442
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
|
2019-03-15 17:11:00 +03:00 |
|
Ivan Tashkinov
|
aacbf0f570
|
[#923] OAuth: prototype of sign in / sign up with Twitter.
|
2019-03-15 17:08:03 +03:00 |
|
Ivan Tashkinov
|
63ab61ed3f
|
Sign in via Twitter (WIP).
|
2019-03-11 20:37:26 +03:00 |
|