e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
6 years ago
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
e6778003ab
JSON need quotes!
6 years ago
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
6 years ago
79cb34a4b0
Fix preview not being usable in form data
6 years ago
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
42b779527c
document fake option
6 years ago
749d53e2b2
Merge branch 'sayonara-gitlab-wiki' into 'develop'
...
Move out of Gitlab Wiki
See merge request pleroma/pleroma!990
6 years ago
9bd80e6044
did it really take me 4 commits to fix this?
6 years ago
d16e2a2e04
Remove duplicated header from admin_api.md
6 years ago
dfae0050af
Move out of Gitlab Wiki
...
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
6 years ago
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
8 years ago
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
6 years ago
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
5564cd421d
Document Prometheus
6 years ago
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
lambda