AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 177 Pull requests 25 Projects 2 Releases 14 Packages Wiki Activity
10484 commits 26 branches 107 tags 319 MiB
Commit graph

10484 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn
d81acb5f62 Merge branch 'description-limits' into 'develop' 
Add limits to image descriptions

See merge request pleroma/pleroma!2724
 2020-07-07 03:00:52 +00:00
Haelwenn
2a323d3797 Merge branch '1507-static-fe-prioritize-json' into 'develop' 
StaticFE: Prioritize json in requests.

Closes #1507

See merge request pleroma/pleroma!2695
 2020-07-07 00:04:24 +00:00
lain
158c26d7dd StaticFE Plug: Use phoenix helper to get the requested format. 2020-07-06 12:11:10 +02:00
lain
ed4f9f6a29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json 2020-07-06 12:07:56 +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
lain
58da575935 Changelog: Document description limits. 2020-07-06 11:18:01 +02:00
lain
729506c56a Docs: document instance differences 2020-07-06 11:16:58 +02:00
lain
cc8b4e48d9 InstanceView: Add chat limit, description limit 2020-07-06 11:12:37 +02:00
lain
2e21ae1b6d Docs: Add description limits to cheat sheet 2020-07-06 11:08:53 +02:00
lain
af7720237b Upload: Restrict description length 2020-07-06 11:08:13 +02: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
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
lain
d889c9ca70 Merge branch 'revert-651f2695' into 'develop' 
Revert "Merge branch 'avatar-removing' into 'develop'"

See merge request pleroma/pleroma!2710
 2020-07-01 09:18:02 +00:00
lain
691742e62d Revert "Merge branch 'avatar-removing' into 'develop'" 
This reverts merge request !2701
 2020-07-01 08:51:56 +00:00
Angelina Filippova
df2d6564d5 Add labels, update descriptions and labels 2020-07-01 03:01:15 +03:00
Haelwenn
9cf4bfcd81 Merge branch 'chore/rename-user-settings-column' into 'develop' 
Rename user.settings column

See merge request pleroma/pleroma!2707
 2020-06-30 20:51:10 +00:00
Mark Felder
5a8e0208b1 Add fields limits to instance metadata, add tests 2020-06-30 15:25:10 -05:00
Mark Felder
0883a706dc Merge branch 'develop' into activation-meta 2020-06-30 15:09:03 -05:00
Ivan Tashkinov
3d2989278c [#1892] Excluded bot actors (applications, services) from search results. 2020-06-30 21:26:39 +03:00