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 |
|
Haelwenn (lanodan) Monnier
|
7f211a48e0
|
docs/markdown.ex: child header as "- key (type): description"
|
2019-09-17 21:47:32 +02:00 |
|
Haelwenn (lanodan) Monnier
|
35dcea3e13
|
Remove [true,false] for booleans, it is implicit
|
2019-09-17 21:47:32 +02:00 |
|
rinpatch
|
79376abae3
|
Merge branch 'support/package_versions' into 'develop'
[#1263] fixed ecto version
See merge request pleroma/pleroma!1685
|
2019-09-17 19:12:24 +00:00 |
|
rinpatch
|
ef2e2c5e12
|
Merge branch 'feature/return-total-for-reports' into 'develop'
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
|
2019-09-17 19:09:56 +00:00 |
|
Maksim Pechnikov
|
d201eec45c
|
fixed ecto version
|
2019-09-17 22:02:37 +03:00 |
|
rinpatch
|
7318095657
|
Merge branch 'fix-notification-warnings' into 'develop'
Fix notification warnings
See merge request pleroma/pleroma!1683
|
2019-09-17 18:12:27 +00:00 |
|
Steven Fuchs
|
6193157f19
|
Fix notification warnings
|
2019-09-17 18:12:27 +00:00 |
|
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
|
2019-09-17 17:16:39 +00:00 |
|
rinpatch
|
95a4a19417
|
Merge branch 'support/tests' into 'develop'
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
|
2019-09-17 14:47:26 +00:00 |
|
rinpatch
|
1fc8fabecf
|
Merge branch 'eliminate-test-errors' into 'develop'
remove remaining errors from tests
See merge request pleroma/pleroma!1682
|
2019-09-17 14:44:52 +00:00 |
|
Steven Fuchs
|
80c5c3495b
|
remove remaining errors from tests
|
2019-09-17 14:44:52 +00:00 |
|
rinpatch
|
bb6d172e74
|
Merge branch 'deps/update-oban' into 'develop'
Update oban to 0.8.1
Closes #1261
See merge request pleroma/pleroma!1680
|
2019-09-17 13:55:01 +00:00 |
|
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
|
2019-09-17 13:04:43 +03:00 |
|
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
|
2019-09-16 15:11:05 +00:00 |
|
Egor Kislitsyn
|
d6ab78e610
|
Set account_field_value_length limit to 2048 by default
|
2019-09-16 21:48:01 +07:00 |
|
Egor Kislitsyn
|
085d014f08
|
Fix Transmogrifier.upgrade_user_from_ap_id/1
|
2019-09-16 19:26:00 +07:00 |
|
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
2019-09-16 14:40:17 +03:00 |
|
rinpatch
|
409e701ab8
|
Merge branch 'fix/develop' into 'develop'
Add "Streamer refactoring" back to `develop`
See merge request pleroma/pleroma!1675
|
2019-09-16 10:59:44 +00:00 |
|
Egor Kislitsyn
|
96816ceaa2
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
|
2019-09-16 17:55:04 +07:00 |
|
rinpatch
|
4397a3fe4a
|
Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'
Fix signed fetch inclusion publisher test
See merge request pleroma/pleroma!1676
|
2019-09-16 10:34:03 +00:00 |
|
rinpatch
|
e8120944d8
|
Fix signed fetch inclusion publisher test
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
|
2019-09-16 13:23:06 +03:00 |
|
kaniini
|
fe7fd33126
|
Merge branch 'revert-4fabf83a' into 'develop'
Revert "Merge branch 'streamer-refactoring' into 'develop'"
See merge request pleroma/pleroma!1674
|
2019-09-16 09:09:32 +00:00 |
|
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
2019-09-16 09:09:21 +00:00 |
|
kaniini
|
4fabf83ad0
|
Merge branch 'streamer-refactoring' into 'develop'
Streamer refactoring
See merge request pleroma/pleroma!1653
|
2019-09-16 07:44:03 +00:00 |
|
Steven Fuchs
|
aab264db82
|
Streamer refactoring
|
2019-09-16 07:44:03 +00:00 |
|
kaniini
|
17142a3720
|
Merge branch 'feature/delivery-tracking' into 'develop'
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
|
2019-09-16 07:39:58 +00:00 |
|
kaniini
|
d1a84ceec8
|
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
|
2019-09-16 07:37:54 +00:00 |
|
kaniini
|
74eba5afe2
|
Merge branch 'fix/race-in-tests' into 'develop'
Fix a race condition in tests
See merge request pleroma/pleroma!1673
|
2019-09-16 07:36:57 +00:00 |
|
Egor Kislitsyn
|
ca88e37a8f
|
Fix a race condition in tests
|
2019-09-16 12:55:05 +07:00 |
|
rinpatch
|
2990c0a53b
|
Merge branch '1149-oban-job-queue' into 'develop'
[#1149] `oban`-based job & retry queues
Closes #1149
See merge request pleroma/pleroma!1518
|
2019-09-15 20:22:17 +00:00 |
|
Maksim Pechnikov
|
b4cf74c106
|
added prepare html for RichMedia.Parser
|
2019-09-15 14:53:58 +03:00 |
|
Maksim Pechnikov
|
8751809e1e
|
Merge branch 'develop' into support/tests
|
2019-09-15 14:22:15 +03:00 |
|
Ivan Tashkinov
|
3b8ec98b0e
|
[#1149] Reinstated docs/config.md changes.
|
2019-09-15 10:15:57 +03:00 |
|
Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
2019-09-15 10:12:24 +03:00 |
|
rinpatch
|
9c64a25713
|
Merge branch 'config-changes' into 'develop'
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
|
2019-09-14 17:26:35 +00:00 |
|
rinpatch
|
62bbba80f3
|
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
Truncate remote user fields
See merge request pleroma/pleroma!1619
|
2019-09-14 16:39:42 +00:00 |
|
Ivan Tashkinov
|
e127b9ab6d
|
[#1149] Rewritten readme as config/description.exs.
|
2019-09-14 16:28:59 +03:00 |
|
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
2019-09-14 16:11:44 +03:00 |
|
rinpatch
|
3ae448b592
|
Merge branch 'fix-tests' into 'develop'
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
|
2019-09-14 12:36:08 +00:00 |
|
Egor Kislitsyn
|
b870ae08fd
|
Fix Activity.all_by_actor_and_id/2 test
|
2019-09-14 19:31:20 +07:00 |
|
rinpatch
|
4264c4b7e5
|
Merge branch 'security/fav-reblog-access-control' into 'develop'
Mastodon API: Respect post privacy in favourited/reblogged endpoints
See merge request pleroma/pleroma!1667
|
2019-09-14 11:44:34 +00:00 |
|
rinpatch
|
a78a7ee455
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
2019-09-14 10:50:08 +00:00 |
|