lain
|
511ccea5aa
|
ConversationView: Align parameter names with other views.
|
2019-08-12 14:23:06 +02:00 |
|
lain
|
60231ec7bd
|
Conversation: Add endpoint to get a conversation by id.
|
2019-08-12 13:58:04 +02:00 |
|
lain
|
23c46f7e72
|
Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
|
2019-08-12 12:51:08 +02:00 |
|
lain
|
a2b98f6d58
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
2019-08-08 16:04:20 +02:00 |
|
Haelwenn
|
aa718ab8f6
|
Merge branch 'fix/object-reembeds' into 'develop'
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
|
2019-08-06 22:14:00 +00:00 |
|
rinpatch
|
5329e84d62
|
OStatus tests: stop relying on embedded objects
|
2019-08-07 00:58:48 +03:00 |
|
rinpatch
|
32018a4ee0
|
ActivityPub tests: remove assertions of embedded object being updated,
because the objects are no longer supposed to be embedded
|
2019-08-07 00:36:13 +03:00 |
|
Maksim
|
139b196bc0
|
[#1150] fixed parser TwitterCard
|
2019-08-06 20:19:28 +00:00 |
|
lain
|
a49c92f6ae
|
Participation: Setting recipients will always add the owner.
|
2019-08-06 14:51:17 +02:00 |
|
Maksim
|
bdc9a7222c
|
tests for CommonApi/Utils
|
2019-08-05 15:37:05 +00:00 |
|
lain
|
d6fe220e32
|
Linting.
|
2019-08-05 16:11:23 +02:00 |
|
lain
|
b64b6fee2a
|
CommonAPI: Replies to conversations also get the correct context id.
|
2019-08-05 15:33:22 +02:00 |
|
lain
|
3af6d14da7
|
Pleroma Conversations API: Add a way to set recipients.
|
2019-08-05 15:09:19 +02:00 |
|
Eugenij
|
96028cd585
|
Remove Reply-To from report emails
|
2019-08-04 22:24:50 +00:00 |
|
Sergey Suprunenko
|
e8ad116c2a
|
Do not add the "next" key to likes.json if there is no more items
|
2019-08-04 17:13:06 +00:00 |
|
Alexander Strizhakov
|
de0f3b73dd
|
Admin fixes
|
2019-08-03 18:16:09 +00:00 |
|
Sergey Suprunenko
|
040347b248
|
Remove spaces from the domain search
|
2019-08-03 18:13:20 +00:00 |
|
Sergey Suprunenko
|
8b2fa31fed
|
Handle MRF rejections of incoming AP activities
|
2019-08-03 18:12:38 +00:00 |
|
lain
|
eee98aaa73
|
Pleroma API: Add endpoint to get conversation statuses.
|
2019-08-02 19:53:08 +02:00 |
|
|
|
d93d777915
|
Fix/mediaproxy whitelist base url
|
2019-08-02 17:07:09 +00:00 |
|
lain
|
56b1c3af13
|
CommonAPI: Extend api with conversation replies.
|
2019-08-02 15:05:27 +02:00 |
|
lain
|
5ff8f07ca9
|
Merge branch 'feature/hide-follows-remote' into 'develop'
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
|
2019-08-02 11:23:07 +00:00 |
|
lain
|
f88560accd
|
Conversations: Add recipient list to conversation participation.
This enables to address the same group of people every time.
|
2019-08-02 11:55:41 +02:00 |
|
Egor Kislitsyn
|
f98235f2ad
|
Clean up tests output
|
2019-08-01 16:33:36 +07:00 |
|
kaniini
|
6c06529cd4
|
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
|
2019-07-31 19:13:56 +00:00 |
|
rinpatch
|
813c686dd7
|
Disallow following locked accounts over OStatus
|
2019-07-31 22:05:12 +03:00 |
|
Maksim
|
6eb33e7303
|
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
|
2019-07-31 18:35:15 +00:00 |
|
Ariadne Conill
|
f72e0b7cad
|
ostatus: explicitly disallow protocol downgrade from activitypub
This closes embargoed bug #1135.
|
2019-07-31 18:17:31 +00:00 |
|
rinpatch
|
301ea0dc04
|
Add tests for counters being updated on follow
|
2019-07-31 21:09:13 +03:00 |
|
Maksim
|
58443d0cd6
|
tests for TwitterApi/UtilController
|
2019-07-31 15:14:36 +00:00 |
|
lain
|
7483679a7b
|
StatusView: Return direct conversation id.
|
2019-07-31 15:12:29 +02:00 |
|
rinpatch
|
c88a5d3251
|
Merge branch 'develop' into feature/hide-follows-remote
|
2019-07-31 14:12:29 +03:00 |
|
Alexander Strizhakov
|
51b3b6d816
|
Admin changes
|
2019-07-30 16:36:05 +00:00 |
|
kaniini
|
5835069215
|
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
This reverts merge request !1504
|
2019-07-29 19:42:26 +00:00 |
|
Ariadne Conill
|
5795a890e9
|
markdown: clean up html generated by earmark
|
2019-07-29 19:09:58 +00:00 |
|
lain
|
1dfde4151c
|
Merge branch 'refactor/use-constants' into 'develop'
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
|
2019-07-29 16:30:47 +00:00 |
|
Sergey Suprunenko
|
c0e258cf21
|
Redirect not logged-in users to the MastoFE login page on private instances
|
2019-07-29 16:17:22 +00:00 |
|
Maksim
|
159bbec570
|
added tests for OstatusController
|
2019-07-29 05:02:20 +00:00 |
|
Ariadne Conill
|
b93498eb52
|
constants: add as_public constant and use it everywhere
|
2019-07-29 02:43:19 +00:00 |
|
Ariadne Conill
|
492d854e7a
|
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
|
2019-07-28 21:32:04 +00:00 |
|
Sachin Joshi
|
242f5c585e
|
add account confirmation email resend in mastodon api
|
2019-07-28 20:30:10 +00:00 |
|
Maksim
|
6a4b8b2681
|
fixed User.update_and_set_cache for stale user
|
2019-07-28 20:29:26 +00:00 |
|
Maksim
|
6b77a88365
|
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
|
2019-07-26 20:27:38 +00:00 |
|
rinpatch
|
41e0304757
|
Merge branch 'develop' into feature/hide-follows-remote
|
2019-07-25 18:43:30 +03:00 |
|
Maksim
|
03c386614f
|
fixed test for elixir 1.7.4
|
2019-07-25 03:43:13 +00:00 |
|
kaniini
|
19835be067
|
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
|
2019-07-24 19:29:01 +00:00 |
|
Sergey Suprunenko
|
b20020da16
|
Show the url advertised in the Activity in the Status JSON response
|
2019-07-24 19:28:21 +00:00 |
|
kPherox
|
8d9f43e1d1
|
Add WebFinger test for AP-only account
|
2019-07-25 01:27:34 +09:00 |
|
|
|
84fca14c3c
|
Do not prepend /media/ when using base_url
This ensures admin has full control over the path where media resides.
|
2019-07-24 15:35:25 +00:00 |
|
Maksim
|
55341ac717
|
tests WebFinger
|
2019-07-24 15:13:10 +00:00 |
|
