68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
5 years ago
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
5 years ago
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
8d31530119
Cleanup ScheduledActivityView
5 years ago
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
6c7c35dbe1
Fix SubscriptionNotificationView
5 years ago
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
5 years ago
14294243a2
mastodon api: implement follow_requests_count
5 years ago
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
5 years ago
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
5 years ago
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
5 years ago
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
5 years ago
73ae38ca04
add deprecated tag
5 years ago
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
75290cbfbd
Add Pleroma.JobQueueMonitor
5 years ago
b4b147000c
Merge develop
5 years ago
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
c57ad0a402
Cleanup CommonAPI
5 years ago
de3e90e536
Add ActivityDraft.with_valid/2
5 years ago
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
5 years ago
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
5 years ago
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
5 years ago
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
f2880d7d29
Credo considered harmful
5 years ago
c7d8ccd0c4
Remove useless with clause
5 years ago
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
5 years ago
1fd9c60f87
Fix emoji tags for shareable packs to be "pack:{name}"
5 years ago
118d6dcdf4
Fix nodeinfo handling
5 years ago
ba9d35a904
Add an API endpoint for listing remote packs
5 years ago
a6e85215e1
Credo fix (remove parens on function definition)
5 years ago
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
5 years ago
cdbe7cd37a
When listing emoji packs, be sure to create the directory
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
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
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
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
e4f3d7f69d
Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
5 years ago
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
5 years ago
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
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
b4d775161c
[ #1234 ] Undone reordering-related changes in router.ex.
5 years ago
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
kaniini