sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
10490 commits 2 branches 40 tags 290 MiB
Commit graph

10490 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
208baf157a ActivityPub: Add new 'capabilities' to user. 2020-07-06 11:38:40 +02:00
lain
74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-06 11:27:06 +02:00
rinpatch
69f0b286f7 Merge branch '1915-dont-filter-announce-notifications' into 'develop' 
Streamer: Don't filter out announce notifications.

Closes #1915

See merge request pleroma/pleroma!2719
 2020-07-06 09:21:03 +00:00
lain
a2cabb99ca Merge branch 'filter-tesla-config' into 'develop' 
Filter tesla config

See merge request pleroma/pleroma!2722
 2020-07-06 09:20:10 +00:00
Alexander Strizhakov
465ddcfd20
migration to delete migrated tesla setting 2020-07-06 09:12:29 +03:00
Alexander Strizhakov
480dfafa83
don't save tesla settings into db 2020-07-06 08:48:20 +03:00
lain
cf56655614 Streamer: Don't filter out announce notifications. 2020-07-04 17:11:37 +02:00
lain
c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop' 
MastoAPI 2.9.0: status text on deletion

See merge request pleroma/pleroma!2690
 2020-07-03 15:06:33 +00:00
lain
9a27ef47f1 Merge branch '1912-leading-trailing-space-search' into 'develop' 
SearchController: Trim query.

Closes #1912

See merge request pleroma/pleroma!2717
 2020-07-03 14:59:12 +00:00
lain
cbf2fe9649 Update changelog 2020-07-03 16:46:11 +02:00
lain
d3efb50262 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text 2020-07-03 16:44:31 +02:00
lain
19fbfbb767 Merge branch '1892-exclude-bots-from-search-results' into 'develop' 
[#1892] Exclusion of service actors from user search results

Closes #1892

See merge request pleroma/pleroma!2708
 2020-07-03 14:38:22 +00:00
lain
945e75c8e8 SearchController: Trim query. 2020-07-03 16:36:55 +02:00
lain
ef4c16f6f1 Update changelog 2020-07-03 15:59:42 +02:00
lain
01695716c8 Docs: Document accepts_chat_messages setting. 2020-07-03 15:55:18 +02:00
lain
e3b5559780 AccountController: Make setting accepts_chat_messages possible. 2020-07-03 15:54:25 +02:00
lain
4a7b89e372 ChatMessageValidator: Additional validation. 2020-07-03 15:13:27 +02:00
lain
3ca9af1f9f Account Schema: Add accepts_chat_messages 2020-07-03 14:31:04 +02:00
lain
b374fd622b Docs: Document the added accepts_chat_messages user property. 2020-07-03 14:24:54 +02:00
lain
5c0bf4c472 ActivityPub: Ingest information about chat acceptance. 2020-07-03 13:58:34 +02:00
lain
8289ec67a8 Litepub: Add acceptsChatMessages to schema. 2020-07-03 13:39:21 +02:00
lain
26a7cc3f00 UserView: Add acceptsChatMessages field 2020-07-03 13:38:59 +02:00
lain
db76c26469 AccountViewTest: Fix test. 2020-07-03 13:24:16 +02:00
lain
37fdb05058 User, Migration: Change accepts_chat_messages to be nullable 
This is to model the ambiguous state of most users.
 2020-07-03 13:12:23 +02:00
lain
3250228be9 AccountView: Add 'accepts_chat_messages' to view. 2020-07-03 13:07:33 +02:00
lain
98bfdba108 User: On registration, set accepts_chat_messages to true. 2020-07-03 12:47:05 +02:00
lain
8ad166e8e3 Migrations: Add accepts_chat_messages to users. 2020-07-03 12:46:28 +02:00
rinpatch
86151b23a6 Merge branch '1910-migration-fix' into 'develop' 
Notification Backfill: Explicitly select the needed fields.

Closes #1910

See merge request pleroma/pleroma!2715
 2020-07-03 10:44:19 +00:00
lain
59b426ebef Notification Backfill: Explicitly select the needed fields. 
Prevents a crashing migration when we change user fields.
 2020-07-03 11:25:12 +02:00
Ivan Tashkinov
90764670dc [#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results. 2020-07-03 11:02:15 +03:00
feld
fd5ad99ace Merge branch 'feature/1885-MRF-metadata' into 'develop' 
Feature/1885 mrf metadata

Closes #1885

See merge request pleroma/pleroma!2693
 2020-07-02 19:44:05 +00:00
feld
4f8e0170e9 Merge branch 'activation-meta' into 'develop' 
Add more FE-required fields to /api/v1/instance

See merge request pleroma/pleroma!2613
 2020-07-02 18:12:03 +00:00
Mark Felder
8121e46f25 Merge branch 'develop' into activation-meta 2020-07-02 13:01:22 -05:00
Mark Felder
02d855b2b9 Document the new API extension of /api/v1/instance 2020-07-02 12:59:45 -05:00
Mark Felder
d44ec2bf4c Remove camelCase from the keys 2020-07-02 12:55:08 -05:00
Mark Felder
80076f1974 Lint, long lines 2020-07-02 10:33:27 -05:00
Mark Felder
d169e51b7e Improve descriptions, move primary MRF settings to top for AdminFE ordering 2020-07-02 10:27:15 -05:00
Mark Felder
a5d611abc2 Update AdminFE build to utilize new MRF metadata 2020-07-02 10:16:19 -05:00
Mark Felder
6b5563ed2c Merge branch 'develop' into feature/1885-MRF-metadata 2020-07-02 09:57:57 -05:00
rinpatch
4c044f6225 Merge branch 'fetcher-fixes' into 'develop' 
Don't fail fetching when the user in a replied-to message can't be fetched.

See merge request pleroma/pleroma!2711
 2020-07-02 10:17:51 +00:00
rinpatch
b0439df1b5 Merge branch '1907-fix-announce-streaming' into 'develop' 
Resolve "Streaming API: Repeats of your posts from random people are pushed to the timeline"

Closes #1907

See merge request pleroma/pleroma!2714
 2020-07-02 10:08:42 +00:00
lain
d884b6f704 Merge branch 'feature/update-description' into 'develop' 
Update settings descriptions and labels

See merge request pleroma/pleroma!2709
 2020-07-02 08:43:32 +00:00
lain
bad08f34ca Credo fixes. 2020-07-02 09:57:31 +02:00
lain
ce9b7c0e0f Changelog: Update with stream changes. 2020-07-02 09:54:48 +02:00
lain
311b7c19d0 Streamer: Align announce streaming with polling. 2020-07-02 09:50:26 +02:00
lain
61fe94d698 SideEffects: Refactor. 2020-07-02 09:33:50 +02:00
rinpatch
fa7a0be225 Merge branch '1716-handle-nickname-clashes' into 'develop' 
ActivityPub: Handle clashing nicknames for the same ap id

Closes #1716

See merge request pleroma/pleroma!2712
 2020-07-01 13:51:23 +00:00
lain
fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id 
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.

This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
 2020-07-01 12:26:07 +02:00
lain
ce92e6e5ce Fetcher: Work when we can't get the OP. 2020-07-01 11:48:51 +02:00
lain
8ae572d5ae Fixtures: Pretty print. 2020-07-01 11:47:45 +02:00