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
5 years ago
rinpatch
ea6d4137da
Apply suggestion to CHANGELOG.md
5 years ago
Haelwenn (lanodan) Monnier
e501c822c9
markdown.ex: put two-spaces before the description-newline
5 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…
5 years ago
Haelwenn (lanodan) Monnier
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
5 years ago
Haelwenn (lanodan) Monnier
d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
5 years ago
Haelwenn (lanodan) Monnier
32d64102cb
description.exs: uncomment type for email logo
5 years ago
Haelwenn (lanodan) Monnier
c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
Haelwenn (lanodan) Monnier
106afaed58
markdown.ex: do not fail if there is no children
5 years ago
Haelwenn (lanodan) Monnier
e0d8c8897e
docs/markdown.ex: do no print empty suggestions
5 years ago
Haelwenn (lanodan) Monnier
50ec445b2c
description.exs: remove empty strings and arrays
5 years ago
rinpatch
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
5 years ago
rinpatch
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
Maxim Filippov
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
Maxim Filippov
e686f9be81
Apply suggestion to CHANGELOG.md
5 years ago
Haelwenn (lanodan) Monnier
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
Haelwenn (lanodan) Monnier
35dcea3e13
Remove [true,false] for booleans, it is implicit
5 years ago
feld
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
5 years ago
Maxim Filippov
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
Maksim Pechnikov
0447c42715
Merge branch 'develop' into issue/733
5 years ago
rinpatch
79376abae3
Merge branch 'support/package_versions' into 'develop'
...
[#1263 ] fixed ecto version
See merge request pleroma/pleroma!1685
5 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
5 years ago
Maksim Pechnikov
d201eec45c
fixed ecto version
5 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.
5 years ago
Maksim Pechnikov
7dd51652f9
Merge branch 'develop' into issue/733
5 years ago
rinpatch
7318095657
Merge branch 'fix-notification-warnings' into 'develop'
...
Fix notification warnings
See merge request pleroma/pleroma!1683
5 years ago
Steven Fuchs
6193157f19
Fix notification warnings
5 years ago
Haelwenn
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
5 years ago
rinpatch
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
rinpatch
1fc8fabecf
Merge branch 'eliminate-test-errors' into 'develop'
...
remove remaining errors from tests
See merge request pleroma/pleroma!1682
5 years ago
Steven Fuchs
80c5c3495b
remove remaining errors from tests
5 years ago
Roman Chvanikov
9fa2586abd
Refactor SubscriptionNotificationView
5 years ago
rinpatch
bb6d172e74
Merge branch 'deps/update-oban' into 'develop'
...
Update oban to 0.8.1
Closes #1261
See merge request pleroma/pleroma!1680
5 years ago
Roman Chvanikov
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
5 years ago
Roman Chvanikov
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
Roman Chvanikov
a76168e743
Cleanup PleromaAPIController
5 years ago
Roman Chvanikov
015597c2ab
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
5 years ago
Roman Chvanikov
a81f80233d
Apply suggestion to lib/pleroma/web/router.ex
5 years ago
Roman Chvanikov
f9be517c7f
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov
c0f776faec
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov
2688b876ab
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
rinpatch
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
Roman Chvanikov
6042e21b25
Move subscription notifications to a separate controller
5 years ago
Roman Chvanikov
56b60798c2
Code style fixes
5 years ago
Roman Chvanikov
76c3e290fc
Merge develop
5 years ago
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Haelwenn
a58f29b826
Merge branch 'update-fields-limit' into 'develop'
...
Set `account_field_value_length` limit to 2048 by default
Closes #1249
See merge request pleroma/pleroma!1678
5 years ago
Egor Kislitsyn
d6ab78e610
Set `account_field_value_length` limit to 2048 by default
5 years ago
Egor Kislitsyn
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
5 years ago