lain
99ea990a16
PleromaAPIController: Add emoji reactions.
2019-09-04 12:20:35 -05:00
Maxim Filippov
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
2019-09-04 19:40:07 +03:00
Sadposter
cb99cfcc65
don't try to truncate non-strings
2019-09-04 15:57:42 +01:00
Sadposter
2975da284b
truncate remote user bio/display name
2019-09-04 15:45:40 +01:00
Maksim Pechnikov
a890451187
fetch_announcements -> take_announcements
2019-09-04 17:42:27 +03:00
Maksim Pechnikov
8cbad5500c
add tests for activity_pub/utils.ex
2019-09-04 15:25:12 +03:00
Haelwenn
e72531bfac
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'
...
Mastodon API: Add `pleroma.thread_muted` to Status entity
See merge request pleroma/pleroma!1626
2019-09-04 11:26:34 +00:00
rinpatch
3face45467
Mastodon API: Add pleroma.thread_muted to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
Haelwenn
e54694748b
Merge branch 'feature/mastoapi-read-notifications' into 'develop'
...
Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities
See merge request pleroma/pleroma!1625
2019-09-04 10:46:49 +00:00
rinpatch
328b2612cd
Clarify that read notifications are returned
2019-09-04 13:39:39 +03:00
rinpatch
377aa9fb90
Apply suggestion to docs/api/pleroma_api.md
2019-09-04 10:37:43 +00:00
rinpatch
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
2019-09-04 10:14:15 +00:00
rinpatch
c2b6c1b089
Extend /api/pleroma/notifications/read to mark multiple notifications
...
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
lain
9bc12b88b3
ActivityPub: Save emoji reactions in object.
2019-09-03 16:50:04 -05:00
rinpatch
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
2019-09-03 19:26:10 +03:00
Ashlynn Anderson
4b422b5469
Switch to official elixir:1.9-alpine image for build
2019-09-03 11:44:57 -04:00
Ivan Tashkinov
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
2019-09-03 17:12:15 +03:00
Ashlynn Anderson
bd8b92ea5e
Remove dynamic config as default, add healthcheck
2019-09-03 09:31:52 -04:00
rinpatch
46ffd8b3b6
Merge branch 'feature/pagination-total' into 'develop'
...
Return total items count from pagination + tests
See merge request pleroma/pleroma!1620
2019-09-03 13:03:06 +00:00
Maxim Filippov
b15cfd80ef
Return "total" optionally
2019-09-03 13:58:27 +03:00
Maxim Filippov
a4c5f71e93
Return total from pagination + tests
2019-09-02 22:48:52 +03:00
Ivan Tashkinov
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.
2019-09-02 14:57:40 +03:00
Sadposter
e73685834c
add mandatory fields for user update
2019-09-02 12:35:55 +01:00
Sadposter
d0f07e55d2
use atom key for fields
2019-09-02 12:31:23 +01:00
Sadposter
05c935c396
mix format
2019-09-02 12:15:40 +01:00
Sadposter
35ef470d00
truncate fields for remote users instead
2019-09-02 12:15:21 +01:00
Maxim Filippov
6c2fd1b78b
Fix tests
2019-09-01 21:38:15 +03:00
Maxim Filippov
c5ffbfb8d5
Changelog entry
2019-09-01 21:25:55 +03:00
Maxim Filippov
9c96b17e16
Add pagination to logs
2019-09-01 21:23:30 +03:00
Ivan Tashkinov
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced enqueue/3).
2019-08-31 21:58:42 +03:00
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
rinpatch
70eed0594c
credo fixes
2019-08-31 13:08:43 +03:00
rinpatch
bd3ed3a622
Add back /api/qvitter/statuses/notifications/read.json
2019-08-31 11:43:06 +03:00
rinpatch
9cabc02864
Remove a useless import
2019-08-31 10:57:35 +03:00
rinpatch
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
2019-08-31 10:45:37 +03:00
rinpatch
64410497d2
Remove TwitterAPI representers
2019-08-31 10:41:15 +03:00
rinpatch
2e7bb107e0
Remove Mention of TwitterAPI in readme
2019-08-31 10:37:26 +03:00
rinpatch
985122cc03
Remove Activity, User and Notification views from TwitterAPI
2019-08-31 10:31:15 +03:00
AkiraFukushima
7808eee9aa
Update Japanese document to follow English document
2019-08-31 16:23:15 +09:00
rinpatch
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
2019-08-31 10:20:34 +03:00
Maksim Pechnikov
6ef0103ca0
added Emoji struct
2019-08-31 10:14:53 +03:00
Maxim Filippov
4d6e22bb9b
Style
2019-08-31 01:09:48 +03:00
Maxim Filippov
f182f0f6bd
Add ability to search moderation logs
2019-08-31 00:57:15 +03:00
ultem
880307e0d5
minor: Fix version dot
2019-08-30 19:41:31 +00:00
Maksim Pechnikov
d8098d142a
added Emoji.Formatter
2019-08-30 22:04:17 +03:00
feld
6d33c89c4d
Merge branch 'iss-930-media' into 'develop'
...
Fix missing changes in pleroma/pleroma!1197
See merge request pleroma/pleroma!1613
2019-08-30 15:23:15 +00:00
kPherox
99b4847da3
Fix missing changes in pleroma/pleroma!1197
2019-08-30 21:00:50 +09:00
Maksim
5c90b70733
Apply suggestion to lib/pleroma/emoji/loader.ex
2019-08-30 07:30:54 +03:00
