Haelwenn (lanodan) Monnier
b429a49504
mix.exs: Fix for MacOS
2020-04-23 23:44:03 +02:00
Haelwenn (lanodan) Monnier
c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists
2020-04-19 20:24:32 +02:00
Haelwenn
d8142ee6fe
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
...
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
2020-04-17 09:02:10 +00:00
Haelwenn
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
2020-04-17 08:55:46 +00:00
Alexander Strizhakov
304ea09f4c
fix for logger configuration
2020-04-17 08:42:48 +03:00
rinpatch
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
2020-04-16 21:58:57 +00:00
rinpatch
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
2020-04-16 18:38:58 +00:00
rinpatch
0ddee13c83
Merge branch 'features/remove-user-source_data' into 'develop'
...
User: remove source_data
Closes #820
See merge request pleroma/pleroma!2339
2020-04-16 18:37:56 +00:00
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities
2020-04-16 18:05:36 +03:00
rinpatch
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
2020-04-16 14:59:11 +00:00
rinpatch
77ee64b993
user: remove blank?
2020-04-16 17:54:57 +03:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
lain
2b57f73b77
Merge branch 'small-fix-rewrite_policy' into 'develop'
...
small fix in the rewrite_policy example
See merge request pleroma/pleroma!2391
2020-04-16 09:38:24 +00:00
Ivan Tashkinov
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
2020-04-15 21:19:16 +03:00
Ilja
aa0a4a1e78
small fix in the rewrite_policy example
2020-04-15 19:03:27 +02:00
Ivan Tashkinov
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
2020-04-15 19:20:34 +03:00
Haelwenn
b1c1d2e5e1
Merge branch 'fix/1659-rate-limiter' into 'develop'
...
remote_ip plug adds remote_ip_found flag
Closes #1659
See merge request pleroma/pleroma!2390
2020-04-15 15:26:55 +00:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag
2020-04-15 15:27:34 +03:00
rinpatch
ad8630b95a
Merge branch 'uploads-csp-changes' into 'develop'
...
Uploads: Sandbox them in the CSP.
See merge request pleroma/pleroma!2389
2020-04-15 10:15:15 +00:00
lain
6bc76df287
Uploads: Sandbox them in the CSP.
2020-04-15 12:05:22 +02:00
rinpatch
96eae62995
Merge branch 'fix/openapi-form-mimetype' into 'develop'
...
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
See merge request pleroma/pleroma!2387
2020-04-14 22:01:24 +00:00
rinpatch
cc4ff19e34
openapi: add application/x-www-form-urlencoded to body types
...
Closes #1683
2020-04-15 00:49:21 +03:00
feld
6c3e09fbce
Merge branch 'fix/richmedia-oban-error' into 'develop'
...
Attempt at fixing Oban not receiving :ok from RichMediaHelper job
Closes #1684
See merge request pleroma/pleroma!2377
2020-04-14 17:05:17 +00:00
Mark Felder
3bf78f2be7
Fix Oban not receiving :ok from RichMediaHelper job
2020-04-14 11:43:53 -05:00
lain
c02e6ceea5
Merge branch 'revert-60cc7d6c' into 'develop'
...
Revert "Merge branch 'issue/1276' into 'develop'"
See merge request pleroma/pleroma!2384
2020-04-14 16:32:34 +00:00
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
lain
3677a1e578
Merge branch 'revert-13a7105b' into 'develop'
...
Revert "Merge branch 'marker-update-fix' into 'develop'"
See merge request pleroma/pleroma!2383
2020-04-14 16:31:41 +00:00
lain
7c060432fc
Revert "Merge branch 'marker-update-fix' into 'develop'"
...
This reverts merge request !2380
2020-04-14 16:31:30 +00:00
feld
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
lain
13a7105b21
Merge branch 'marker-update-fix' into 'develop'
...
Marker update migration: Don't try to update virtual field.
See merge request pleroma/pleroma!2380
2020-04-14 13:17:44 +00:00
lain
5fc6ce30ac
Merge branch 'chore/spelling' into 'develop'
...
Fix spelling in log message
See merge request pleroma/pleroma!2378
2020-04-14 13:07:57 +00:00
lain
d8b12ffd59
Marker update migration: Don't try to update virtual field.
2020-04-14 15:06:09 +02:00
lain
2eae5793cd
Merge branch 'fix/issue_1679' into 'develop'
...
[#1679 ] fixed logs
See merge request pleroma/pleroma!2379
2020-04-14 11:08:33 +00:00
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
Maksim Pechnikov
c4e7ed660c
fix logger message
2020-04-14 08:43:47 +03:00
Mark Felder
f3725b8fc4
Fix spelling
2020-04-13 17:04:43 -05:00
rinpatch
e3db1c471e
Merge branch 'openapi/domain-blocks' into 'develop'
...
Add OpenAPI spec for DomainBlockController
See merge request pleroma/pleroma!2376
2020-04-13 20:04:49 +00:00
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
2020-04-13 22:44:52 +04:00
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
rinpatch
ef37774403
Merge branch 'output-of-relationships-in-statuses' into 'develop'
...
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications
See merge request pleroma/pleroma!2342
2020-04-13 13:05:40 +00:00
Ivan Tashkinov
5c76afb06c
[ #2342 ] Removed description.exs entry for temporary configuration option.
2020-04-13 15:38:50 +03:00
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
Ivan Tashkinov
dc2637c188
[ #2342 ] Removed changelog entry for temporary configuration option.
2020-04-13 09:16:35 +03:00
Alexander Strizhakov
de34c4ee6b
changelog entry
2020-04-13 08:59:06 +03:00
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe
2020-04-13 08:56:28 +03:00
rinpatch
7ee35eb9a6
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
...
Fix mix tasks failing on OTP releases
Closes #1678
See merge request pleroma/pleroma!2369
2020-04-12 16:00:15 +00:00
rinpatch
2ba754ffe1
Fix mix tasks failing on OTP releases
...
No idea why this was even added.
Closes #1678
2020-04-12 18:49:31 +03:00
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
rinpatch
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
2020-04-11 22:31:46 +03:00
