Mark Felder
2c95b0fab9
Make the sample code actually compile
5 years ago
Ivan Tashkinov
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
Mark Felder
0afff36cda
Formatting got me again
5 years ago
rinpatch
9906c6fb6f
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
...
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
5 years ago
Mark Felder
21dc3e3812
Even more description improvements
5 years ago
Mark Felder
aac7f30eb2
Add missing Oban job for attachments_cleanup
5 years ago
Mark Felder
1c52cf933f
More description cleanup work
5 years ago
Mark Felder
9218f893d7
More description cleanups
5 years ago
lain
18a56410b8
Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'
...
Fix the confusingly named and inverted logic of "no_attachment_links"
See merge request pleroma/pleroma!2202
5 years ago
rinpatch
9bb66c0b65
Merge branch 'chore/fast-sanitize-bump-back' into 'develop'
...
deps: update back fast sanitize
See merge request pleroma/pleroma!2205
5 years ago
rinpatch
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
5 years ago
rinpatch
070069125f
deps: update back fast sanitize
...
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
5 years ago
feld
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
5 years ago
feld
0db88f547b
Merge branch 'chore/config-descriptions' into 'develop'
...
Improve config descriptions
See merge request pleroma/pleroma!2201
5 years ago
feld
182a106746
Merge branch 'fix/status_expires_in_validation' into 'develop'
...
Fix `status.expires_in` validation
See merge request pleroma/pleroma!2203
5 years ago
Mark Felder
571a475c7e
Formatting
5 years ago
Mark Felder
9b778dc54a
Formatting
5 years ago
feld
4f5ee26f2d
Update description.exs
5 years ago
feld
e4016f4dbd
Apply suggestion to config/description.exs
5 years ago
Egor Kislitsyn
19516af74e
Fix `status.expires_in` validation
5 years ago
Mark Felder
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
5 years ago
Mark Felder
9581d57382
First round at cleaning up descriptions
5 years ago
feld
d056f7f722
Merge branch 'restore-twitter-api-tests' into 'develop'
...
Restore TwitterAPI tests
Closes #1257
See merge request pleroma/pleroma!2200
5 years ago
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests
5 years ago
feld
f98090272a
Merge branch 'update/admin-fe-20200211' into 'develop'
...
Update AdminFE build
See merge request pleroma/pleroma!2198
5 years ago
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment
5 years ago
lain
01984d15ce
Merge branch 'revert-3fee859b' into 'develop'
...
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
See merge request pleroma/pleroma!2199
5 years ago
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
Mark Felder
f9eb35d48e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
5 years ago
Mark Felder
de0fea4634
Update AdminFE build
5 years ago
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