Egor Kislitsyn
e0c68eeb02
Move :favourites and :bookmarks actions to StatusController
2019-10-02 21:31:19 +07:00
Egor Kislitsyn
7f2bc57725
Move follows, mutes and blocks actions to AccountController
2019-10-02 21:22:21 +07:00
Egor Kislitsyn
d3c404af12
Add MastoFEController
2019-10-02 20:36:08 +07:00
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController
2019-10-02 19:16:34 +07:00
kaniini
433f2c0f68
Merge branch 'split-masto-api/instance' into 'develop'
...
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
2019-10-02 10:46:14 +00:00
kaniini
debd0a3066
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769
2019-10-02 10:45:55 +00:00
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
2019-10-02 12:15:06 +02:00
Thibaut Girka
3d61efa7c9
Rename misleading get_announce_visibility to public_announce?
2019-10-02 10:48:34 +02:00
Egor Kislitsyn
26693292f4
Remove :enqueued counter
2019-10-02 14:50:25 +07:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController
2019-10-02 14:13:52 +07:00
kaniini
89ab673d00
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
...
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
2019-10-02 07:04:33 +00:00
kaniini
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
2019-10-02 07:02:56 +00:00
kaniini
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
2019-10-02 07:02:24 +00:00
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
2019-10-01 22:39:25 +02:00
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
2019-10-01 20:00:27 +00:00
Thibaut Girka
43e3db0951
Fix returned visibility of announces in MastodonAPI
2019-10-01 20:38:29 +02:00
Thibaut Girka
4c1f158f5d
Allow users to announce privately, including own private notes
2019-10-01 20:00:59 +02:00
Maxim Filippov
b2273c695e
Discard identifier, if empty
2019-10-01 19:43:22 +03:00
Thibaut Girka
fe538973dd
Ensure self-announces do not widen the audience of the original post
2019-10-01 18:38:57 +02:00
KokaKiwi
1f0be71ea4
Make activity announceable by its author.
2019-10-01 17:47:43 +02:00
Maxim Filippov
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
2019-10-01 18:10:04 +03:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController
2019-10-01 15:54:45 +07:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController
2019-10-01 15:21:46 +07:00
Egor Kislitsyn
39695c4436
Extract suggestions actions from MastodonAPIController to SuggestionController
2019-10-01 15:07:49 +07:00
Egor Kislitsyn
585bc57edb
Extract media actions from MastodonAPIController to MediaController
2019-10-01 14:36:35 +07:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController
2019-10-01 11:44:34 +07:00
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
2019-10-01 01:40:33 +09:00
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
2019-09-30 18:13:05 +02:00
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-09-30 17:41:20 +03:00
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController
2019-09-30 19:32:43 +07:00
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
2019-09-30 19:10:56 +07:00
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
e7aef27c00
Fix merge
2019-09-30 19:10:54 +07:00
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
kaniini
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
2019-09-30 11:17:30 +00:00
kaniini
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
2019-09-30 10:49:40 +00:00
Egor Kislitsyn
b7f27a4f58
Extract report actions from MastodonAPIController to ReportController
...
Update MastodonAPI.ReportView
2019-09-30 17:44:10 +07:00
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
Ariadne Conill
e653edd182
split scrobble functions into their own controller
2019-09-30 10:39:48 +00:00
Ariadne Conill
a6e1469767
router: change scrobble timeline route from now-playing to scrobbles
2019-09-30 10:39:48 +00:00
Ariadne Conill
8b34b221cb
common api: add some missing IR bits for listen activities' children
2019-09-30 10:39:48 +00:00
Ariadne Conill
84712c35f9
activitypub: object view: include child object for Listen activities
2019-09-30 10:39:48 +00:00
Ariadne Conill
71eff09e56
common api: make sure the generated IR is actually federatable
2019-09-30 10:39:48 +00:00
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
2019-09-30 10:39:17 +00:00
Ariadne Conill
2c82d8603b
common api: implement scrobbling
2019-09-30 10:39:17 +00:00
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
2019-09-30 10:39:17 +00:00
Egor Kislitsyn
d4d88b3361
Extract conversation actions from MastodonAPIController to ConversationController
2019-09-30 16:52:07 +07:00
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
2019-09-29 11:44:31 +00:00
Maksim Pechnikov
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined
2019-09-28 01:53:41 +02:00
rinpatch
374f83d29b
Fix not being able to post empty statuses with attachments
...
Attachment field was filled in after the empty status check
2019-09-28 01:58:06 +03:00
minibikini
f9380289eb
Add remote_ip plug
2019-09-27 21:59:23 +00:00
kaniini
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
2019-09-27 07:54:54 +00:00
kaniini
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
2019-09-27 07:54:08 +00:00
kaniini
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
2019-09-27 07:53:22 +00:00
Egor Kislitsyn
408750b94e
Extract domain blocks actions from MastodonAPIController to DomainBlockController
2019-09-27 14:28:05 +07:00
Egor Kislitsyn
99c5a35890
Extract follow requests actions from MastodonAPIController to FollowRequestController
2019-09-27 14:25:17 +07:00
Egor Kislitsyn
8d31530119
Cleanup ScheduledActivityView
2019-09-27 13:36:28 +07:00
Egor Kislitsyn
0a5b106ddd
Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController
2019-09-27 13:36:28 +07:00
Egor Kislitsyn
621377f378
Extract filter actions from MastodonAPIController to FilterController
2019-09-27 13:06:25 +07:00
Egor Kislitsyn
6c7c35dbe1
Fix SubscriptionNotificationView
2019-09-27 11:55:47 +07:00
kaniini
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
2019-09-27 04:37:48 +00:00
Ariadne Conill
14294243a2
mastodon api: implement follow_requests_count
2019-09-27 04:22:40 +00:00
Egor Kislitsyn
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
2019-09-27 10:52:47 +07:00
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
Egor Kislitsyn
98d1347a4e
Extract status actions from MastodonAPIController into StatusController
2019-09-27 10:51:15 +07:00
kaniini
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
2019-09-27 03:46:02 +00:00
kaniini
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
2019-09-27 03:42:30 +00:00
Maksim Pechnikov
73ae38ca04
add deprecated tag
2019-09-26 21:08:04 +03:00
Maksim Pechnikov
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 20:56:59 +03:00
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 16:16:30 +03:00
Egor Kislitsyn
75290cbfbd
Add Pleroma.JobQueueMonitor
2019-09-26 18:49:57 +07:00
Roman Chvanikov
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
Egor Kislitsyn
3572cf29b7
Extract timeline actions from MastodonAPIController into TimelineController
2019-09-26 10:53:42 +07:00
Egor Kislitsyn
c57ad0a402
Cleanup CommonAPI
2019-09-26 10:33:13 +07:00
Egor Kislitsyn
de3e90e536
Add ActivityDraft.with_valid/2
2019-09-26 10:29:34 +07:00
Egor Kislitsyn
eed774d058
Add CommonAPI.ActivityDraft
2019-09-26 10:29:34 +07:00
kaniini
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
2019-09-26 03:13:22 +00:00
kaniini
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
2019-09-26 03:12:03 +00:00
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
kaniini
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
kaniini
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
2019-09-26 02:49:45 +00:00
kaniini
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
2019-09-26 00:03:47 +00:00
rinpatch
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
2019-09-25 13:38:45 +00:00
rinpatch
f2880d7d29
Credo considered harmful
2019-09-25 16:36:46 +03:00
rinpatch
c7d8ccd0c4
Remove useless with clause
2019-09-25 16:26:47 +03:00
rinpatch
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-25 13:20:48 +00:00
rinpatch
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.
2019-09-25 15:59:04 +03:00
Ekaterina Vaartis
1fd9c60f87
Fix emoji tags for shareable packs to be "pack:{name}"
2019-09-25 12:34:03 +02:00
Ekaterina Vaartis
118d6dcdf4
Fix nodeinfo handling
2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
ba9d35a904
Add an API endpoint for listing remote packs
2019-09-25 12:32:19 +02:00
vaartis
a6e85215e1
Credo fix (remove parens on function definition)
2019-09-25 12:32:19 +02:00
vaartis
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
cdbe7cd37a
When listing emoji packs, be sure to create the directory
2019-09-25 12:32:19 +02:00
Egor Kislitsyn
b5dfe83433
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
Haelwenn (lanodan) Monnier
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
2019-09-24 19:03:06 +02:00
Egor Kislitsyn
035f22f784
Fix Credo warnings
2019-09-24 19:50:09 +07:00
Egor Kislitsyn
1bea67cb5e
Cleanup Pleroma.User
2019-09-24 19:50:09 +07:00
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
Egor Kislitsyn
a66a7a328f
Extract notification actions from MastodonAPIController into NotificationController
2019-09-24 15:16:44 +07:00
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-24 08:06:04 +03:00
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
kaniini
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
2019-09-23 22:35:09 +00:00
kaniini
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
Steven Fuchs
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
Ekaterina Vaartis
e63f167f01
Also pretty print pack.json
2019-09-24 00:37:27 +03:00
Rachel Fae Fox
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
2019-09-23 20:38:53 +00:00
Maksim Pechnikov
494bb6bac6
updated tests
2019-09-23 22:37:30 +03:00
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03:00
Maksim Pechnikov
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
rinpatch
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
rinpatch
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
2019-09-23 21:14:51 +03:00
Haelwenn (lanodan) Monnier
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
Maxim Filippov
d72d4757a8
Format
2019-09-22 23:13:48 +03:00
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
Maxim Filippov
72a01f1350
Use router helper to generate reset password link
2019-09-22 16:36:59 +03:00
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
eugenijm
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)
2019-09-20 18:27:00 +03:00
lain
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
2019-09-19 16:53:59 +00:00
D Anzorge
0e6085da10
Fix pagination in AP outbox.json
2019-09-19 16:09:07 +02:00
Alex S
1d285e6fad
moving to separate dir
2019-09-19 14:02:27 +03:00
Alex S
924d7e6aa6
generating remote activities
2019-09-19 12:59:36 +03:00
Ivan Tashkinov
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
2019-09-19 10:59:09 +03:00
Egor Kislitsyn
95c948110c
Add rel="ugc" to hashtags and mentions
2019-09-19 14:56:10 +07:00
Egor Kislitsyn
cf3041220a
Add support for rel="ugc"
2019-09-19 14:56:10 +07:00
eugenijm
fe5e0b7846
Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)
2019-09-19 08:59:25 +03:00
Maksim Pechnikov
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
Haelwenn
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
2019-09-18 22:28:10 +00:00
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
Ekaterina Vaartis
b585134c90
Get the nodeinfo address from the well-known
2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
a1325d5fd9
Change path from nodeinfo to metadata->features
2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
d51e5e447e
Move emoji reloading to admin api
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7680aec17d
Move emoji api to pleroma api dir
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
6cd651a38b
Make the emoji controller api more RESTy
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
3971bf9c5f
Change :sha to :checksum
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7c784128fd
Change emoji api responses to JSON
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f24731788e
Move emoji pack list from /list to /
2019-09-19 00:16:33 +03:00
vaartis
cb125ffaf7
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8f509e6d1e
Use with w/ pack_info_res
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8790365fef
Remove unused variable
2019-09-19 00:16:33 +03:00
vaartis
b8a214b0ab
Split list_packs
2019-09-19 00:16:33 +03:00
vaartis
f251225cae
Apply suggestions to emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
vaartis
c049c32270
Fixed a typo in create_archive_and_cache
2019-09-19 00:16:33 +03:00
vaartis
163082de6f
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f6d4acc871
Fix credo warnings
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
87057101b0
Add documentation for the emoji api endpoints
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
13cd93a0d3
Use && insted of "and" for checking shared-files for packs
...
share-files can be nil and "and" does not like that
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f5131540dc
Add a way to create emoji packs via an endpoint
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8dbdd5c280
Allow uploading new emojis to packs from URLs
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
16edfef12e
Handle empty shortcode/filename/new_shortcode/new_filename
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9afe7258dd
Implememt emoji pack file updating + write tests
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
261d92f9c2
Update the pack fallback-src sha generation condition
...
The old one would not regenerate sha when fallback src changed
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
bcc0bfd0c5
Add an endpoint for emoji pack metadata updating
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
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
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2a94eca096
Change YAML to JSON
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b0ecd412f5
Clean out old emojis on reload
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2d4b8f3d20
Add an endpoint for deleting emoji packs
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
3a8669b487
Fix responses for emoji pack controlller
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7a0c755d0a
Send ok for emoji reloading as text, not as json
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
ee620ecbf1
Add caching for emoji pack sharing
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7fb7dd9e0e
Only find SHA256 for packs that are shared
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
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
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b791a08656
Implement API actions on packs
...
That incldues listing them and downloading them from other instances
or from the remote url
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
6a42641b8d
Add pack.toml loading
2019-09-19 00:16:33 +03:00
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
2019-09-18 21:13:15 +00:00
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
2019-09-18 21:11:37 +00:00
Haelwenn
e32d099a3a
Merge branch 'feature/poll-refresh' into 'develop'
...
Poll refetching
See merge request pleroma/pleroma!1694
2019-09-18 20:58:53 +00:00
rinpatch
5028b7b578
Fix credo issues
2019-09-18 22:09:03 +03:00
rinpatch
c096dd86e5
Do not refetch local objects
2019-09-18 20:01:26 +03:00
rinpatch
eb87a86b5b
Preserve internal fields when reinjecting
2019-09-18 19:53:51 +03:00
rinpatch
d32894ae51
Move object internal fields to a constant
2019-09-18 19:24:20 +03:00
rinpatch
e3f902b3a1
Set updated_at even if the object stayed the same
2019-09-18 19:07:25 +03:00
rinpatch
a9c700ff15
Fix wrong argument order when calling NaiveDateTime.diff
2019-09-18 18:52:33 +03:00
rinpatch
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
Maxim Filippov
384b7dd40d
Fix response
2019-09-18 18:06:49 +03:00
Maxim Filippov
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-18 16:44:11 +03:00
Ivan Tashkinov
e4f3d7f69d
Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
2019-09-18 10:31:10 +00:00
Ivan Tashkinov
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
2019-09-18 12:31:33 +03:00
Ivan Tashkinov
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
2019-09-18 12:06:38 +03:00
Alex S
a18f1e7cd7
namings
2019-09-18 10:49:14 +03:00
Alex S
2263c8b6b9
little fixes
2019-09-18 10:49:14 +03:00
Alex S
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
Haelwenn (lanodan) Monnier
e501c822c9
markdown.ex: put two-spaces before the description-newline
2019-09-17 23:05:27 +02:00
