Ekaterina Vaartis
|
6a42641b8d
|
Add pack.toml loading
|
2019-09-19 00:16:33 +03:00 |
|
|
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
|
2019-09-18 21:13:15 +00:00 |
|
|
feld
|
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 |
|
|
feld
|
220afadc55
|
Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
|
2019-09-18 21:05:18 +00:00 |
|
|
rinpatch
|
76a1019f41
|
Merge branch 'chore/refetch-poll-changelog-update' into 'develop'
Add a changelog entry for poll refetching
See merge request pleroma/pleroma!1696
|
2019-09-18 21:00:51 +00:00 |
|
|
Haelwenn
|
56286447ee
|
Merge branch 'fix/test-upload-cleanup' into 'develop'
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
|
2019-09-18 21:00:09 +00:00 |
|
|
rinpatch
|
a22b87b30c
|
Add a changelog entry for poll refetching
|
2019-09-19 00:00:05 +03: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
|
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 |
|
|
Maxim Filippov
|
384b7dd40d
|
Fix response
|
2019-09-18 18:06:49 +03:00 |
|
|
Maxim Filippov
|
f89728ad95
|
Merge branch 'develop' into feature/return-link-for-password-reset
|
2019-09-18 16:44:11 +03:00 |
|
|
Ivan Tashkinov
|
e4f3d7f69d
|
Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
|
2019-09-18 10:31:10 +00:00 |
|
|
Ivan Tashkinov
|
847c7f02f5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
|
2019-09-18 12:32:02 +03:00 |
|
|
Ivan Tashkinov
|
551f2fa59e
|
[#1234] Added changelog entry, removed admin OAuth scopes.
|
2019-09-18 12:31:33 +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 |
|
|
Ivan Tashkinov
|
b17f217bf3
|
[#1234] Addressed code analysis issue.
|
2019-09-17 23:31:05 +03:00 |
|
|
Ivan Tashkinov
|
b4d775161c
|
[#1234] Undone reordering-related changes in router.ex.
|
2019-09-17 23:24:55 +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
|
f9dd121ad3
|
Admin API: Return link alongside with token on password reset
|
2019-09-17 23:09:08 +03:00 |
|
|
Maxim Filippov
|
e686f9be81
|
Apply suggestion to CHANGELOG.md
|
2019-09-17 20:04:57 +00:00 |
|
|
Ivan Tashkinov
|
01c1078015
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
|
2019-09-17 22:53:26 +03: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 |
|
|
feld
|
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 |
|
|
Maksim Pechnikov
|
0447c42715
|
Merge branch 'develop' into issue/733
|
2019-09-17 22:20:39 +03:00 |
|