f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
5 years ago
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
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
5 years ago
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
5 years ago
220afadc55
Merge branch 'restore-tests' into 'develop'
...
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
5 years ago
76a1019f41
Merge branch 'chore/refetch-poll-changelog-update' into 'develop'
...
Add a changelog entry for poll refetching
See merge request pleroma/pleroma!1696
5 years ago
56286447ee
Merge branch 'fix/test-upload-cleanup' into 'develop'
...
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
5 years ago
a22b87b30c
Add a changelog entry for poll refetching
5 years ago
e32d099a3a
Merge branch 'feature/poll-refresh' into 'develop'
...
Poll refetching
See merge request pleroma/pleroma!1694
5 years ago
a12aeb09c4
Cleanup uploads after the tests are finished
5 years ago
5028b7b578
Fix credo issues
5 years ago
c096dd86e5
Do not refetch local objects
5 years ago
eb87a86b5b
Preserve internal fields when reinjecting
5 years ago
d32894ae51
Move object internal fields to a constant
5 years ago
e3f902b3a1
Set updated_at even if the object stayed the same
5 years ago
a9c700ff15
Fix wrong argument order when calling NaiveDateTime.diff
5 years ago
84a40f6f26
Capture log in object refetch tests
5 years ago
5c78131ee2
Merge branch 'bugfix/docs-formatting' into 'develop'
...
Improve generated docs formatting
See merge request pleroma/pleroma!1688
5 years ago
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
a18f1e7cd7
namings
5 years ago
17ff63b3c3
docs fix
5 years ago
2263c8b6b9
little fixes
5 years ago
4faf2b1555
post for creating invite tokens in admin api
5 years ago
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
5 years ago
ea6d4137da
Apply suggestion to CHANGELOG.md
5 years ago
e501c822c9
markdown.ex: put two-spaces before the description-newline
5 years ago
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…
5 years ago
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
5 years ago
d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
5 years ago
32d64102cb
description.exs: uncomment type for email logo
5 years ago
c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
106afaed58
markdown.ex: do not fail if there is no children
5 years ago
e0d8c8897e
docs/markdown.ex: do no print empty suggestions
5 years ago
50ec445b2c
description.exs: remove empty strings and arrays
5 years ago
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
5 years ago
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
e686f9be81
Apply suggestion to CHANGELOG.md
5 years ago
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
35dcea3e13
Remove [true,false] for booleans, it is implicit
5 years ago
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
5 years ago
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
0447c42715
Merge branch 'develop' into issue/733
5 years ago
79376abae3
Merge branch 'support/package_versions' into 'develop'
...
[#1263 ] fixed ecto version
See merge request pleroma/pleroma!1685
5 years ago
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
5 years ago
d201eec45c
fixed ecto version
5 years ago
8d812c28a7
Update Tesla to 1.3
...
This version includes a couple of fixes, adds Gun and Mint adapters and
removes 0.x -> 1.0 config migrator, which for some reason fails under
certain conditions. I had to set `override: true` because Quack pins
Tesla to `1.2.0`, but I have looked through the source code and verified
that updating Tesla doesn't break anything there.
5 years ago
7dd51652f9
Merge branch 'develop' into issue/733
5 years ago
7318095657
Merge branch 'fix-notification-warnings' into 'develop'
...
Fix notification warnings
See merge request pleroma/pleroma!1683
5 years ago
6193157f19
Fix notification warnings
5 years ago
Haelwenn