squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,653 Commits 154 Branches 42 Tags 503 MiB
80ededc04f
Commit Graph

7653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AkiraFukushima
e1fc6cb78f Check client and token in GET /oauth/authorize 2019-11-05 23:52:47 +09:00
rinpatch
f11eebc183 Merge branch 'chore/bump-htmlentities' into 'develop' 
Bump HtmlEntities to 0.5

See merge request pleroma/pleroma!1939
 2019-11-05 10:01:29 +00:00
rinpatch
9d3b12a658 Bump HtmlEntities to 0.5 
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
 2019-11-05 12:37:25 +03:00
Maksim Pechnikov
e52955c961 update following_relationship.ex 2019-11-05 10:50:03 +03:00
Maksim Pechnikov
62bc0657e7 excluded invisible users from search results 2019-11-05 08:55:41 +03:00
Maxim Filippov
2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset 2019-11-05 11:36:47 +10:00
Maxim Filippov
43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-05 02:12:48 +03:00
Maksim Pechnikov
4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id 2019-11-04 20:44:24 +03:00
rinpatch
fee1276963 Merge branch 'failing-search-fixes' into 'develop' 
User Search: Remove superfluous setweight and random test.

See merge request pleroma/pleroma!1935
 2019-11-04 16:28:55 +00:00
lain
478eb5944d Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop' 
Add `pleroma.direct_conversation_id` to the `conversation` event payload

See merge request pleroma/pleroma!1925
 2019-11-04 15:59:36 +00:00
lain
4e53520917 User Search: Remove superfluous setweight and random test. 
The test tested for a behavior that isn't actually enforced anymore.
 2019-11-04 16:57:41 +01:00
eugenijm
ed29be24cb Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload. 2019-11-04 18:36:16 +03:00
lain
a304a2a845 Merge branch 'transmogrifier-test-errors' into 'develop' 
capture test log where errors are expected

See merge request pleroma/pleroma!1915
 2019-11-04 15:19:29 +00:00
lain
f7f69356bd Merge branch 'missing-tesla-mocks' into 'develop' 
add missing tesla mocks

See merge request pleroma/pleroma!1879
 2019-11-04 15:18:32 +00:00
Steven Fuchs
5271bbcf11 add missing tesla mocks 2019-11-04 15:18:32 +00:00
kaniini
bec6d02f30 Merge branch 'chore/update-fast-sanitize' into 'develop' 
mix: update fast_sanitize dependency to 1af67547

Closes #1372

See merge request pleroma/pleroma!1934
 2019-11-04 14:52:56 +00:00
Ariadne Conill
203d9812f0 mix: update fast_sanitize dependency to 1af67547 2019-11-04 08:38:40 -06:00
kaniini
06cc77e6fb Merge branch 'faster-user-deactivation' into 'develop' 
User: Don't pull remote users follower count immediately after deactivating.

Closes #1369

See merge request pleroma/pleroma!1933
 2019-11-04 14:24:21 +00:00
lain
556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' 
Store status data inside flag activity

See merge request pleroma/pleroma!1849
 2019-11-04 14:11:44 +00:00
lain
0c31258616 User: Don't pull remote users follower count immediately after deactivating. 
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.

Closes #1369
 2019-11-04 14:36:54 +01:00
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
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
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