fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
9125 commits 26 branches 107 tags 316 MiB
Commit graph

3259 commits

Author SHA1 Message Date
lain ca598e9c27 AccountView: Return user ap_id. 2020-04-16 15:27:35 +02:00
lain e2ced04917 ChatMessages: Better validation. 2020-04-16 15:21:47 +02:00
lain 3d4eca5dd4 CommonAPI: Escape HTML for chat messages. 2020-04-16 12:56:29 +02:00
lain 6ace22b56a Chat: Add views, don't return them in timeline queries. 2020-04-15 18:23:16 +02:00
lain 44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-15 14:41:43 +02:00
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'" 
This reverts merge request !1877
 2020-04-14 16:32:22 +00:00
feld bf3afbc1a1 Merge branch 'logger-configuration' into 'develop' 
Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365
 2020-04-14 15:11:25 +00:00
Haelwenn 60cc7d6c9a Merge branch 'issue/1276' into 'develop' 
[#1276] An endpoint for getting unread notification count

Closes #1276

See merge request pleroma/pleroma!1877
 2020-04-14 06:38:56 +00:00
Egor Kislitsyn 4dca712e90
Add OpenAPI spec for DomainBlockController 2020-04-13 22:44:52 +04:00
Maksim Pechnikov a16b3dbcbf Merge branch 'develop' into issue/1276 2020-04-13 21:19:27 +03:00
Ivan Tashkinov a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +03:00
Alexander Strizhakov a050f3e015
fix for logger configuration through admin-fe 2020-04-13 08:56:28 +03:00
rinpatch 5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop' 
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
 2020-04-11 19:46:04 +00:00
lain 64c78581fe Chat: Only create them for valid users for now. 2020-04-10 14:47:56 +02:00
Egor Kislitsyn cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination 2020-04-10 14:18:57 +04:00
Haelwenn 4d33e0bd50 Merge branch 'bugfix/apc2s_upload_activity' into 'develop' 
bugfix: AP C2S activity with attachments

See merge request pleroma/pleroma!2316
 2020-04-10 04:31:13 +00:00
lain 2cc6841424 ChatController: Basic message posting. 2020-04-09 17:18:31 +02:00
lain e8fd0dd689 ChatController: Basic support for returning messages. 2020-04-09 16:59:49 +02:00
lain 68abea313d ChatController: Add creation and return of chats. 2020-04-09 15:13:55 +02:00
Egor Kislitsyn d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint 2020-04-09 17:08:43 +04:00
lain d35e114acd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-09 13:25:27 +02:00
lain 8e637ae1a7 CommonAPI: Basic ChatMessage support. 2020-04-09 13:20:16 +02:00
lain 4b04785071 SideEffects: Extend ChatMessage test. 2020-04-09 12:46:33 +02:00
lain 2e78686686 SideEffects: Handle ChatMessage creation. 2020-04-09 12:44:20 +02:00
lain b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop' 
Error improvement for email_invite endpoint

See merge request pleroma/pleroma!2344
 2020-04-09 10:42:43 +00:00
Alexander Strizhakov 9795ff5b01 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:50 +00:00
Alexander Strizhakov 365c34a7a9 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:44 +00:00
lain d2e21fbc96 Merge branch 'open-api' into 'develop' 
Add OpenAPI

Closes pleroma-meta#19

See merge request pleroma/pleroma!2345
 2020-04-09 09:48:56 +00:00
rinpatch d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation 
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
 2020-04-08 22:58:31 +03:00
lain 3775683a04 ChatMessage: Basic incoming handling. 2020-04-08 15:55:43 +02:00
rinpatch dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop' 
Use Pleroma.Formatter.linkify/2 instead

See merge request pleroma/pleroma!2352
 2020-04-07 11:41:10 +00:00
Maksim Pechnikov 2b7d7bbd2d Merge branch 'develop' into issue/1276 2020-04-07 14:09:43 +03:00
kPherox 06471940e0 Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs 2020-04-07 08:44:53 +00:00
lain 19335be24c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-06 17:50:31 +02:00
lain 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop' 
Add emoji reactions to features in nodeinfo

See merge request pleroma/pleroma!2313
 2020-04-06 12:51:35 +00:00
lain 96ee0aadbf Merge branch 'improving-test-coverage' into 'develop' 
Tests for emoji mix task

See merge request pleroma/pleroma!2350
 2020-04-06 12:49:17 +00:00
lain 349b9d86dc Merge branch 'remake-remodel-2' into 'develop' 
Ingestion Pipeline Revamp

See merge request pleroma/pleroma!2315
 2020-04-06 11:59:01 +00:00
Alexander Strizhakov a43e055916
using another fn for file deletion 2020-04-06 14:27:20 +03:00
Alexander Strizhakov b59ac37b2c
tests for emoji mix task 2020-04-06 11:13:59 +03:00
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses 
# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex
 2020-04-02 19:38:39 +03:00
Ivan Tashkinov aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests. 2020-04-02 19:23:30 +03:00
lain fd97b0e634 Chats: Basic implementation. 2020-04-02 15:19:09 +02:00
Maksim Pechnikov dbcfac11b4 Merge branch 'develop' into issue/1276 2020-04-02 14:47:17 +03:00
Egor Kislitsyn 23219e6fb3
Add OpenAPI 2020-04-01 23:13:08 +04:00
Alexander Strizhakov 2d64500a9d
error improvement for email_invite endpoint 2020-04-01 20:26:33 +03:00
Ivan Tashkinov 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 
# Conflicts:
#	CHANGELOG.md
 2020-04-01 20:08:14 +03:00
feld ef7d2b0f11 Merge branch 'gun' into 'develop' 
Gun adapter

Closes #945

See merge request pleroma/pleroma!1861
 2020-04-01 17:05:09 +00:00
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. 
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
 2020-04-01 19:49:09 +03:00
rinpatch bfec45bf74 Merge branch 'fix/1601-add-new-meta-tag' into 'develop' 
Restrict remote users from indexing

Closes #1601

See merge request pleroma/pleroma!2341
 2020-04-01 12:55:52 +00:00
Alexander Strizhakov 94ddbe4098
restrict remote users from indexing 2020-04-01 09:57:12 +03:00