lain
3fee859b60
Merge branch 'feat/floki-fasthtml' into 'develop'
...
Make Floki use fast_html
See merge request pleroma/pleroma!2194
5 years ago
rinpatch
ea1631d7e6
Make Floki use fast_html
5 years ago
rinpatch
58299fcfb4
deps: update fast_sanitize to 0.1.7
...
needed to get new fast_html version since 1.0.1 had an attribute parsing
bug
5 years ago
rinpatch
9172540f8d
deps: update floki to 0.25.0
...
needed to make it use fast_html
5 years ago
lain
335cbe2e1b
Merge branch 'uguu-uwu-notices-bulge' into 'develop'
...
EmojiReactions: Align API endpoints
See merge request pleroma/pleroma!2183
5 years ago
lain
60de311164
Update frontend
5 years ago
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
lain
2f1c61255f
Merge branch 'doc/unlisted-search' into 'develop'
...
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes #1164
See merge request pleroma/pleroma!2195
5 years ago
lain
36c6dc1c10
Merge branch 'oban-crontab-fix' into 'develop'
...
Set oban crontab to false in tests
See merge request pleroma/pleroma!2197
5 years ago
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Alexander Strizhakov
bfd16fe41e
set oban crontab to false in tests
5 years ago
lain
5ebffd5224
Merge branch 'docs/kyclos' into 'develop'
...
clients.md: Add Kyclos
See merge request pleroma/pleroma!2196
5 years ago
Haelwenn (lanodan) Monnier
209e4d8432
clients.md: Add Kyclos
5 years ago
Haelwenn (lanodan) Monnier
ad16f38b9c
differences_in_mastoapi_responses.md: Add note about unlisted results
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
5 years ago
rinpatch
94e5ca1105
Merge branch 'issue/1383' into 'develop'
...
[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015
5 years ago
Haelwenn
a7287e2e3a
Merge branch 'docs_backup_restore' into 'develop'
...
DOCS Backup/Restore/Migrate your instance
See merge request pleroma/pleroma!2107
5 years ago
Ilja
a9e946b99a
DOCS Backup/Restore/Migrate your instance
...
* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server
* Added an optional step to reinstall pleroma (esp. for migrating servers)
* Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types'
* I added a new step to drop and recreate an empty pleroma-database
* I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working
* This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15
5 years ago
rinpatch
32a7b4dadd
Merge branch 'fix/compilation-error-docs' into 'develop'
...
Fix a compilation error under certain circumstances
See merge request pleroma/pleroma!2193
5 years ago
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
c55301e760
Fix a compilation error under certain circumstances
...
I've noticed that sometimes when switching from develop to stable and back,
develop fails to compile and rm -r ing the _build and deps dirs doesn't
help at all.
This is due to Admin API controller needing to generate JSON description
of the config at compile time. Evaluating `config/description.exs`
calls `Generator.list_modules_in_dir/2`, which in turn predicts the
module names of files in the directory and tries to convert the
predicted name to *existing* atoms. Sometimes the compiler will
call that function before compiling the modules in the said directory,
so the conversion will of course fail.
This fixes it by removing the requirement of the atoms being existent.
The function is not subjected to any untrusted user input so this should
be safe. An ideal fix would be to block the compilation of docs before
all modules are compiled and then get a list of compiled elixir modules
under the namespace we want instead of directory hacks, but I have not
been able to figure out how to do that.
5 years ago
Ivan Tashkinov
b95dd5e217
[ #1505 ] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.
5 years ago
Ivan Tashkinov
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
rinpatch
42f76306e7
Merge branch 'release/1.1.9' into 'stable'
...
Release/1.1.9
See merge request pleroma/pleroma!2189
5 years ago
rinpatch
544bdbfb90
Merge branch 'fix/email-task-otp' into 'develop'
...
Fix email mix task on OTP releases
Closes #1548
See merge request pleroma/pleroma!2191
5 years ago
Ivan Tashkinov
6ea3c06d8d
[ #1505 ] Minor refactoring.
5 years ago
rinpatch
06fec99e1d
mix.exs: bump version to 1.1.9
5 years ago
Ivan Tashkinov
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
rinpatch
8fda6303ba
Fix email mix task on OTP releases
...
Closes pleroma#1548
5 years ago
rinpatch
01396a11f2
changelog: add entry for 1.1.9
5 years ago
rinpatch
1e3dda9b1d
Actually fix upload limit on OTP releases
...
Closes #1109
5 years ago
rinpatch
be3cdde9db
deps: update plug to 1.9
...
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
5 years ago
rinpatch
31dc669de6
fix not being able to pin polls
5 years ago
Haelwenn
1e74bbc495
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
5 years ago
rinpatch
40727b28a7
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
5 years ago
Maksim Pechnikov
f486556346
fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
rinpatch
a87843693b
Fix never matching clause
...
`length/1` is only used with lists.
5 years ago
Ivan Tashkinov
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Ivan Tashkinov
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
lain
964b4d82a0
Merge branch 'fix/upload-limit-otp' into 'develop'
...
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
5 years ago
Alexander Strizhakov
dad23e3766
need_reboot flag
5 years ago
Egor Kislitsyn
815f659ed8
Fix MRF documentation
5 years ago
rinpatch
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
5 years ago
Haelwenn
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
5 years ago
rinpatch
8d01aaa702
Merge branch 'questions-timezone' into 'develop'
...
Questions: Add timezone to `closed` property
Closes #1552
See merge request pleroma/pleroma!2184
5 years ago
Lain Soykaf
d85bcc8627
Questions: Add timezone to `closed` property
5 years ago
rinpatch
f57cea17bc
deps: update plug to 1.9
...
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
5 years ago
lain
57098713c0
Apply suggestion to docs/API/pleroma_api.md
5 years ago
lain
713645d5c5
Apply suggestion to docs/API/pleroma_api.md
5 years ago
Lain Soykaf
4538a1ee01
EmojiReactions: Remove old API endpoints
5 years ago
Lain Soykaf
ce95882009
EmojiReactions: Add docs and Changelog
5 years ago