Egor Kislitsyn
|
dc8fa04192
|
Merge branch 'develop' into global-status-expiration
|
2020-04-13 14:12:51 +04:00 |
|
rinpatch
|
5e365448f3
|
Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
|
2020-04-11 19:46:04 +00:00 |
|
Egor Kislitsyn
|
7f692343c8
|
Merge branch 'develop' into global-status-expiration
|
2020-04-10 14:20:48 +04:00 |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
2020-04-06 11:59:01 +00:00 |
|
lain
|
057438a657
|
CommonAPI: DRY up a bit.
|
2020-03-31 17:56:05 +02:00 |
|
Ivan Tashkinov
|
be9d18461a
|
FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).
|
2020-03-28 18:49:03 +03:00 |
|
Ivan Tashkinov
|
dfbc05d496
|
Misc refactoring / tweaks (ThreadMute.exists?/2).
|
2020-03-27 08:01:03 +03:00 |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
2020-03-19 18:00:55 +01:00 |
|
Egor Kislitsyn
|
d1c7f8e576
|
Merge remote-tracking branch 'origin/develop' into global-status-expiration
|
2020-03-12 16:02:24 +04:00 |
|
lain
|
4bce13fa2f
|
MastodonController: Return 404 errors correctly.
|
2020-03-04 18:09:06 +01:00 |
|
Egor Kislitsyn
|
0f386110c6
|
Merge remote-tracking branch 'origin/develop' into global-status-expiration
|
2020-03-03 00:32:34 +04:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
Egor Kislitsyn
|
4d459b0e99
|
Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4
|
2020-02-13 22:27:10 +04:00 |
|
rinpatch
|
50f5a92021
|
fix not being able to pin polls
|
2020-02-02 14:55:06 +03:00 |
|
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
2020-01-20 14:27:59 +01:00 |
|
lain
|
e9993acdbb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
2019-12-04 16:35:59 +01:00 |
|
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
2019-11-20 15:46:11 +03:00 |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
2019-11-19 23:22:10 +03:00 |
|
|
|
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
|
2019-11-14 13:35:41 +00:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
lain
|
1bd1f62af5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
|
2019-11-05 15:21:00 +01:00 |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-05 02:12:48 +03:00 |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
2019-10-24 14:55:36 +07:00 |
|
lain
|
97d5c79aa0
|
Add Pipeline module, test for federation.
|
2019-10-23 11:52:27 +02:00 |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
2019-10-20 13:42:42 +03:00 |
|
lain
|
66452f518f
|
ObjectValidator: Rewrite LikeValidator with Ecto.
|
2019-10-17 18:36:52 +02:00 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
lain
|
6e4f52f8a2
|
Introduce new ingestion pipeline structure, implement internal Likes with it.
|
2019-10-16 16:16:39 +02:00 |
|
Egor Kislitsyn
|
059005ff82
|
Replace user.following with Pleroma.FollowingRelationship
|
2019-10-11 02:35:32 +07:00 |
|
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-10-07 15:41:41 +03:00 |
|
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-06 08:11:47 +00:00 |
|
lain
|
276a520163
|
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
|
2019-10-05 14:53:50 +02:00 |
|
Maxim Filippov
|
8dcc2f9f5e
|
Admin API: Allow changing the state of multiple reports at once
|
2019-10-04 19:00:58 +03:00 |
|
lain
|
9cfe9a57c5
|
CommonAPI: Add unreactions.
|
2019-10-02 15:38:57 +02:00 |
|
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-02 13:27:55 +02:00 |
|
Thibaut Girka
|
3d61efa7c9
|
Rename misleading get_announce_visibility to public_announce?
|
2019-10-02 10:48:34 +02:00 |
|
Thibaut Girka
|
4c1f158f5d
|
Allow users to announce privately, including own private notes
|
2019-10-01 20:00:59 +02:00 |
|
lain
|
b923842e96
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-09-30 13:57:54 +02:00 |
|
Ariadne Conill
|
8b34b221cb
|
common api: add some missing IR bits for listen activities' children
|
2019-09-30 10:39:48 +00:00 |
|
Ariadne Conill
|
71eff09e56
|
common api: make sure the generated IR is actually federatable
|
2019-09-30 10:39:48 +00:00 |
|
Ariadne Conill
|
2c82d8603b
|
common api: implement scrobbling
|
2019-09-30 10:39:17 +00:00 |
|
Egor Kislitsyn
|
c57ad0a402
|
Cleanup CommonAPI
|
2019-09-26 10:33:13 +07:00 |
|
Egor Kislitsyn
|
eed774d058
|
Add CommonAPI.ActivityDraft
|
2019-09-26 10:29:34 +07:00 |
|
kaniini
|
48a82c4609
|
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
|
2019-09-26 03:00:38 +00:00 |
|
Egor Kislitsyn
|
1bea67cb5e
|
Cleanup Pleroma.User
|
2019-09-24 19:50:09 +07:00 |
|
Egor Kislitsyn
|
209395c7e6
|
Add User.change_info/2 and User.update_info/2
|
2019-09-24 19:50:07 +07:00 |
|
Maksim Pechnikov
|
d8098d142a
|
added Emoji.Formatter
|
2019-08-30 22:04:17 +03:00 |
|
lain
|
b770ed1d99
|
CommonAPI: Support emoji reactions.
|
2019-08-27 17:56:28 -05:00 |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
2019-08-24 17:22:48 +02:00 |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
2019-08-24 15:48:33 +02:00 |
|
