rinpatch
|
50f5a92021
|
fix not being able to pin polls
|
5 years ago |
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
5 years ago |
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 |
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
5 years ago |
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
5 years ago |
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
feld
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
5 years ago |
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
5 years ago |
Egor Kislitsyn
|
768c1a5de1
|
Fix tests
|
5 years ago |
Egor Kislitsyn
|
27cd1374e3
|
Add a notification for Move activities
|
5 years ago |
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
5 years ago |
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
lain
|
276a520163
|
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
|
5 years ago |
Maxim Filippov
|
8dcc2f9f5e
|
Admin API: Allow changing the state of multiple reports at once
|
5 years ago |
lain
|
9cfe9a57c5
|
CommonAPI: Add unreactions.
|
5 years ago |
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
Thibaut Girka
|
3d61efa7c9
|
Rename misleading `get_announce_visibility` to `public_announce?`
|
5 years ago |
Thibaut Girka
|
4c1f158f5d
|
Allow users to announce privately, including own private notes
|
5 years ago |
lain
|
b923842e96
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
Ariadne Conill
|
8b34b221cb
|
common api: add some missing IR bits for listen activities' children
|
5 years ago |
Ariadne Conill
|
71eff09e56
|
common api: make sure the generated IR is actually federatable
|
5 years ago |
Ariadne Conill
|
2c82d8603b
|
common api: implement scrobbling
|
5 years ago |
rinpatch
|
374f83d29b
|
Fix not being able to post empty statuses with attachments
Attachment field was filled in after the empty status check
|
5 years ago |
Egor Kislitsyn
|
c57ad0a402
|
Cleanup CommonAPI
|
5 years ago |
Egor Kislitsyn
|
de3e90e536
|
Add ActivityDraft.with_valid/2
|
5 years ago |
Egor Kislitsyn
|
eed774d058
|
Add CommonAPI.ActivityDraft
|
5 years ago |
kaniini
|
48a82c4609
|
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
|
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 |
Egor Kislitsyn
|
1bea67cb5e
|
Cleanup Pleroma.User
|
5 years ago |
Egor Kislitsyn
|
209395c7e6
|
Add User.change_info/2 and User.update_info/2
|
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 |
lain
|
b770ed1d99
|
CommonAPI: Support emoji reactions.
|
5 years ago |
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
5 years ago |
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
5 years ago |
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
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 |