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 |
|
|
|
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 |
|
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
|
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
|
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
|
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 (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
|
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
|
7f211a48e0
|
docs/markdown.ex: child header as "- key (type): description"
|
2019-09-17 21:47:32 +02:00 |
|
Maksim Pechnikov
|
0447c42715
|
Merge branch 'develop' into issue/733
|
2019-09-17 22:20:39 +03: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
|
7dd51652f9
|
Merge branch 'develop' into issue/733
|
2019-09-17 21:20:08 +03: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 |
|
Steven Fuchs
|
80c5c3495b
|
remove remaining errors from tests
|
2019-09-17 14:44:52 +00:00 |
|
eugenijm
|
450bf7a63c
|
Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)
|
2019-09-17 14:45:47 +03: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 |
|
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 |
|
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 |
|
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
2019-09-16 09:09:21 +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 |
|
Maksim Pechnikov
|
d75bc728e7
|
Merge branch 'develop' into issue/733
|
2019-09-16 07:34:22 +03: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
|
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
|
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
|
5c5ebd3861
|
Mastodon API: Respect post privacy in favourited/reblogged endpoints
|
2019-09-14 01:50:15 +03:00 |
|
lain
|
1be09bde2d
|
Merge branch 'refactor/add_link_headers' into 'develop'
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
|
2019-09-13 17:06:38 +00:00 |
|
rinpatch
|
ba70a8cae6
|
Merge branch 'develop' into feature/delivery-tracking
|
2019-09-13 19:42:53 +03:00 |
|
