nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
10204 commits 2 branches 0 tags 272 MiB
Commit graph

714 commits

Author SHA1 Message Date
rinpatch 0ad89762a1 insert skeletons migration: fix for non-local locals 
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.

In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx

Closes #1746
 2020-05-09 22:07:35 +03:00
rinpatch d73e8b6b12 Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop' 
PleromaFE bundle dropping requirement for embedded account relationships

See merge request pleroma/pleroma!2494
 2020-05-09 15:30:39 +00:00
Mark Felder 6a291b1834 Restore deleted icons. No idea how this happened. 2020-05-08 14:22:49 -05:00
Ivan Tashkinov 0e1bda55e8 PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications. 
7a0e554daf
 2020-05-08 21:33:56 +03:00
lain 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
lain 205313e541 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 11:44:30 +02:00
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03:00
lain 8bed6ea922 User, Webfinger: Remove OStatus vestiges 
Mainly the `magic_key` field
 2020-05-05 09:25:09 +02:00
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03:00
rinpatch e55876409b Deactivate local users on deletion instead of deleting the record 
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.

Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.

Closes pleroma/pleroma#1687
 2020-05-02 19:05:13 +03:00
Ivan Tashkinov f1bba5c787 PleromaFE bundle supporting follow request notifications. 
5f90b6a384
 2020-05-02 14:37:40 +03:00
Haelwenn (lanodan) Monnier c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe 2020-05-02 08:28:42 +02:00
Ivan Tashkinov 57b31e79c2 Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (with_move). 2020-05-01 17:59:29 +03:00
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
Mark Felder 3ead44a9aa Update AdminFE build in preparation for the 2.0.3 release 2020-04-29 15:49:48 -05:00
lain 1d6338f2d3 Litepub: Add ChatMessage. 2020-04-22 12:52:39 +02:00
lain 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-20 12:37:17 +02:00
Haelwenn 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' 
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403
 2020-04-18 06:59:23 +00:00
Haelwenn d698ecef9b Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs 2020-04-17 22:48:40 +00:00
Haelwenn (lanodan) Monnier eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo 2020-04-17 23:57:22 +02:00
Mark Felder 24e0db6310 pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4 2020-04-17 13:22:25 -05:00
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02:00
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' 
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request pleroma/pleroma!2398
 2020-04-17 13:40:25 +00:00
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering 2020-04-17 14:32:15 +02:00
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop' 
Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
 2020-04-17 09:19:35 +00:00
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
Maksim Pechnikov 4b3b1fec4e added an endpoint for getting unread notification count 2020-04-15 21:19:43 +03: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
lain 7c060432fc Revert "Merge branch 'marker-update-fix' into 'develop'" 
This reverts merge request !2380
 2020-04-14 16:31:30 +00:00
lain d8b12ffd59 Marker update migration: Don't try to update virtual field. 2020-04-14 15:06:09 +02: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
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
Maksim Pechnikov ad92cef844 fix Oban migration 2020-04-10 21:27:50 +03:00
Haelwenn (lanodan) Monnier e89078ac2a
User: remove source_data 2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier 9172d719cc
profile emojis in User.emoji instead of source_data 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier 62656ab259
User: Move inbox & shared_inbox to own fields 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier 19eedb3d04
User: Move public_key from source_data to own field 2020-04-10 06:16:18 +02:00
lain 19335be24c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-06 17:50:31 +02: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
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
Maksim Pechnikov 591f7015d9 update Oban package 2020-04-02 09:34:11 +03:00
feld fd932b14a7 Merge branch 'update/adminfe-20200331' into 'develop' 
Update AdminFE build in preparation for Pleroma 2.0.2

See merge request pleroma/pleroma!2343
 2020-04-01 17:12:59 +00: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
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
Mark Felder 219d3aaa2d Update AdminFE build in preparation for Pleroma 2.0.2 2020-03-31 13:05:16 -05:00
Ivan Tashkinov ea9c57b26e [#2332] Misc. improvements per code change requests. 2020-03-31 09:21:42 +03:00
Ivan Tashkinov 9c94b6a327 [#2332] Misc. fixes per code change requests. 2020-03-30 19:08:37 +03:00
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276 2020-03-29 06:57:34 +03:00
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.). 2020-03-28 18:49:03 +03:00
lain 0adaab8e75 Bump copyright dates. 2020-03-26 15:37:42 +01:00
Egor Kislitsyn 5a34dca8ed
Add emoji support in statuses in staticfe 2020-03-23 14:03:31 +04:00
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task 2020-03-23 10:44:47 +03:00
Egor Kislitsyn cb8236cda6
Add embeddable posts 2020-03-20 21:46:26 +04:00
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
rinpatch e87a32bcd7 rip out fetch_initial_posts 
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
 2020-03-15 15:59:17 +03:00
Mark Felder 2966377cb9 Update AdminFE 2020-03-13 21:55:08 +03:00
Alexander Strizhakov 39ed608b13
Merge branch 'develop' into gun 2020-03-12 18:31:10 +03:00
Haelwenn (lanodan) Monnier a747eb6df9
static-fe.css: Restore from before a65ee8ea 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
 2020-03-11 06:35:26 +01:00
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun 2020-03-09 10:56:33 +03:00
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276 2020-03-08 14:10:59 +03:00
rinpatch e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af 2020-03-07 18:18:43 +03:00
rinpatch 6cf1958b02 moderation log: fix improperly migrated data 
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.

Closes #1606
 2020-03-07 17:00:58 +03:00
feld 15d36b7f5f Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" 
This reverts merge request !2274
 2020-03-06 15:56:41 +00:00
Mark Felder e25bacabb1 Remove EmojiPacks from AdminFE build 
Once more, with feeling
 2020-03-06 09:54:38 -06:00
Mark Felder d283c9abc1 Remove emoji support from AdminFE 2020-03-06 07:53:33 -06:00
rinpatch a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd 2020-03-05 23:41:47 +03:00
Alexander Strizhakov 22d52f5691
same copyright date format 2020-03-04 09:41:23 +03:00
Haelwenn (lanodan) Monnier 2a850abbeb
MastoFE: Bundle 2020-01-20 2020-02-29 06:41:13 +01:00
Mark Felder bdd603e9f3 Merge branch 'develop' into update/pleroma-fe-20200228 2020-02-28 16:18:09 -06:00
Mark Felder c28de93912 Update PleromaFE bundle for the 2.0 release 2020-02-28 16:15:12 -06:00
Mark Felder 3d24a0917b Update AdminFE build 
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
 2020-02-28 12:32:44 -06:00
Mark Felder 554bc88e8a Update AdminFE build 2020-02-25 11:08:35 -06:00
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276 2020-02-25 07:22:56 +03:00
eugenijm 7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
lain 2d5cf0f8cd Migrations: Make them not fail for old databases 2020-02-20 16:44:31 +01:00
Mark Felder 6a97c1b9ff Update adminFE build 2020-02-17 15:50:45 -06:00
Maksim Pechnikov da44ee5b0f Merge branch 'develop' into issue/1276 2020-02-13 09:20:34 +03:00
Mark Felder f9eb35d48e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211 2020-02-11 10:33:41 -06:00
Mark Felder de0fea4634 Update AdminFE build 2020-02-11 10:24:38 -06:00
lain 60de311164 Update frontend 2020-02-11 13:59:04 +01:00
Maksim Pechnikov cd040691bd maked unread_count as virtual field 2020-02-10 09:01:45 +03:00
Maksim Pechnikov b87533760b Merge branch 'develop' into issue/1276 2020-02-10 07:59:52 +03:00
rinpatch f13b7878b4 Merge branch 'rename_emoji_reactios' into 'develop' 
EmojiReactions: Rename to EmojiReacts

See merge request pleroma/pleroma!2181
 2020-02-07 10:35:37 +00:00
Lain Soykaf 8a79f20c21 EmojiReactions: Rename to EmojiReacts 2020-02-06 18:09:57 +01:00
Mark Felder fed9b0d1e0 Update FE bundle 2020-02-06 10:59:41 -06:00
Maksim Pechnikov ba5e8a6444 Merge branch 'develop' into issue/1276 2020-01-28 21:11:13 +03:00
lain f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9 2020-01-28 18:39:02 +01:00
lain 6fab5fe7f8 Merge branch 'translation/errors-french' into 'develop' 
Translation/errors french

See merge request pleroma/pleroma!1457
 2020-01-28 13:26:28 +00:00
Maksim Pechnikov e442ea5722 Merge branch 'develop' into issue/1276 2020-01-27 15:20:47 +03:00
feld be27777156 Merge branch 'admin-be' into 'develop' 
Config api for admin-fe

Closes #1406

See merge request pleroma/pleroma!1976
 2020-01-22 17:13:17 +00:00
Haelwenn (lanodan) Monnier bd3f3756fb
Update MastoFE bundle to 2020-01-22 2020-01-22 16:00:23 +01:00
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be 2020-01-22 11:22:31 +03:00