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 |
|
Sadposter
|
9ca91cbb87
|
Change relationship direction of subscriptions
|
2019-04-05 17:02:07 +01:00 |
|
Sadposter
|
316fe20d86
|
Make subscriptions the same direction as blocks
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
|
2019-04-05 15:30:26 +01:00 |
|
Sadposter
|
007762e767
|
Add notification checks
|
2019-04-05 15:30:23 +01:00 |
|
lambda
|
256b492a58
|
Merge branch 'bugfix/wrong-date-format' into 'develop'
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
|
2019-04-02 14:18:23 +00:00 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
|
Egor Kislitsyn
|
1b3d921921
|
change Repo.get(User, id) => User.get_by_id(id)
|
2019-04-02 17:01:26 +07:00 |
|
Egor Kislitsyn
|
4212527928
|
change Repo.get(Activity, id) => Activity.get_by_id(id)
|
2019-04-02 16:50:31 +07:00 |
|
Sergey Suprunenko
|
3db9235150
|
Ignore dates in wrong formats
|
2019-04-02 11:32:36 +02:00 |
|
Sergey Suprunenko
|
b6f9f7b8aa
|
Handle dates in the Unix timestamp format (Fixes #763)
|
2019-04-01 22:45:24 +02:00 |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
2019-04-01 17:17:57 +07:00 |
|
William Pitcock
|
a6973a668e
|
formatting
|
2019-03-23 00:28:16 +00:00 |
|
William Pitcock
|
e75e43b949
|
common api: use the optimized Object.normalize whenever possible
|
2019-03-23 00:22:14 +00:00 |
|
kaniini
|
1c3d3d0c2b
|
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
|
2019-03-22 00:50:24 +00:00 |
|
William Pitcock
|
fea3696799
|
common api: move context functions from twitterapi
|
2019-03-21 23:24:04 +00:00 |
|
lain
|
8468f3f6d4
|
Add safe dm mode option.
|
2019-03-20 21:09:36 +01:00 |
|
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
2019-03-13 04:26:54 +01:00 |
|
Egor Kislitsyn
|
5d961d536c
|
fix formatter
|
2019-02-27 15:40:30 +07:00 |
|
Egor
|
c3ac9424d2
|
AutoLinker
|
2019-02-26 23:32:26 +00:00 |
|
Egor
|
bff9eb5ef7
|
Reports
|
2019-02-20 16:51:25 +00:00 |
|
Wim Vanderbauwhede
|
04b1c13554
|
Merge remote-tracking branch 'upstream/develop' into patch-image-description
|
2019-02-14 16:41:40 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6a6a5b3251
|
de-group alias/es
|
2019-02-09 16:31:17 +01:00 |
|
Haelwenn (lanodan) Monnier
|
60ea29dfe6
|
Credo fixes: alias grouping/ordering
|
2019-02-09 14:59:20 +01:00 |
|
Haelwenn (lanodan) Monnier
|
106f4e7a0f
|
Credo fixes: parameter consistency
|
2019-02-09 14:59:20 +01:00 |
|
Haelwenn (lanodan) Monnier
|
8bcfac93a8
|
Make credo happy
|
2019-02-09 14:59:20 +01:00 |
|
kaniini
|
4c99b6d35a
|
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
|
2019-01-25 05:19:32 +00:00 |
|
Maxim Filippov
|
9274cabe01
|
Use correct logic to determine "attentions" list
|
2019-01-24 23:30:43 +03:00 |
|
Haelwenn (lanodan) Monnier
|
98c8184c1f
|
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
|
2019-01-21 08:00:41 +01:00 |
|
Ivan Tashkinov
|
65bb9b2fba
|
[#491] Made full nicknames be preserved in user links text only in Bio.
|
2019-01-18 09:30:16 +03:00 |
|
William Pitcock
|
0bdbd4f968
|
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
ok @lanodan
|
2019-01-10 03:45:58 +00:00 |
|
William Pitcock
|
2ecf81f10c
|
common api: fix newlines in markdown code blocks
|
2019-01-10 03:37:37 +00:00 |
|
Wim Vanderbauwhede
|
ba93396649
|
Patch to support image descriptions in Pleroma FE
|
2019-01-04 16:27:46 +00:00 |
|
Wim Vanderbauwhede
|
4c95545d19
|
Patch to support image descriptions in Pleroma FE
|
2019-01-04 15:35:41 +00:00 |
|
Wim Vanderbauwhede
|
fe2dceb66d
|
Patch to support image descriptions in Pleroma FE
|
2019-01-04 15:22:02 +00:00 |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
2018-12-31 15:41:47 +00:00 |
|
William Pitcock
|
2791ce9a1f
|
add license boilerplate to pleroma core
|
2018-12-23 20:56:42 +00:00 |
|
Maksim Pechnikov
|
baead4ea4b
|
fix markdown formatting
|
2018-12-14 16:03:58 +03:00 |
|
Maksim Pechnikov
|
89b3729afa
|
fix warnings
|
2018-12-12 09:09:19 +03:00 |
|
Maksim Pechnikov
|
074fa790ba
|
fix compile warnings
|
2018-12-09 20:50:08 +03:00 |
|
William Pitcock
|
67038ae15e
|
common api: utils: access inReplyTo object ID correctly
|
2018-12-04 04:52:09 +00:00 |
|
William Pitcock
|
4e93d6ae14
|
common api: utils: flip to/cc for mentions
|
2018-11-08 19:17:01 +00:00 |
|
lain
|
45ebc8dd9a
|
Check for empty string in_reply_to ids.
|
2018-11-02 17:33:51 +01:00 |
|
William Pitcock
|
f407831120
|
common api: prefer formatting attachments using the attachment's name instead of URI
|
2018-10-29 17:59:24 +00:00 |
|
William Pitcock
|
784b3a615d
|
utils: fix another possible leak with private S3 backends using mediaproxy
same rationale as the other mediaproxy changes
|
2018-10-29 17:26:15 +00:00 |
|
William Pitcock
|
30efa86c05
|
common api: enable tag linking in markdown mode
|
2018-10-14 20:36:11 +00:00 |
|
William Pitcock
|
b1be9415ef
|
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe, reversing
changes made to 340ab3cb90.
|
2018-10-05 20:49:34 +00:00 |
|
lambda
|
58539e1357
|
Revert "Merge branch 'feature/rich-text' into 'develop'"
This reverts merge request !309
|
2018-08-31 09:51:20 +00:00 |
|
William Pitcock
|
6aa65b68b8
|
common api: add support for formatting messages outside of twitter-style plain text
|
2018-08-31 03:13:59 +00:00 |
|
kaniini
|
63094cfd3e
|
Merge branch 'feature/emoji-in-local-users' into 'develop'
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
|
2018-08-26 23:24:41 +00:00 |
|
ensra
|
1495d04789
|
fix test for converting bio \r\n to <br>.
|
2018-08-21 14:51:27 +01:00 |
|
William Pitcock
|
c033d2004b
|
formatting
|
2018-08-20 18:40:05 +00:00 |
|
William Pitcock
|
145546e52a
|
common api: format hashtags in the same way as we format mentions
|
2018-08-20 18:39:47 +00:00 |
|
eal
|
92caa2632b
|
Use Image type for emoji icons.
|
2018-08-13 16:21:18 +03:00 |
|