Maxim Filippov
|
cf1960d596
|
Better changelog wording
|
2019-09-22 23:14:18 +03:00 |
|
Maxim Filippov
|
d72d4757a8
|
Format
|
2019-09-22 23:13:48 +03:00 |
|
Maxim Filippov
|
6f25668215
|
Admin API: Add ability to force user's password reset
|
2019-09-22 16:08:07 +03:00 |
|
rinpatch
|
c4da7499a3
|
Merge branch 'conversation-docs' into 'develop'
API Docs: Document conversation ids.
See merge request pleroma/pleroma!1701
|
2019-09-19 19:04:55 +00:00 |
|
lain
|
fe4db3b94e
|
API Docs: Document conversation ids.
|
2019-09-19 21:01:05 +02:00 |
|
Haelwenn
|
c1e011624d
|
Merge branch 'docs/clients-update' into 'develop'
docs/clients.md: Update source code urls
See merge request pleroma/pleroma!1697
|
2019-09-19 18:01:49 +00:00 |
|
lain
|
b80c41a14f
|
Merge branch 'outbox_pagination' into 'develop'
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
|
2019-09-19 16:53:59 +00:00 |
|
D Anzorge
|
9aca2cc95d
|
Add test for correct AP outbox pagination
|
2019-09-19 16:49:27 +02:00 |
|
rinpatch
|
9c8a94bae2
|
Merge branch 'direct_conversation_id_on_status_creation' into 'develop'
Return `pleroma.direct_conversation_id` when creating a direct message
See merge request pleroma/pleroma!1699
|
2019-09-19 14:34:24 +00:00 |
|
D Anzorge
|
0e6085da10
|
Fix pagination in AP outbox.json
|
2019-09-19 16:09:07 +02:00 |
|
eugenijm
|
fe5e0b7846
|
Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)
|
2019-09-19 08:59:25 +03:00 |
|
Haelwenn
|
f95a2b2cda
|
Merge branch 'issue/733' into 'develop'
[#733] added test for Ostatus
See merge request pleroma/pleroma!1657
|
2019-09-18 22:28:10 +00:00 |
|
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
2019-09-18 21:57:49 +00:00 |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2019-09-18 23:21:11 +02:00 |
|
Haelwenn (lanodan) Monnier
|
c3856bed0c
|
docs/clients.md: Update source code urls
|
2019-09-18 23:17:15 +02:00 |
|
|
|
ab2ca3038f
|
Merge branch 'hide-follower-following-count' into 'develop'
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
|
2019-09-18 21:13:15 +00:00 |
|
|
|
25b4365656
|
Merge branch 'admin_api_invite_tokens' into 'develop'
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
|
2019-09-18 21:11:37 +00:00 |
|
|
|
220afadc55
|
Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
|
2019-09-18 21:05:18 +00:00 |
|
rinpatch
|
76a1019f41
|
Merge branch 'chore/refetch-poll-changelog-update' into 'develop'
Add a changelog entry for poll refetching
See merge request pleroma/pleroma!1696
|
2019-09-18 21:00:51 +00:00 |
|
Haelwenn
|
56286447ee
|
Merge branch 'fix/test-upload-cleanup' into 'develop'
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
|
2019-09-18 21:00:09 +00:00 |
|
rinpatch
|
a22b87b30c
|
Add a changelog entry for poll refetching
|
2019-09-19 00:00:05 +03:00 |
|
Haelwenn
|
e32d099a3a
|
Merge branch 'feature/poll-refresh' into 'develop'
Poll refetching
See merge request pleroma/pleroma!1694
|
2019-09-18 20:58:53 +00:00 |
|
rinpatch
|
a12aeb09c4
|
Cleanup uploads after the tests are finished
|
2019-09-18 23:34:13 +03:00 |
|
rinpatch
|
5028b7b578
|
Fix credo issues
|
2019-09-18 22:09:03 +03:00 |
|
rinpatch
|
c096dd86e5
|
Do not refetch local objects
|
2019-09-18 20:01:26 +03:00 |
|
rinpatch
|
eb87a86b5b
|
Preserve internal fields when reinjecting
|
2019-09-18 19:53:51 +03:00 |
|
rinpatch
|
d32894ae51
|
Move object internal fields to a constant
|
2019-09-18 19:24:20 +03:00 |
|
rinpatch
|
e3f902b3a1
|
Set updated_at even if the object stayed the same
|
2019-09-18 19:07:25 +03:00 |
|
rinpatch
|
a9c700ff15
|
Fix wrong argument order when calling NaiveDateTime.diff
|
2019-09-18 18:52:33 +03:00 |
|
rinpatch
|
84a40f6f26
|
Capture log in object refetch tests
|
2019-09-18 18:31:24 +03:00 |
|
Haelwenn
|
5c78131ee2
|
Merge branch 'bugfix/docs-formatting' into 'develop'
Improve generated docs formatting
See merge request pleroma/pleroma!1688
|
2019-09-18 15:31:03 +00:00 |
|
rinpatch
|
7ef575d11e
|
Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
|
2019-09-18 18:13:21 +03:00 |
|
Alex S
|
a18f1e7cd7
|
namings
|
2019-09-18 10:49:14 +03:00 |
|
Alex S
|
17ff63b3c3
|
docs fix
|
2019-09-18 10:49:14 +03:00 |
|
Alex S
|
2263c8b6b9
|
little fixes
|
2019-09-18 10:49:14 +03:00 |
|
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
2019-09-18 10:49:14 +03:00 |
|
Haelwenn
|
40c968626d
|
Merge branch 'chore/changelog-separate-1.1' into 'develop'
Sync develop changelog with master and create a new section for post-1.1 changes
See merge request pleroma/pleroma!1689
|
2019-09-17 21:30:58 +00:00 |
|
rinpatch
|
ea6d4137da
|
Apply suggestion to CHANGELOG.md
|
2019-09-17 21:24:21 +00:00 |
|
Haelwenn (lanodan) Monnier
|
e501c822c9
|
markdown.ex: put two-spaces before the description-newline
|
2019-09-17 23:05:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
4785596a2c
|
markdown.ex: end suggestions list with a newline
Otherwise we end up with suggestion on the same level as the childs
Markdown is a fuck…
|
2019-09-17 23:05:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
d2097fd0f5
|
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
|
2019-09-17 23:05:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
d6182a3c8f
|
markdown.ex: Make suggestion(s) plural only if on >1
|
2019-09-17 23:05:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
32d64102cb
|
description.exs: uncomment type for email logo
|
2019-09-17 23:05:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
c0c5628200
|
description.exs: remove empty strings on descriptions
|
2019-09-17 23:05:26 +02:00 |
|
Haelwenn (lanodan) Monnier
|
106afaed58
|
markdown.ex: do not fail if there is no children
|
2019-09-17 23:05:26 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e0d8c8897e
|
docs/markdown.ex: do no print empty suggestions
|
2019-09-17 23:05:26 +02:00 |
|
Haelwenn (lanodan) Monnier
|
50ec445b2c
|
description.exs: remove empty strings and arrays
|
2019-09-17 23:05:13 +02:00 |
|
rinpatch
|
bf8567996c
|
Sync develop changelog with master and create a new section for post-1.1
changes
|
2019-09-18 00:00:22 +03:00 |
|
rinpatch
|
f758e663b2
|
Merge branch 'feature/bump-elixir-verstion' into 'develop'
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
|
2019-09-17 20:09:26 +00:00 |
|
Maxim Filippov
|
e686f9be81
|
Apply suggestion to CHANGELOG.md
|
2019-09-17 20:04:57 +00:00 |
|
