lain
|
a2b98f6d58
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
2019-08-08 16:04:20 +02:00 |
|
Maksim
|
bdc9a7222c
|
tests for CommonApi/Utils
|
2019-08-05 15:37:05 +00:00 |
|
lain
|
b64b6fee2a
|
CommonAPI: Replies to conversations also get the correct context id.
|
2019-08-05 15:33:22 +02:00 |
|
lain
|
56b1c3af13
|
CommonAPI: Extend api with conversation replies.
|
2019-08-02 15:05:27 +02:00 |
|
Maksim
|
6eb33e7303
|
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
|
2019-07-31 18:35:15 +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 |
|
Ariadne Conill
|
b93498eb52
|
constants: add as_public constant and use it everywhere
|
2019-07-29 02:43:19 +00:00 |
|
Mark Felder
|
6a79bb12c3
|
Fix function
|
2019-07-23 13:53:05 -05:00 |
|
Mark Felder
|
fd287387a0
|
Do not notify subscribers for messages from users which are replies to others
|
2019-07-23 13:14:26 -05:00 |
|
kaniini
|
ee5250ae56
|
Merge branch 'sha512-crypt' into 'develop'
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
|
2019-07-15 16:13:17 +00:00 |
|
Egor Kislitsyn
|
de13c9bb8f
|
List messages must be visible for mentioned users
|
2019-07-15 14:54:40 +07:00 |
|
Egor Kislitsyn
|
a87c313309
|
Support `list` visibility in StatusView
|
2019-07-15 14:00:29 +07:00 |
|
Moonman
|
f98f7ad1b9
|
detect and use sha512-crypt for stored password hash.
|
2019-07-14 09:48:42 -07:00 |
|
Egor Kislitsyn
|
958fb9aa80
|
Add "listMessage"
|
2019-07-11 16:36:08 +07:00 |
|
Egor Kislitsyn
|
182f7bbb11
|
Merge branch 'develop' into feature/addressable-lists
|
2019-07-11 13:26:59 +07:00 |
|
Egor Kislitsyn
|
5104f65b69
|
Wrap error messages into gettext helpers
|
2019-07-10 18:10:09 +07:00 |
|
rinpatch
|
c4e4f7d0e4
|
Add proper error handling for when the post exceeds character limits
|
2019-06-18 05:05:05 +03:00 |
|
Egor Kislitsyn
|
ddd4a09b72
|
Fix merge conflict
|
2019-06-05 17:55:00 +07:00 |
|
Egor Kislitsyn
|
cfa5572d28
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-06-05 17:53:15 +07:00 |
|
Egor Kislitsyn
|
9ce928d823
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-06-04 16:28:23 +07:00 |
|
lain
|
80d4d83aac
|
CommonAPI: Add explicit addressing.
|
2019-06-03 18:17:08 +02:00 |
|
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
|
2019-06-01 16:17:46 +03:00 |
|
Egor Kislitsyn
|
f333041a0a
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-05-24 21:05:57 +07:00 |
|
rinpatch
|
5f67c26baf
|
Accept strings in expires_in because sasuga javascript
|
2019-05-21 17:30:51 +03:00 |
|
rinpatch
|
a53d062730
|
Fix posting non-polls from mastofe
|
2019-05-21 14:19:03 +03:00 |
|
rinpatch
|
3f96b3e4b8
|
Enforce poll limits and add error handling for MastodonAPI's post endpoint
|
2019-05-21 10:54:20 +03:00 |
|
rinpatch
|
1d90f9b969
|
Remove tags/mentions/rich text from poll options because Mastodon and
add custom emoji
|
2019-05-19 17:06:44 +03:00 |
|
rinpatch
|
5ece901af3
|
Resolve merge conflicts and remove IO.inspects
|
2019-05-18 13:37:38 +03:00 |
|
rinpatch
|
fd920c8973
|
Mastodon API: Add support for posting polls
|
2019-05-18 13:29:28 +03:00 |
|
William Pitcock
|
c4a55e167a
|
add Changelog entry
|
2019-05-17 23:00:14 +00:00 |
|
William Pitcock
|
dc08159538
|
also suppress link previews from posts marked #nsfw
|
2019-05-17 22:13:24 +00:00 |
|
Egor Kislitsyn
|
557f0e33a7
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-05-17 19:57:14 +07:00 |
|
Egor Kislitsyn
|
f2936e0a07
|
Add `ap_id` to List
|
2019-05-17 19:56:37 +07:00 |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
Egor Kislitsyn
|
e82e73478e
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-05-14 19:00:07 +07:00 |
|
Egor Kislitsyn
|
23276e8d68
|
Use pseudo ap id of a list in BCC
|
2019-05-13 16:15:14 +07:00 |
|
Egor Kislitsyn
|
a3dc02d282
|
Add addressable lists
|
2019-05-01 16:11:17 +07:00 |
|
William Pitcock
|
501af917b5
|
add support for bbcode
|
2019-04-26 22:35:02 +00:00 |
|
rinpatch
|
d21d921def
|
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
|
2019-04-22 11:27:29 +03:00 |
|
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
2019-04-22 07:20:43 +00:00 |
|
rinpatch
|
a53b917e7f
|
oof
|
2019-04-17 14:55:26 +03:00 |
|
rinpatch
|
ad681877df
|
Make credo happy
|
2019-04-17 14:52:01 +03:00 |
|
rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
2019-04-17 12:22:32 +03:00 |
|
rinpatch
|
5d73dca064
|
Remove inReplyToStatusId
|
2019-04-15 11:50:36 +03:00 |
|
Egor
|
f9af90c5aa
|
Revert "simplify mentions escape"
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
|
2019-04-12 19:25:53 +00:00 |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
2019-04-10 10:44:54 +01:00 |
|
Sadposter
|
589629cf3e
|
Used cached user resources in subscriptions
|
2019-04-08 15:56:14 +01:00 |
|
Sadposter
|
76fdfd1c7f
|
Add check on activity visibility in sub notification
|
2019-04-07 15:11:29 +01:00 |
|
Alex S
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
2019-04-06 20:34:00 +07:00 |