5f9fbd7d33
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15 16:59:52 +03:00
f8dc597c51
Fix enforcement of character limits
2020-03-15 16:58:13 +03:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
2020-02-11 15:39:19 -06:00
d85bcc8627
Questions: Add timezone to `closed` property
2020-02-07 16:57:46 +01:00
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
768c1a5de1
Fix tests
2019-11-12 19:13:19 +07:00
27cd1374e3
Add a notification for Move activities
2019-11-12 18:48:14 +07:00
c57ad0a402
Cleanup CommonAPI
2019-09-26 10:33:13 +07:00
eed774d058
Add CommonAPI.ActivityDraft
2019-09-26 10:29:34 +07:00
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-09-25 17:14:31 +07:00
6ef0103ca0
added Emoji struct
2019-08-31 10:14:53 +03:00
d8098d142a
added Emoji.Formatter
2019-08-30 22:04:17 +03:00
d7808b5db4
added code\path fields without html tags in ets
2019-08-30 07:30:54 +03:00
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
bdc9a7222c
tests for CommonApi/Utils
2019-08-05 15:37:05 +00:00
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
2019-08-05 15:33:22 +02:00
56b1c3af13
CommonAPI: Extend api with conversation replies.
2019-08-02 15:05:27 +02:00
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
2019-07-31 18:35:15 +00:00
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
6a79bb12c3
Fix function
2019-07-23 13:53:05 -05:00
fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
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
de13c9bb8f
List messages must be visible for mentioned users
2019-07-15 14:54:40 +07:00
a87c313309
Support `list` visibility in StatusView
2019-07-15 14:00:29 +07:00
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
2019-07-14 09:48:42 -07:00
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
2019-06-18 05:05:05 +03:00
ddd4a09b72
Fix merge conflict
2019-06-05 17:55:00 +07:00
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
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
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
5f67c26baf
Accept strings in expires_in because sasuga javascript
2019-05-21 17:30:51 +03:00
a53d062730
Fix posting non-polls from mastofe
2019-05-21 14:19:03 +03:00
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
2019-05-21 10:54:20 +03:00
1d90f9b969
Remove tags/mentions/rich text from poll options because Mastodon and
...
add custom emoji
2019-05-19 17:06:44 +03:00
5ece901af3
Resolve merge conflicts and remove IO.inspects
2019-05-18 13:37:38 +03:00
fd920c8973
Mastodon API: Add support for posting polls
2019-05-18 13:29:28 +03:00
c4a55e167a
add Changelog entry
2019-05-17 23:00:14 +00:00
dc08159538
also suppress link previews from posts marked #nsfw
2019-05-17 22:13:24 +00:00
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
Haelwenn (lanodan) Monnier
Mark Felder
Lain Soykaf
Ivan Tashkinov
Egor Kislitsyn
kaniini
Maksim Pechnikov
Maxim Filippov
Moonman
rinpatch
William Pitcock