Ivan Tashkinov
|
aed0f90287
|
[#114] Added pleroma.confirmation_pending to user views, adjusted view tests.
|
2018-12-18 17:22:45 +03:00 |
|
href
|
77b5154c82
|
Cowboy handler for Mastodon WebSocket
|
2018-12-17 17:06:18 +01:00 |
|
href
|
5dcb7aecea
|
More put_view.
|
2018-12-16 17:51:22 +01:00 |
|
href
|
f672555ad3
|
Upgrade to Phoenix 1.4
|
2018-12-16 17:15:07 +01:00 |
|
eal
|
28478a9c4f
|
Merge branch 'fix/masto-put-settings' into 'develop'
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
|
2018-12-16 11:21:26 +00:00 |
|
eal
|
4c783e35c0
|
Mastodon API: Fix PUT /api/web/settings
|
2018-12-16 13:15:34 +02:00 |
|
href
|
acec11626d
|
Merge branch 'fix/issue_272' into 'develop'
[#272] fix tags
See merge request pleroma/pleroma!540
|
2018-12-14 20:20:30 +00:00 |
|
Maksim Pechnikov
|
ea72ac549b
|
fix case when tags is invalid
|
2018-12-14 23:16:12 +03:00 |
|
Maksim Pechnikov
|
d3ec09bb38
|
fix tags
|
2018-12-14 22:09:04 +03:00 |
|
href
|
0b4c61e8d5
|
Fix warning
|
2018-12-14 13:56:42 +01:00 |
|
href
|
ec0e613eca
|
Pleroma.Activity.mastodon_notification_type/1
|
2018-12-14 13:22:10 +01:00 |
|
href
|
331396cbcd
|
Properly disable Web Push if no VAPID key is set
|
2018-12-14 13:05:51 +01:00 |
|
Egor Kislitsyn
|
658edb166f
|
fix and improve web push; add configuration docs
|
2018-12-14 13:05:29 +01:00 |
|
lambda
|
ff10b9927b
|
Merge branch 'support/bugfix_272' into 'develop'
[#272] fix hashtags in api
See merge request pleroma/pleroma!510
|
2018-12-10 19:05:16 +00:00 |
|
Maksim Pechnikov
|
e94c3442f4
|
updates
|
2018-12-10 13:27:37 +03:00 |
|
Maksim Pechnikov
|
074fa790ba
|
fix compile warnings
|
2018-12-09 20:50:08 +03:00 |
|
Maksim Pechnikov
|
068353ac0b
|
formatting
|
2018-12-09 11:24:46 +03:00 |
|
Maksim Pechnikov
|
9442588ae9
|
fix hashtags in api response
|
2018-12-09 11:24:46 +03:00 |
|
lambda
|
94d8f1ab30
|
Merge branch '394_user_tags' into 'develop'
[#394] User tags
Closes #394
See merge request pleroma/pleroma!508
|
2018-12-07 18:25:38 +00:00 |
|
Ivan Tashkinov
|
7a2162bbcb
|
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
|
2018-12-06 22:26:25 +03:00 |
|
Ivan Tashkinov
|
7bcb6a183a
|
[#394] Refactoring.
|
2018-12-06 20:23:16 +03:00 |
|
Ivan Tashkinov
|
7b19487389
|
[#394] Added users.tags and admin routes to tag and untag users. Added tests.
|
2018-12-06 20:06:50 +03:00 |
|
kaniini
|
1d531fd2f3
|
Merge branch 'fix/mastodon-api-settings' into 'develop'
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
|
2018-12-06 16:01:58 +00:00 |
|
kaniini
|
abead01ab6
|
Merge branch 'correct-and-improve-http-options' into 'develop'
Correct and improve http options
See merge request pleroma/pleroma!505
|
2018-12-06 15:57:56 +00:00 |
|
rinpatch
|
2ae1128d9f
|
MastoAPI: Fix put_settings
|
2018-12-06 17:42:07 +03:00 |
|
Egor Kislitsyn
|
79668c08fc
|
cleanup
|
2018-12-06 20:50:20 +07:00 |
|
Egor Kislitsyn
|
3d492795b7
|
clean up
|
2018-12-06 20:42:00 +07:00 |
|
Egor Kislitsyn
|
4944498133
|
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
|
2018-12-06 20:15:16 +07:00 |
|
Egor Kislitsyn
|
8b4397c704
|
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
|
2018-12-06 19:55:58 +07:00 |
|
Egor Kislitsyn
|
04a48286e6
|
Add web push support
|
2018-12-06 19:29:04 +07:00 |
|
kaniini
|
ccf0b46dd6
|
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
|
2018-12-06 07:36:21 +00:00 |
|
Ivan Tashkinov
|
3e90f688f1
|
[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
Refactoring.
|
2018-12-06 10:26:17 +03:00 |
|
Hakaba Hitoyo
|
96ba95df2e
|
remove follow_redirect options
|
2018-12-06 11:38:33 +09:00 |
|
Hakaba Hitoyo
|
505d820827
|
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
|
2018-12-06 10:48:05 +09:00 |
|
lain
|
76d6b1c6ab
|
Merge remote-tracking branch 'origin' into follower-hiding
|
2018-12-05 21:27:56 +01:00 |
|
lain
|
3ea4476445
|
MastodonAPI: Show users their own network.
|
2018-12-05 21:25:06 +01:00 |
|
hakabahitoyo
|
a418547bdf
|
debug /api/v1/suggestions
|
2018-12-05 16:08:34 +09:00 |
|
Maksim Pechnikov
|
87109482f3
|
status_code -> status
|
2018-12-04 14:04:06 +03:00 |
|
Maxim Filippov
|
4b70e5eae9
|
Parse bio for MastodonAPI
|
2018-12-03 18:59:50 +03:00 |
|
lain
|
2a639de9b3
|
MastodonApi: Implement hide_network.
|
2018-12-02 17:48:00 +01:00 |
|
lain
|
347df6421d
|
Fix masto api user updating.
|
2018-12-01 10:40:01 +01:00 |
|
lain
|
c443c9bd72
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
|
2018-12-01 09:55:46 +01:00 |
|
href
|
02d3dc6869
|
Uploads fun, part. 2
|
2018-11-30 18:02:37 +01:00 |
|
href
|
b19597f602
|
reverse proxy / uploads
|
2018-11-30 18:00:47 +01:00 |
|
lain
|
d0ec2812bd
|
Merge remote-tracking branch 'origin' into validate-user-info
|
2018-11-30 17:34:20 +01:00 |
|
Haelwenn (lanodan) Monnier
|
d388a99143
|
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
|
2018-11-24 06:43:03 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5346fabf14
|
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
reported by soka on CRTNet
|
2018-11-24 06:13:36 +01:00 |
|
lain
|
0896cf4c0f
|
Fix most mastodon api bugs.
|
2018-11-20 20:12:39 +01:00 |
|
href
|
bc5cf2c192
|
Improved version string
|
2018-11-20 17:55:03 +01:00 |
|
lain
|
2cf40237ff
|
MastodonAPI: Add pagination to private messages.
|
2018-11-13 19:46:34 +01:00 |
|