rinpatch
|
b8e5e46fa8
|
Fix references to other pages
|
2019-10-03 00:18:32 +03:00 |
|
|
rinpatch
|
74d682a09e
|
Remove Small customizations as it's contents have been integrated into
static_dir.md
|
2019-10-03 00:02:01 +03:00 |
|
|
rinpatch
|
838ff12ec5
|
Remove "General tips for customizing Pleroma FE" because it's no longer
relevant and we have actual fe docs now
|
2019-10-02 23:58:57 +03:00 |
|
|
rinpatch
|
03e1898917
|
Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit
about how Pleroma Configuration works
|
2019-10-02 23:54:55 +03:00 |
|
|
rinpatch
|
acc62f327d
|
Rename some directories because MkDocs uses them for categories
|
2019-10-02 23:28:45 +03:00 |
|
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-02 20:42:40 +03:00 |
|
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 |
|
|
rinpatch
|
c5e937b156
|
Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'
[#1278] Move actions from MastodonAPIController to CustomEmojiController and MastoFEController
See merge request pleroma/pleroma!1772
|
2019-10-02 14:17:21 +00:00 |
|
|
Egor Kislitsyn
|
9b68aab8b3
|
Fix credo warning
|
2019-10-02 21:12:01 +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 |
|
|
kaniini
|
f205d3da1d
|
Merge branch 'get_announce_visibility-name' into 'develop'
Rename misleading `get_announce_visibility` to `public_announce?`
See merge request pleroma/pleroma!1768
|
2019-10-02 10:44:51 +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
|
0fc29deba0
|
Add tests for Pleroma.JobQueueMonitor
|
2019-10-02 15:24:21 +07:00 |
|
|
Egor Kislitsyn
|
93f966ea4b
|
Update CHANGELOG and pleroma_api.md
|
2019-10-02 14:51:30 +07: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 |
|
|
kaniini
|
5eab6561d8
|
Merge branch 'update/admin-fe-20191001' into 'develop'
Update AdminFE bundle
See merge request pleroma/pleroma!1767
|
2019-10-02 07:01:18 +00:00 |
|
Mark Felder
|
a562cb2c34
|
Update AdminFE bundle
|
2019-10-01 18:29:39 -05:00 |
|
feld
|
aaafec7eb8
|
Merge branch 'feature/expose-attachment-size' into 'develop'
Add upload limits to /api/v1/instance
See merge request pleroma/pleroma!1614
|
2019-10-01 22:16:29 +00:00 |
|
|
feld
|
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 |
|
|
feld
|
ee6da62cdb
|
Merge branch 'feature/track-reverse-proxy-failures' into 'develop'
Track failed proxy urls and don't request them again
Closes #1197
See merge request pleroma/pleroma!1618
|
2019-10-01 20:00:27 +00: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
|
7d5a9f3f6d
|
Add tests for privately announcing statuses via API
|
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
|
e0b654e202
|
Add tests
|
2019-10-01 18:38:57 +02: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 |
|
|
kaniini
|
51b5c53988
|
Merge branch 'split-masto-api/apps' into 'develop'
Extract apps actions from `MastodonAPIController` to `AppController`
See merge request pleroma/pleroma!1758
|
2019-10-01 08:32:59 +00:00 |
|
|
Egor Kislitsyn
|
2dad6dd020
|
Extract apps actions from MastodonAPIController to AppController
|
2019-10-01 15:21:46 +07:00 |
|
|
kaniini
|
82d7985ae9
|
Merge branch 'split-masto-api/suggestions' into 'develop'
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
See merge request pleroma/pleroma!1757
|
2019-10-01 08:15:56 +00:00 |
|
|
Egor Kislitsyn
|
39695c4436
|
Extract suggestions actions from MastodonAPIController to SuggestionController
|
2019-10-01 15:07:49 +07:00 |
|
|
kaniini
|
b4369e7e68
|
Merge branch 'split-masto-api/media' into 'develop'
Extract media actions from `MastodonAPIController` to `MediaController`
See merge request pleroma/pleroma!1756
|
2019-10-01 07:57:46 +00:00 |
|
|
Egor Kislitsyn
|
585bc57edb
|
Extract media actions from MastodonAPIController to MediaController
|
2019-10-01 14:36:35 +07:00 |
|
|
kaniini
|
f0b4ba1bf9
|
Merge branch 'split-masto-api/polls' into 'develop'
Extract poll actions from `MastodonAPIController` to `PollController`
See merge request pleroma/pleroma!1755
|
2019-10-01 07:11:54 +00:00 |
|
|
Egor Kislitsyn
|
36a34c36fe
|
Extract poll actions from MastodonAPIController to PollController
|
2019-10-01 11:44:34 +07:00 |
|
kPherox
|
f364438032
|
Add rel="ugc"
|
2019-10-01 02:24:06 +09: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 |
|