Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
5 years ago |
Egor Kislitsyn
|
768c1a5de1
|
Fix tests
|
5 years ago |
Egor Kislitsyn
|
27cd1374e3
|
Add a notification for Move activities
|
5 years ago |
Egor Kislitsyn
|
c57ad0a402
|
Cleanup CommonAPI
|
5 years ago |
Egor Kislitsyn
|
eed774d058
|
Add CommonAPI.ActivityDraft
|
5 years ago |
kaniini
|
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 |
Egor Kislitsyn
|
b5dfe83433
|
Replace `Pleroma.FlakeId` with `flake_id` hex package
|
5 years ago |
Maksim Pechnikov
|
6ef0103ca0
|
added Emoji struct
|
5 years ago |
Maksim Pechnikov
|
d8098d142a
|
added Emoji.Formatter
|
5 years ago |
Maksim Pechnikov
|
d7808b5db4
|
added code\path fields without html tags in ets
|
5 years ago |
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
5 years ago |
lain
|
a2b98f6d58
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
5 years ago |
Maksim
|
bdc9a7222c
|
tests for CommonApi/Utils
|
5 years ago |
lain
|
b64b6fee2a
|
CommonAPI: Replies to conversations also get the correct context id.
|
5 years ago |
lain
|
56b1c3af13
|
CommonAPI: Extend api with conversation replies.
|
5 years ago |
Maksim
|
6eb33e7303
|
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
|
5 years ago |
kaniini
|
5835069215
|
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
This reverts merge request !1504
|
5 years ago |
Ariadne Conill
|
5795a890e9
|
markdown: clean up html generated by earmark
|
5 years ago |
Ariadne Conill
|
b93498eb52
|
constants: add as_public constant and use it everywhere
|
5 years ago |
Mark Felder
|
6a79bb12c3
|
Fix function
|
5 years ago |
Mark Felder
|
fd287387a0
|
Do not notify subscribers for messages from users which are replies to others
|
5 years ago |
kaniini
|
ee5250ae56
|
Merge branch 'sha512-crypt' into 'develop'
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
|
5 years ago |
Egor Kislitsyn
|
de13c9bb8f
|
List messages must be visible for mentioned users
|
5 years ago |
Egor Kislitsyn
|
a87c313309
|
Support `list` visibility in StatusView
|
5 years ago |
Moonman
|
f98f7ad1b9
|
detect and use sha512-crypt for stored password hash.
|
5 years ago |
Egor Kislitsyn
|
958fb9aa80
|
Add "listMessage"
|
5 years ago |
Egor Kislitsyn
|
182f7bbb11
|
Merge branch 'develop' into feature/addressable-lists
|
5 years ago |
Egor Kislitsyn
|
5104f65b69
|
Wrap error messages into gettext helpers
|
5 years ago |
rinpatch
|
c4e4f7d0e4
|
Add proper error handling for when the post exceeds character limits
|
5 years ago |
Egor Kislitsyn
|
ddd4a09b72
|
Fix merge conflict
|
5 years ago |
Egor Kislitsyn
|
cfa5572d28
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
5 years ago |
Egor Kislitsyn
|
9ce928d823
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
5 years ago |
lain
|
80d4d83aac
|
CommonAPI: Add explicit addressing.
|
5 years ago |
rinpatch
|
300d94c628
|
Add poll votes
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
|
5 years ago |
Egor Kislitsyn
|
f333041a0a
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
5 years ago |
rinpatch
|
5f67c26baf
|
Accept strings in expires_in because sasuga javascript
|
5 years ago |
rinpatch
|
a53d062730
|
Fix posting non-polls from mastofe
|
5 years ago |
rinpatch
|
3f96b3e4b8
|
Enforce poll limits and add error handling for MastodonAPI's post endpoint
|
5 years ago |
rinpatch
|
1d90f9b969
|
Remove tags/mentions/rich text from poll options because Mastodon and
add custom emoji
|
5 years ago |
rinpatch
|
5ece901af3
|
Resolve merge conflicts and remove IO.inspects
|
5 years ago |
rinpatch
|
fd920c8973
|
Mastodon API: Add support for posting polls
|
5 years ago |
William Pitcock
|
c4a55e167a
|
add Changelog entry
|
5 years ago |
William Pitcock
|
dc08159538
|
also suppress link previews from posts marked #nsfw
|
5 years ago |
Egor Kislitsyn
|
557f0e33a7
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
5 years ago |
Egor Kislitsyn
|
f2936e0a07
|
Add `ap_id` to List
|
5 years ago |
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
5 years ago |
Egor Kislitsyn
|
e82e73478e
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
5 years ago |
Egor Kislitsyn
|
23276e8d68
|
Use pseudo ap id of a list in BCC
|
5 years ago |
Egor Kislitsyn
|
a3dc02d282
|
Add addressable lists
|
5 years ago |