itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
8725 commits 3 branches 2 tags 276 MiB
Commit graph

8725 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaniini
bab786cd93 Merge branch 'chore/update-fast-sanitize' into 'develop' 
update fast sanitize dependency

See merge request pleroma/pleroma!1932
 2019-11-03 22:00:50 +00:00
Ariadne Conill
f42f300870 update fast sanitize dependency 2019-11-03 15:41:30 -06:00
rinpatch
8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop' 
streamer: use direct object for filter checks when there is no valid child object in an activity

Closes #1291

See merge request pleroma/pleroma!1931
 2019-11-03 17:09:57 +00:00
kaniini
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
kaniini
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
Ariadne Conill
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
Haelwenn
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
rinpatch
55ef88ef95 Bump fast_sanitize version 2019-11-01 20:58:24 +03:00
kaniini
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
Maxim Filippov
ab5c8ec9fa Update docs 2019-11-01 20:27:16 +03:00
Maxim Filippov
10e9ba6340 Apply suggestion to CHANGELOG.md 2019-11-01 17:25:41 +00:00
Maxim Filippov
1b83a0694a Fix moderation log crash 2019-11-01 19:13:29 +03:00
Maxim Filippov
743b622b7b Force password reset for multiple users 2019-11-01 18:45:47 +03:00
rinpatch
4bab9672ed 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-11-01 16:26:27 +01:00
lain
6f5ac0819a Tests: Fix tests failing because of info being null. 2019-11-01 14:16:00 +01:00
lain
d52f9c144f Mixfile: Bump version. 2019-11-01 13:40:58 +01:00
lain
5b34545b64 Changelog: Add information about user.info migration. 2019-11-01 13:40:28 +01:00
lain
8ad75f9ecf Migrations: Add migration to fill empty info fields and make them non-null. 2019-11-01 13:31:55 +01:00
Maxim Filippov
d75934b0d0 Undo dialyzer fix 2019-11-01 15:14:43 +03:00
kaniini
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
lain
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
Maxim Filippov
ced9f92327 Fix count 2019-10-31 15:34:49 +03:00
Maxim Filippov
6f9d3d30fa AdminAPI: Omit relay user from users list 2019-10-31 02:26:02 +03:00
Maxim Filippov
59a149c69a Fix "the call ... will never return" warning 2019-10-31 02:25:15 +03:00
Mark Felder
bd0f7f2e09 Bump fast_sanitize dependency so this builds on more than just Linux 2019-10-30 17:57:08 -05:00
Mark Felder
fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize 2019-10-30 17:51:15 -05:00
Roman Chvanikov
8bb6da7cd6 Remove following column from the migrations 2019-10-30 18:34:14 +03:00
Egor Kislitsyn
61fc739ab8
Handle "Move" activity 2019-10-30 18:21:49 +07:00
kPherox
d1ae51b02a Update test for get_recipients_from_activity 2019-10-30 20:14:16 +09:00
rinpatch
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
rinpatch
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
Egor Kislitsyn
40d5fb6ef8
Add a migration to fix blocked follows 2019-10-30 15:52:37 +07:00
kPherox
363e76d4da Fix duplicate recipients 2019-10-30 15:40:25 +09:00
rinpatch
ae59b38203 Rip out the rest of htmlsanitizeex 2019-10-30 09:20:13 +03:00
rinpatch
77cfb08b8c Remove commented-out code 2019-10-29 20:58:54 +03:00
rinpatch
61400d7eb7 Fix XSS emoji test 2019-10-29 20:49:32 +03:00
rinpatch
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
rinpatch
7358cf1f20 Bump fast_sanitize dependency 2019-10-29 17:00:03 +03:00
rinpatch
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
rinpatch
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
kPherox
5334190056
Migrate missing follow requests 2019-10-29 19:22:34 +09:00
rinpatch
41c23251f1 Bump fast_sanitize version 2019-10-29 13:05:20 +03:00
kPherox
c2f2d7bcf6 Add test follow activity for locked account 2019-10-29 18:46:22 +09:00
kPherox
0c361eeb25
Add pending to handle incoming for Follow activity 2019-10-29 17:12:49 +09:00
rinpatch
9cde3321a3 Add fast_sanitize to dependencies 2019-10-29 01:21:00 +03:00
rinpatch
08f6837065 Switch from HtmlSanitizeEx to FastSanitize 2019-10-29 01:18:08 +03:00
rinpatch
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
rinpatch
9434e151a9 Blacklist myhtmlex nodes from swarm 2019-10-29 01:16:22 +03:00
rinpatch
05d111b622 Use the default scrubber before mediaproxy transformation 2019-10-29 01:15:28 +03:00
stwf
56e42602b0 capture where errors are expected 2019-10-28 12:51:58 -04:00