rinpatch
a12aeb09c4
Cleanup uploads after the tests are finished
2019-09-18 23:34:13 +03: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
84a40f6f26
Capture log in object refetch tests
2019-09-18 18:31:24 +03:00
Haelwenn
5c78131ee2
Merge branch 'bugfix/docs-formatting' into 'develop'
...
Improve generated docs formatting
See merge request pleroma/pleroma!1688
2019-09-18 15:31:03 +00: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
17ff63b3c3
docs fix
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
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
2019-09-17 21:30:58 +00:00
rinpatch
ea6d4137da
Apply suggestion to CHANGELOG.md
2019-09-17 21:24:21 +00: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
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
rinpatch
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
2019-09-18 00:00:22 +03:00
rinpatch
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
2019-09-17 20:09:26 +00:00
Maxim Filippov
e686f9be81
Apply suggestion to CHANGELOG.md
2019-09-17 20:04:57 +00: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
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
2019-09-17 19:37:29 +00:00
Maxim Filippov
228bfd8a70
Bump elixir version to ~> 1.8
2019-09-17 22:36:42 +03: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
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.
2019-09-17 21:51:50 +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
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
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