Egor Kislitsyn
d639cdcecb
Update "config/description.exs"
4 years ago
Egor Kislitsyn
cf3041220a
Add support for `rel="ugc"`
4 years ago
Haelwenn
f95a2b2cda
Merge branch 'issue/733' into 'develop'
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
4 years ago
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
4 years ago
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/'
4 years ago
feld
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
4 years ago
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
4 years ago
feld
220afadc55
Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
4 years ago
rinpatch
76a1019f41
Merge branch 'chore/refetch-poll-changelog-update' into 'develop'
Add a changelog entry for poll refetching
See merge request pleroma/pleroma!1696
4 years ago
Haelwenn
56286447ee
Merge branch 'fix/test-upload-cleanup' into 'develop'
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
4 years ago
rinpatch
a22b87b30c
Add a changelog entry for poll refetching
4 years ago
Haelwenn
e32d099a3a
Merge branch 'feature/poll-refresh' into 'develop'
Poll refetching
See merge request pleroma/pleroma!1694
4 years ago
rinpatch
a12aeb09c4
Cleanup uploads after the tests are finished
4 years ago
rinpatch
5028b7b578
Fix credo issues
4 years ago
rinpatch
c096dd86e5
Do not refetch local objects
4 years ago
rinpatch
eb87a86b5b
Preserve internal fields when reinjecting
4 years ago
rinpatch
d32894ae51
Move object internal fields to a constant
4 years ago
rinpatch
e3f902b3a1
Set updated_at even if the object stayed the same
4 years ago
rinpatch
a9c700ff15
Fix wrong argument order when calling NaiveDateTime.diff
4 years ago
rinpatch
84a40f6f26
Capture log in object refetch tests
4 years ago
Haelwenn
5c78131ee2
Merge branch 'bugfix/docs-formatting' into 'develop'
Improve generated docs formatting
See merge request pleroma/pleroma!1688
4 years ago
rinpatch
7ef575d11e
Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
4 years ago
Alex S
a18f1e7cd7
namings
4 years ago
Alex S
17ff63b3c3
docs fix
4 years ago
Alex S
2263c8b6b9
little fixes
4 years ago
Alex S
4faf2b1555
post for creating invite tokens in admin api
4 years ago
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
4 years ago
rinpatch
ea6d4137da
Apply suggestion to CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
e501c822c9
markdown.ex: put two-spaces before the description-newline
4 years ago
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…
4 years ago
Haelwenn (lanodan) Monnier
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
4 years ago
Haelwenn (lanodan) Monnier
d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
4 years ago
Haelwenn (lanodan) Monnier
32d64102cb
description.exs: uncomment type for email logo
4 years ago
Haelwenn (lanodan) Monnier
c0c5628200
description.exs: remove empty strings on descriptions
4 years ago
Haelwenn (lanodan) Monnier
106afaed58
markdown.ex: do not fail if there is no children
4 years ago
Haelwenn (lanodan) Monnier
e0d8c8897e
docs/markdown.ex: do no print empty suggestions
4 years ago
Haelwenn (lanodan) Monnier
50ec445b2c
description.exs: remove empty strings and arrays
4 years ago
rinpatch
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
changes
4 years ago
rinpatch
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
4 years ago
Maxim Filippov
e686f9be81
Apply suggestion to CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
4 years ago
Haelwenn (lanodan) Monnier
35dcea3e13
Remove [true,false] for booleans, it is implicit
4 years ago
feld
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
4 years ago
Maxim Filippov
228bfd8a70
Bump elixir version to ~> 1.8
4 years ago
Maksim Pechnikov
0447c42715
Merge branch 'develop' into issue/733
4 years ago
rinpatch
79376abae3
Merge branch 'support/package_versions' into 'develop'
[#1263 ] fixed ecto version
See merge request pleroma/pleroma!1685
4 years ago
rinpatch
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
4 years ago
Maksim Pechnikov
d201eec45c
fixed ecto version
4 years ago
rinpatch
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.
4 years ago
Maksim Pechnikov
7dd51652f9
Merge branch 'develop' into issue/733
4 years ago