9bb66c0b65
Merge branch 'chore/fast-sanitize-bump-back' into 'develop'
...
deps: update back fast sanitize
See merge request pleroma/pleroma!2205
2020-02-13 16:55:36 +00:00
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
2020-02-13 19:53:39 +03:00
070069125f
deps: update back fast sanitize
...
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
2020-02-13 19:48:22 +03:00
feld
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
2020-02-13 14:37:55 +00:00
feld
0db88f547b
Merge branch 'chore/config-descriptions' into 'develop'
...
Improve config descriptions
See merge request pleroma/pleroma!2201
2020-02-13 14:20:30 +00:00
feld
182a106746
Merge branch 'fix/status_expires_in_validation' into 'develop'
...
Fix `status.expires_in` validation
See merge request pleroma/pleroma!2203
2020-02-13 14:03:59 +00:00
571a475c7e
Formatting
2020-02-13 08:02:33 -06:00
9b778dc54a
Formatting
2020-02-13 08:01:39 -06:00
feld
4f5ee26f2d
Update description.exs
2020-02-13 14:00:33 +00:00
feld
e4016f4dbd
Apply suggestion to config/description.exs
2020-02-13 13:59:47 +00:00
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03:00
19516af74e
Fix `status.expires_in` validation
2020-02-12 20:20:44 +04:00
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.
2020-02-11 15:39:19 -06:00
9581d57382
First round at cleaning up descriptions
2020-02-11 15:21:36 -06:00
feld
d056f7f722
Merge branch 'restore-twitter-api-tests' into 'develop'
...
Restore TwitterAPI tests
Closes #1257
See merge request pleroma/pleroma!2200
2020-02-11 21:08:37 +00:00
58b2017aa0
Restore TwitterAPI tests
2020-02-12 00:51:05 +04:00
feld
f98090272a
Merge branch 'update/admin-fe-20200211' into 'develop'
...
Update AdminFE build
See merge request pleroma/pleroma!2198
2020-02-11 20:08:28 +00:00
50d9fcbe29
Hotlink logo instead of attachment
2020-02-11 23:33:05 +04:00
01984d15ce
Merge branch 'revert-3fee859b' into 'develop'
...
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
See merge request pleroma/pleroma!2199
2020-02-11 17:09:48 +00:00
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
f9eb35d48e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
2020-02-11 10:33:41 -06:00
de0fea4634
Update AdminFE build
2020-02-11 10:24:38 -06:00
3fee859b60
Merge branch 'feat/floki-fasthtml' into 'develop'
...
Make Floki use fast_html
See merge request pleroma/pleroma!2194
2020-02-11 13:22:35 +00:00
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
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
2020-02-11 16:17:03 +03:00
9172540f8d
deps: update floki to 0.25.0
...
needed to make it use fast_html
2020-02-11 16:16:29 +03:00
335cbe2e1b
Merge branch 'uguu-uwu-notices-bulge' into 'develop'
...
EmojiReactions: Align API endpoints
See merge request pleroma/pleroma!2183
2020-02-11 13:14:05 +00:00
60de311164
Update frontend
2020-02-11 13:59:04 +01:00
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
2020-02-11 13:58:36 +01:00
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
2020-02-11 11:44:33 +00:00
36c6dc1c10
Merge branch 'oban-crontab-fix' into 'develop'
...
Set oban crontab to false in tests
See merge request pleroma/pleroma!2197
2020-02-11 09:55:16 +00:00
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
2020-02-11 13:54:55 +04:00
bfd16fe41e
set oban crontab to false in tests
2020-02-11 12:19:06 +03:00
5ebffd5224
Merge branch 'docs/kyclos' into 'develop'
...
clients.md: Add Kyclos
See merge request pleroma/pleroma!2196
2020-02-11 08:04:58 +00:00
58574ef156
Merge branch 'develop' into issue/1276
2020-02-11 08:35:26 +03:00
209e4d8432
clients.md: Add Kyclos
2020-02-11 02:27:40 +01:00
ad16f38b9c
differences_in_mastoapi_responses.md: Add note about unlisted results
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
2020-02-11 01:59:27 +01:00
94e5ca1105
Merge branch 'issue/1383' into 'develop'
...
[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015
2020-02-11 00:04:06 +00:00
a7287e2e3a
Merge branch 'docs_backup_restore' into 'develop'
...
DOCS Backup/Restore/Migrate your instance
See merge request pleroma/pleroma!2107
2020-02-10 23:53:26 +00:00
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
2020-02-10 23:53:26 +00:00
32a7b4dadd
Merge branch 'fix/compilation-error-docs' into 'develop'
...
Fix a compilation error under certain circumstances
See merge request pleroma/pleroma!2193
2020-02-10 18:25:12 +00:00
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
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.
2020-02-10 18:41:02 +03:00
b95dd5e217
[ #1505 ] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.
2020-02-10 11:46:16 +03:00
3830cb538b
removed a comments
2020-02-10 09:14:15 +03:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
42f76306e7
Merge branch 'release/1.1.9' into 'stable'
...
Release/1.1.9
See merge request pleroma/pleroma!2189
2020-02-09 12:15:52 +00:00
544bdbfb90
Merge branch 'fix/email-task-otp' into 'develop'
...
Fix email mix task on OTP releases
Closes #1548
See merge request pleroma/pleroma!2191
2020-02-09 12:05:32 +00:00
rinpatch
feld