74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
2019-11-03 16:19:27 +00:00
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
2019-11-03 16:18:19 +00:00
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
2019-11-03 09:05:12 -06:00
9d8da9ea15
Merge branch 'fix/migration-schema' into 'develop'
...
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
2019-11-02 15:07:47 +00:00
55ef88ef95
Bump fast_sanitize version
2019-11-01 20:58:24 +03:00
366ada7b29
Merge branch 'fix/moderation-log-crash' into 'develop'
...
Fix moderation log crash
Closes #1345
See merge request pleroma/pleroma!1929
2019-11-01 17:56:20 +00:00
ab5c8ec9fa
Update docs
2019-11-01 20:27:16 +03:00
10e9ba6340
Apply suggestion to CHANGELOG.md
2019-11-01 17:25:41 +00:00
1b83a0694a
Fix moderation log crash
2019-11-01 19:13:29 +03:00
743b622b7b
Force password reset for multiple users
2019-11-01 18:45:47 +03:00
d75934b0d0
Undo dialyzer fix
2019-11-01 15:14:43 +03:00
1a60215076
Merge branch 'fix-recipients-from-activity' into 'develop'
...
Fix duplicate recipients from activity
See merge request pleroma/pleroma!1921
2019-11-01 12:06:44 +00:00
e14cae25aa
Merge branch 'refactor/db-add-defaults' into 'develop'
...
Set defaults to fields with NULL values
Closes #1358
See merge request pleroma/pleroma!1914
2019-10-31 13:34:57 +00:00
ced9f92327
Fix count
2019-10-31 15:34:49 +03:00
6f9d3d30fa
AdminAPI: Omit relay user from users list
2019-10-31 02:26:02 +03:00
59a149c69a
Fix "the call ... will never return" warning
2019-10-31 02:25:15 +03:00
bd0f7f2e09
Bump fast_sanitize dependency so this builds on more than just Linux
2019-10-30 17:57:08 -05:00
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
2019-10-30 17:51:15 -05:00
8bb6da7cd6
Remove following column from the migrations
2019-10-30 18:34:14 +03:00
d1ae51b02a
Update test for get_recipients_from_activity
2019-10-30 20:14:16 +09:00
9b40e5f563
Merge branch 'fix/blocked-follows' into 'develop'
...
Add a migration to fix blocked follows
Closes #1359
See merge request pleroma/pleroma!1922
2019-10-30 10:59:25 +00:00
c546da7cfe
Fix bookmark migration using a query with a schema
...
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
2019-10-30 12:59:14 +03:00
40d5fb6ef8
Add a migration to fix blocked follows
2019-10-30 15:52:37 +07:00
363e76d4da
Fix duplicate recipients
2019-10-30 15:40:25 +09:00
ae59b38203
Rip out the rest of htmlsanitizeex
2019-10-30 09:20:13 +03:00
77cfb08b8c
Remove commented-out code
2019-10-29 20:58:54 +03:00
61400d7eb7
Fix XSS emoji test
2019-10-29 20:49:32 +03:00
eba8acff09
Merge branch 'fix/migrations-same-module-name' into 'develop'
...
Fix two migrations sharing the same module name
See merge request pleroma/pleroma!1919
2019-10-29 14:17:09 +00:00
7358cf1f20
Bump fast_sanitize dependency
2019-10-29 17:00:03 +03:00
3e09b7c5ae
Fix two migrations sharing the same module name
...
This makes ecto execute only the latter one.
2019-10-29 16:56:24 +03:00
07c7f16356
Merge branch 'fix-follow-requests' into 'develop'
...
FIx follow requests
Closes #1357
See merge request pleroma/pleroma!1918
2019-10-29 11:24:07 +00:00
5334190056
Migrate missing follow requests
2019-10-29 19:22:34 +09:00
41c23251f1
Bump fast_sanitize version
2019-10-29 13:05:20 +03:00
c2f2d7bcf6
Add test follow activity for locked account
2019-10-29 18:46:22 +09:00
0c361eeb25
Add pending to handle incoming for Follow activity
2019-10-29 17:12:49 +09:00
9cde3321a3
Add fast_sanitize to dependencies
2019-10-29 01:21:00 +03:00
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
2019-10-29 01:18:08 +03:00
2453928b57
Ensure myhtmlex is started before swarm
...
Otherwise swarm is going to attempt resizing the cluster and timeout
2019-10-29 01:16:57 +03:00
9434e151a9
Blacklist myhtmlex nodes from swarm
2019-10-29 01:16:22 +03:00
05d111b622
Use the default scrubber before mediaproxy transformation
2019-10-29 01:15:28 +03:00
56e42602b0
capture where errors are expected
2019-10-28 12:51:58 -04:00
435d220700
Move setDefaultsToTables to past to run before notNull migrations
2019-10-28 19:17:50 +03:00
4b0893631f
Complete defaults
2019-10-28 19:16:19 +03:00
e80f90e9db
Merge branch 'fix/migration' into 'develop'
...
Fix `SetNotNullForUsers` migration
See merge request pleroma/pleroma!1913
2019-10-28 08:05:14 +00:00
3c86a0ab24
Fix `SetNotNullForUsers` migration
2019-10-28 14:45:50 +07:00
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
0be9cb086b
Add migration
2019-10-27 19:29:35 +03:00
d56bc62275
Fix report parsing
2019-10-27 16:33:58 +03:00
8282b6ac3d
Make sure incoming flags are updated with status data
2019-10-27 16:17:37 +03:00
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
2019-10-27 16:11:25 +03:00
kaniini