fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-23 01:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
7312 commits 27 branches 108 tags 316 MiB
Commit graph

474 commits

Author SHA1 Message Date
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
 2019-10-20 20:43:18 +03:00
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User. 
Misc. fixes / improvements.
 2019-10-20 13:42:42 +03:00
Ariadne Conill 34754938ba add missing migration to drop websub table 2019-10-20 10:39:03 +00:00
Ariadne Conill c9280b9730 rework to use properties instead of compound typing, per SocialCG 2019-10-19 23:21:37 +00:00
rinpatch 39e996528c Fix a migration wiping user info of users that don't have any mutes 
And introduce safe_jsonb_set
 2019-10-18 15:22:07 +03:00
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers 2019-10-17 15:26:59 +03:00
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
rinpatch 32808208be Enable mix format for migrations 2019-10-08 15:16:39 +03:00
rinpatch a502155274 Bump pleroma-fe bundle to 122323f35c 2019-10-07 17:42:33 +03:00
Ariadne Conill 19962d2022 clean up bundled litepub schema (closes #1303) 2019-10-07 11:33:58 +00:00
rinpatch ee88afb2e2 Fix muted notification migration only working with a schema 
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
 2019-10-06 18:06:04 +03:00
rinpatch 125f96e706 Fix the use of queries with a schema in a migration 2019-10-06 17:23:43 +03:00
rinpatch fefbd31c6e Move local keys out of user.info 2019-10-06 16:56:36 +03:00
eugenijm 8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
Mark Felder a562cb2c34 Update AdminFE bundle 2019-10-01 18:29:39 -05:00
Ariadne Conill 28be12b38e update admin fe 2019-09-30 12:52:28 +00:00
kaniini 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop' 
AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706
 2019-09-30 11:21:49 +00:00
rinpatch 1fba66178d Merge branch 'develop' into cleanup/drop-subscription-table-if-exists 2019-09-30 00:26:49 +03:00
rinpatch 81b4243173 Remove subscription_notifications table if it existed 
Followup to !1741
 2019-09-29 23:52:40 +03:00
rinpatch e9d1aa75d5 Revert subscription refactoring. 
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
 2019-09-29 18:43:27 +03:00
Roman Chvanikov b4b147000c Merge develop 2019-09-26 10:38:54 +03:00
Hakaba Hitoyo 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context" 
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
 2019-09-26 02:57:41 +00:00
Haelwenn (lanodan) Monnier 5820dc40fc
litepub-0.1.jsonld: Add uploadMedia 2019-09-24 19:00:31 +02:00
Haelwenn (lanodan) Monnier 646bf01608
Update AdminFE bundle 2019-09-23 21:13:39 +02:00
rinpatch a21584556f Update oban to 0.8.1 
This version uses a different locking mechanism, which gets rid of
`WARNING:  you don't own a lock of type ShareLock` log spam
 2019-09-17 13:04:43 +03:00
Roman Chvanikov 76c3e290fc Merge develop 2019-09-16 20:30:42 +03:00
kaniini 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop' 
Track signed fetches of objects and use them for delete federation

See merge request pleroma/pleroma!1661
 2019-09-16 07:39:58 +00:00
rinpatch ac4a748fad Disallow NULLs in deliveries 2019-09-13 19:28:35 +03:00
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications 2019-09-13 18:25:27 +03:00
rinpatch 769fb778d4 Track object/create activity fetches 2019-09-12 21:37:36 +03:00
Ivan Tashkinov ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs
 2019-09-06 13:26:05 +03:00
rinpatch 16e6be340d Update frontend bundle to e75ac9dd 2019-09-06 11:31:44 +03:00
Ivan Tashkinov e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	config/config.exs
 2019-08-31 14:25:43 +03:00
Maxim Filippov 37dd3867bb Log admin/moderator actions 2019-08-25 19:39:37 +00:00
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
Ivan Tashkinov c34126f89c Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-24 09:29:54 +03:00
rinpatch 05e7d0a438 Add an index on object likes 
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
 2019-08-23 03:17:20 +03:00
Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs
 2019-08-22 20:59:58 +03:00
Ivan Tashkinov 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
lain 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
Mark Felder 24a731a9a6 Update AdminFE 
Now permits server configuration. Consider this ALPHA.
 2019-08-12 15:00:03 -05:00
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
lain 29807ef6a5 Merge branch 'feature/digest-email' into 'develop' 
Feature/digest email

See merge request pleroma/pleroma!1078
 2019-08-08 14:38:33 +00:00
lain a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
Hakaba Hitoyo 39c7bbe18f Remove longfox emoji set 2019-08-04 04:32:45 +00:00
lain f88560accd Conversations: Add recipient list to conversation participation. 
This enables to address the same group of people every time.
 2019-08-02 11:55:41 +02:00
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries. 2019-08-01 17:28:00 +03:00
Mike Verdone 666514194a Add activity expirations table 
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
 2019-07-24 13:14:52 +02:00
Roman Chvanikov 9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
Egor Kislitsyn 04f18a144b Add listMessage to to the JSON-LD context 2019-07-15 14:29:13 +07:00
Egor Kislitsyn 64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
Roman Chvanikov c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Alexander Strizhakov e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
Roman Chvanikov eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Egor Kislitsyn 182f7bbb11 Merge branch 'develop' into feature/addressable-lists 2019-07-11 13:26:59 +07:00
Alex S 936050257d saving following_address for existing users 2019-07-10 17:42:18 +03:00
Alex S f8786fa6f2 adding following_address field to user 2019-07-10 17:42:18 +03:00
Egor Kislitsyn 406efb3688 Add Russian translation 2019-07-10 18:10:09 +07:00
Egor Kislitsyn 5104f65b69 Wrap error messages into gettext helpers 2019-07-10 18:10:09 +07:00
Sachin Joshi 6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-07-10 01:46:49 +05:45
Roman Chvanikov 371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
kaniini 4948117fcf Merge branch 'remove-swift' into 'develop' 
Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374
 2019-07-09 16:54:32 +00:00
Roman Chvanikov efefee8241 Split alters rather than work with indexes 2019-07-03 14:56:02 +03:00
Egor Kislitsyn 4f42093220 Remove Uploaders.Swift 2019-07-03 14:11:04 +07:00
Roman Chvanikov 291d95dcc3 Fix migration 2019-07-03 01:14:40 +03:00
Maksim 85c7916c94 [#1033] Fix database migrations 2019-07-01 01:08:07 +00:00
Roman Chvanikov 657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
lain efad26bbb9 Update frontend. 2019-06-28 14:29:26 +02:00
rinpatch cfb5be3ced Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop' 
Update mastofe to bundle-2019-06-26

See merge request pleroma/pleroma!1341
 2019-06-26 19:15:37 +00:00
Haelwenn (lanodan) Monnier 451931d36f
Update mastofe to bundle-2019-06-26 2019-06-26 21:06:28 +02:00
Mark Felder 7b9e21e8a2 Update adminFE to latest build 2019-06-23 18:36:20 -04:00
kaniini 8b7860f12f Merge branch 'admin-config' into 'develop' 
Admin config

See merge request pleroma/pleroma!1328
 2019-06-23 05:42:37 +00:00
Alex S 982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
rinpatch 3ac5ecbac1 Support RUM indexes in the config generator 2019-06-22 12:54:16 +03:00
rinpatch f4009b6706 Fallback to Config if Mix.Config does not exist, even if Config does not 
exist either

For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
 2019-06-22 02:29:49 +03:00
rinpatch 960d6b54e8 use Config in generated config when available 
Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that.
 2019-06-21 22:01:59 +03:00
rinpatch e76115989a Move config templates to priv so they can be found in releases 2019-06-21 19:54:04 +03:00
rinpatch 431a41b459 Update bundled pleroma-fe to c4fcdc71 2019-06-19 00:04:00 +03:00
Alexander Strizhakov c2ca1f22a2 it is changed in compile time 
we can't change module attributes and endpoint settings in runtime
 2019-06-14 15:45:05 +00:00
Sergey Suprunenko a7d956d383 Remove unused imports and aliases from migration 2019-06-10 13:20:37 +00:00
Roman Chvanikov 01fe5abad1 Resolve conflicts 2019-06-07 01:20:50 +03:00
Egor Kislitsyn 17004a0f1a Create index on activities.local 2019-06-05 16:37:43 +07:00
Roman Chvanikov b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +03:00
Egor Kislitsyn 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-04 16:28:23 +07:00
kaniini 94d12a79c4 Merge branch 'hotfix/add-in_reply_to_index' into 'develop' 
Add index on inReplyTo for objects

See merge request pleroma/pleroma!1240
 2019-06-04 05:38:13 +00:00
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
rinpatch cfc3c62b2f Add missing tag index on objects 
The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.
 2019-06-03 20:42:13 +03:00
rinpatch be56801dda Add index on inReplyTo for objects 
Fixes the performance of `get_existing_votes`
 2019-06-03 19:26:43 +03:00
Roman Chvanikov ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
William Pitcock 5fbbc57c1b add migration to add notification settings to user accounts 2019-05-25 07:25:13 +00:00
Egor Kislitsyn f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-24 21:05:57 +07:00
lain 022e6e4b44 RUM: Remove vacuum analyze from migration 
Can't be run in a trnasaction.
 2019-05-17 14:59:01 +02:00
Egor Kislitsyn 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-17 19:57:14 +07:00
Egor Kislitsyn f2936e0a07 Add ap_id to List 2019-05-17 19:56:37 +07:00
lain 412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index 2019-05-17 12:26:59 +02:00
Sergey Suprunenko e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
William Pitcock f3971cbde3 thread visibility function: fix use of no longer used author variable 2019-05-15 17:02:40 +00:00
William Pitcock 71fa7eeb6f thread visibility function: significantly improve efficiency 2019-05-15 16:54:14 +00:00
William Pitcock 12f45e2a89 update migration 2019-05-15 16:22:52 +00:00
William Pitcock 75ce6adcff migration: only care about Create activities 2019-05-15 15:54:10 +00:00