floatingghost
4d30ffed3e
Merge pull request 'Elixir 1.13 fixes' ( #8 ) from bugfix/elixir-1.13 into develop
...
Reviewed-on: https://codeberg.org/newroma-dev/newroma/pulls/8
Reviewed-by: floatingghost <floatingghost@noreply.codeberg.org>
2022-01-29 14:11:41 +01:00
Haelwenn (lanodan) Monnier
a4b8a1150e
Fix tests matching on "warn"
...
Moving it to "warning" would break tests on 1.12.x
2022-01-25 14:48:39 +01:00
rinpatch
0a1527c008
Escape unicode RTL overrides in rich media parser tests
...
Elixir 1.13 does not allow them in raw form anymore, resulting in errors
like this when running the test:
== Compilation error in file test/pleroma/web/rich_media/parser_test.exs ==
** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead
2022-01-25 14:48:39 +01:00
lanodan
9fdf0720cf
Merge pull request 'Cherry-Picked Merges from Alex Gleason' ( #5 ) from features/cherry-pick-merges into develop
...
Reviewed-on: https://codeberg.org/newroma-dev/newroma/pulls/5
Reviewed-by: floatingghost <floatingghost@noreply.codeberg.org>
2022-01-24 19:15:31 +01:00
Alex Gleason
6d81493861
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-26 12:29:42 +01:00
Alex Gleason
6d35b57802
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
2021-12-26 12:27:23 +01:00
Alex Gleason
042c37bcee
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
...
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
2021-12-26 12:24:38 +01:00
Alex Gleason
3c16f80ffc
Merge branch 'add-nodeinfo-doc' into 'develop'
...
Add initial Nodeinfo document
See merge request pleroma/pleroma!3546
2021-12-26 12:21:13 +01:00
Alex Gleason
e2832da2ce
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
2021-12-26 12:19:23 +01:00
Alex Gleason
bee3d6d0cb
Merge branch 'replies-count' into 'develop'
...
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
2021-12-26 12:18:06 +01:00
Alex Gleason
16d3533d1e
Merge branch 'link-headers-chats' into 'develop'
...
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
2021-12-26 12:16:33 +01:00
lain
8cfd527589
Merge branch 'verbose-emoji-loader' into 'develop'
...
emoji/loader.ex: be more verbose about which emoji pack config is loading now
See merge request pleroma/pleroma!3567
2021-12-17 14:35:01 +00:00
31b9034a27
emoji/loader.ex: be more verbose about which emoji pack config is loading now
...
To avoid issue when one of the hundred JSON files is malformed and
administrator don't know which one
2021-12-17 14:15:44 +00:00
lain
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
2021-12-15 21:26:45 +00:00
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
2021-12-13 17:07:29 -05:00
lain
fb0aa0661c
Merge branch 'fix-attachment-dimensions' into 'develop'
...
Fix attachment dimensions
Closes #2794
See merge request pleroma/pleroma!3559
2021-12-09 16:05:06 +00:00
lain
60295b58f9
Merge branch 'benchmark-fixes' into 'develop'
...
Benchmarks: fix user timeline and tags benchmarks
See merge request pleroma/pleroma!3560
2021-12-09 15:38:26 +00:00
Alex Gleason
d194b5b7fe
Benchmarks: fix user timeline and tags benchmarks
2021-12-08 11:54:41 -06:00
Alex Gleason
01cc099c8e
VideoHandlingTest: remove nil values
2021-12-07 21:55:54 -05:00
Haelwenn
992d9287d0
Apply alexgleason's suggestion(s) to 1 file(s)
2021-12-07 22:53:36 +00:00
Alex Gleason
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
2021-12-07 13:41:54 -05:00
Alex Gleason
335684182a
Fix VideoHandlingTest
2021-12-07 13:35:34 -05:00
lain
b57041c59a
Merge branch 'fixyfix' into 'develop'
...
Linting.
See merge request pleroma/pleroma!3558
2021-12-07 18:19:43 +00:00
Alex Gleason
3f03d71ea6
AttachmentValidator: ingest width and height
2021-12-07 12:59:03 -05:00
Lain Soykaf
ca8c676867
Linting.
2021-12-07 12:12:23 -05:00
lain
500e126604
Merge branch 'pleroma-result-1_13' into 'develop'
...
move result into with guard
See merge request pleroma/pleroma!3557
2021-12-07 16:55:01 +00:00
lain
e219e504ce
Merge branch 'mix-lock' into 'develop'
...
Run `mix deps.get`
See merge request pleroma/pleroma!3556
2021-12-07 16:45:03 +00:00
Alex Gleason
ab5dee84bf
Run mix deps.get
2021-12-07 10:03:31 -05:00
Finn Behrens
8af53101fb
move result into with guard
2021-12-07 09:18:53 +01:00
Alex Gleason
d9349bc52f
Transmogrifier: test fix_attachments/1
2021-12-07 01:10:47 -05:00
lain
613f55b078
Merge branch 'benchmark' into 'develop'
...
Fix benchmarks
See merge request pleroma/pleroma!3551
2021-12-06 21:16:30 +00:00
lain
ab60c0c6c2
Merge branch 'optimisation/deactivated-subquery' into 'develop'
...
Make deactivated user check into a subquery
Closes #2792
See merge request pleroma/pleroma!3554
2021-12-06 19:55:52 +00:00
db46913dcc
make linter happy
2021-12-06 11:50:51 +00:00
cd8bdbc761
Make deactivated user check into a subquery
...
Fixes #2792
2021-12-06 11:44:17 +00:00
Alex Gleason
ce4560c2a1
Fix benchmarks
2021-12-03 16:20:54 -05:00
lain
5c573a8a28
Merge branch 'password-reset' into 'develop'
...
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
2021-12-03 15:13:10 +00:00
Alex Gleason
ba2ed3c255
Fix frontend_status_plug_test.exs
2021-12-03 07:56:26 -06:00
Alex Gleason
8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset
2021-12-03 00:11:38 -06:00
Alex Gleason
5da4f33bf1
Restore POST /auth/password
2021-12-03 00:10:57 -06:00
lain
235c4139d7
Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'
...
nodeinfo: report activeMonth and activeHalfyear users fields
Closes #2782
See merge request pleroma/pleroma!3536
2021-12-02 16:54:28 +00:00
lain
aaed93db27
Merge branch 'update-hackney' into 'develop'
...
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
2021-12-01 15:49:57 +00:00
lain
d486d7d09e
Merge branch 'force_pinned_objects_to_be_empty' into 'develop'
...
Force pinned_objects to be empty, not null
Closes #2788
See merge request pleroma/pleroma!3548
2021-11-29 18:08:10 +00:00
182c563ed0
Force pinned_objects to be empty, not null
2021-11-29 18:08:09 +00:00
809503011f
Mix: upgrade Hackney to 1.18.0
2021-11-29 17:28:10 +00:00
efc28812b8
Add changelog entry
2021-11-17 00:39:10 +01:00
Haelwenn
c97f99ccf2
Merge branch 'bugfix/markdown-newlines' into 'develop'
...
mix: Update earmark
See merge request pleroma/pleroma!3538
2021-11-16 13:54:34 +00:00
Haelwenn (lanodan) Monnier
5e15ceb49d
mix: Update earmark
...
This should fix the presence of extraneous newlines in markdown output.
Related: https://github.com/pragdave/earmark/issues/406
2021-11-16 14:33:27 +01:00
lain
add2b9cd8d
Merge branch 'update-elixir' into 'develop'
...
CI: Upload the image for all platforms
See merge request pleroma/pleroma!3537
2021-11-15 20:17:38 +00:00
Lain Soykaf
f78cb6ab9a
CI: Upload the image for all platforms
...
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
2021-11-15 21:04:43 +01:00
04aca335aa
nodeinfo: report activeMonth and activeHalfyear users fields
2021-11-15 17:01:30 +01:00
