035f22f784
Fix Credo warnings
5 years ago
1bea67cb5e
Cleanup Pleroma.User
5 years ago
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
79b25be4e1
Do not return tuple when unneeded
5 years ago
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
5 years ago
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
5 years ago
e1d2d69c87
Clean up views
5 years ago
e63f167f01
Also pretty print pack.json
5 years ago
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
5 years ago
494bb6bac6
updated tests
5 years ago
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
5 years ago
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
5 years ago
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
5 years ago
2ad50583f0
Document and test /api/ap/whoami
5 years ago
d72d4757a8
Format
5 years ago
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
72a01f1350
Use router helper to generate reset password link
5 years ago
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
5 years ago
0e6085da10
Fix pagination in AP outbox.json
5 years ago
95c948110c
Add `rel="ugc"` to hashtags and mentions
5 years ago
cf3041220a
Add support for `rel="ugc"`
5 years ago
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
5 years ago
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
b585134c90
Get the nodeinfo address from the well-known
5 years ago
a1325d5fd9
Change path from nodeinfo to metadata->features
5 years ago
d51e5e447e
Move emoji reloading to admin api
5 years ago
7680aec17d
Move emoji api to pleroma api dir
5 years ago
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
5 years ago
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
6cd651a38b
Make the emoji controller api more RESTy
5 years ago
3971bf9c5f
Change :sha to :checksum
5 years ago
7c784128fd
Change emoji api responses to JSON
5 years ago
f24731788e
Move emoji pack list from /list to /
5 years ago
cb125ffaf7
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
8f509e6d1e
Use with w/ pack_info_res
5 years ago
8790365fef
Remove unused variable
5 years ago
b8a214b0ab
Split list_packs
5 years ago
f251225cae
Apply suggestions to emoji_api_controller.ex
5 years ago
c049c32270
Fixed a typo in create_archive_and_cache
5 years ago
163082de6f
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
f6d4acc871
Fix credo warnings
5 years ago
87057101b0
Add documentation for the emoji api endpoints
5 years ago
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
13cd93a0d3
Use && insted of "and" for checking shared-files for packs
...
share-files can be nil and "and" does not like that
5 years ago
f5131540dc
Add a way to create emoji packs via an endpoint
5 years ago
8dbdd5c280
Allow uploading new emojis to packs from URLs
5 years ago
16edfef12e
Handle empty shortcode/filename/new_shortcode/new_filename
5 years ago
9afe7258dd
Implememt emoji pack file updating + write tests
5 years ago
261d92f9c2
Update the pack fallback-src sha generation condition
...
The old one would not regenerate sha when fallback src changed
5 years ago
bcc0bfd0c5
Add an endpoint for emoji pack metadata updating
5 years ago
b78973d27f
fallback can't have pack.json, reflect that in code
...
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
5 years ago
2a94eca096
Change YAML to JSON
5 years ago
b0ecd412f5
Clean out old emojis on reload
5 years ago
2d4b8f3d20
Add an endpoint for deleting emoji packs
5 years ago
3a8669b487
Fix responses for emoji pack controlller
5 years ago
7a0c755d0a
Send ok for emoji reloading as text, not as json
5 years ago
ee620ecbf1
Add caching for emoji pack sharing
5 years ago
7fb7dd9e0e
Only find SHA256 for packs that are shared
5 years ago
54b8e683bc
Swap TOML for YAML to get YAML generation for packs from fallbacks
...
If fallback url doesn't have a pack.yml file, one from the source will
be used
5 years ago
b791a08656
Implement API actions on packs
...
That incldues listing them and downloading them from other instances
or from the remote url
5 years ago
6a42641b8d
Add pack.toml loading
5 years ago
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
5 years ago
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
5 years ago
e32d099a3a
Merge branch 'feature/poll-refresh' into 'develop'
...
Poll refetching
See merge request pleroma/pleroma!1694
5 years ago
5028b7b578
Fix credo issues
5 years ago
c096dd86e5
Do not refetch local objects
5 years ago
eb87a86b5b
Preserve internal fields when reinjecting
5 years ago
d32894ae51
Move object internal fields to a constant
5 years ago
e3f902b3a1
Set updated_at even if the object stayed the same
5 years ago
a9c700ff15
Fix wrong argument order when calling NaiveDateTime.diff
5 years ago
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
384b7dd40d
Fix response
5 years ago
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
a18f1e7cd7
namings
5 years ago
2263c8b6b9
little fixes
5 years ago
4faf2b1555
post for creating invite tokens in admin api
5 years ago
e501c822c9
markdown.ex: put two-spaces before the description-newline
5 years ago
4785596a2c
markdown.ex: end suggestions list with a newline
...
Otherwise we end up with suggestion on the same level as the childs
Markdown is a fuck…
5 years ago
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
5 years ago
d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
5 years ago
c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
106afaed58
markdown.ex: do not fail if there is no children
5 years ago
e0d8c8897e
docs/markdown.ex: do no print empty suggestions
5 years ago
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
0447c42715
Merge branch 'develop' into issue/733
5 years ago
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
5 years ago
7dd51652f9
Merge branch 'develop' into issue/733
5 years ago
6193157f19
Fix notification warnings
5 years ago
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
5 years ago
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
80c5c3495b
remove remaining errors from tests
5 years ago
9fa2586abd
Refactor SubscriptionNotificationView
5 years ago
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
5 years ago
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
a76168e743
Cleanup PleromaAPIController
5 years ago
a81f80233d
Apply suggestion to lib/pleroma/web/router.ex
5 years ago
f9be517c7f
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
c0f776faec
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
2688b876ab
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
6042e21b25
Move subscription notifications to a separate controller
5 years ago
56b60798c2
Code style fixes
5 years ago
76c3e290fc
Merge develop
5 years ago
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
5 years ago
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
5 years ago
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
5 years ago
d75bc728e7
Merge branch 'develop' into issue/733
5 years ago
b4cf74c106
added prepare html for RichMedia.Parser
5 years ago
8751809e1e
Merge branch 'develop' into support/tests
5 years ago
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
9c64a25713
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
5 years ago
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
5 years ago
d7457c9165
Merge branch 'develop' into refactor/subscription
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
1be09bde2d
Merge branch 'refactor/add_link_headers' into 'develop'
...
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
5 years ago
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
5 years ago
ac4a748fad
Disallow NULLs in deliveries
5 years ago
69faec031d
markdown generation to the new file
5 years ago
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
8900cb68ae
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
05f8a066a1
Apply suggestion to lib/pleroma/delivery.ex
5 years ago
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
5 years ago
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
3896a51b8a
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
5170170483
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
fb96facc32
Remove unused functions and fix credo issues
5 years ago
ce23529d91
Use delivery info when federating deletes
5 years ago
25d8216804
Add email change endpoint
5 years ago
Egor Kislitsyn