lain
aeacfb2479
Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
...
Synchronize PleromaFE settings
See merge request pleroma/pleroma!2532
4 years ago
lain
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Michał Sidor
0d074751b5
Translated using Weblate (Polish)
...
Currently translated at 61.3% (65 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
4 years ago
Michał Sidor
08f5e49395
Translated using Weblate (Polish)
...
Currently translated at 55.6% (59 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
4 years ago
Michał Sidor
c2e57f2981
Added translation using Weblate (Polish)
4 years ago
Mark Felder
3525400eb2
Sync FE static/config.json
4 years ago
Roman Chvanikov
8a383707ae
Merge develop
4 years ago
Ivan Tashkinov
74912dd9ee
PleromaFE bundle supporting `with_relationships` param.
...
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49
4 years ago
Haelwenn (lanodan) Monnier
5f5681282e
Translated using Weblate (French)
...
Currently translated at 100.0% (90 of 90 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
4 years ago
lain
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
2ead4e108a
Merge branch 'migration-fix-markers' into 'develop'
...
Markers migration: Fix migration for very large list of markers
See merge request pleroma/pleroma!2511
4 years ago
rinpatch
952c6b29a1
Gettext: remove english messages and update the pot file
...
Having an English file doesn't make any sense, since English
is the source language for error messages. Also Weblate complains about it
4 years ago
lain
f6aa0b4a07
Migration: Fix typo
4 years ago
lain
f71376e30e
Migration: Enum.chunk is deprecated.
4 years ago
lain
d8dd945a03
Markers migration: Fix migration for very large list of markers
4 years ago
lain
c272669909
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
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
4 years ago
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
4 years ago
Roman Chvanikov
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Roman Chvanikov
cbe383ae83
Update stats admin endpoint
4 years ago
Mark Felder
6a291b1834
Restore deleted icons. No idea how this happened.
4 years ago
Roman Chvanikov
0c2b09a9ba
Add migration for counter_cache table update
4 years ago
Ivan Tashkinov
0e1bda55e8
PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
...
7a0e554daf
4 years ago
lain
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
4 years ago
lain
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
lain
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
4 years ago
lain
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
4 years ago
lain
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
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
4 years ago
Ivan Tashkinov
f1bba5c787
PleromaFE bundle supporting follow request notifications.
...
5f90b6a384
4 years ago
Haelwenn (lanodan) Monnier
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
Ivan Tashkinov
57b31e79c2
Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Mark Felder
3ead44a9aa
Update AdminFE build in preparation for the 2.0.3 release
4 years ago
lain
1d6338f2d3
Litepub: Add ChatMessage.
4 years ago
lain
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
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
4 years ago
Haelwenn
d698ecef9b
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
4 years ago
Haelwenn (lanodan) Monnier
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
4 years ago
Mark Felder
24e0db6310
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
4 years ago
lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
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
4 years ago
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
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
4 years ago
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
4 years ago
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
5 years ago
lain
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
lain
7c060432fc
Revert "Merge branch 'marker-update-fix' into 'develop'"
...
This reverts merge request !2380
5 years ago
lain
d8b12ffd59
Marker update migration: Don't try to update virtual field.
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
Maksim Pechnikov
ad92cef844
fix Oban migration
5 years ago
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data
5 years ago
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field
5 years ago
lain
19335be24c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
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
5 years ago
lain
fd97b0e634
Chats: Basic implementation.
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
591f7015d9
update Oban package
5 years ago
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
5 years ago
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
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.
5 years ago
Mark Felder
219d3aaa2d
Update AdminFE build in preparation for Pleroma 2.0.2
5 years ago
Ivan Tashkinov
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
5 years ago
Ivan Tashkinov
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
5 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
lain
0adaab8e75
Bump copyright dates.
5 years ago
Egor Kislitsyn
5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Egor Kislitsyn
cb8236cda6
Add embeddable posts
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago
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
5 years ago
Mark Felder
2966377cb9
Update AdminFE
5 years ago
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier
a747eb6df9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
5 years ago
Alexander Strizhakov
d9f8941dac
Merge branch 'develop' into gun
5 years ago
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
rinpatch
e7c49d51d7
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
5 years ago
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
5 years ago
feld
15d36b7f5f
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
...
This reverts merge request !2274
5 years ago
Mark Felder
e25bacabb1
Remove EmojiPacks from AdminFE build
...
Once more, with feeling
5 years ago
Mark Felder
d283c9abc1
Remove emoji support from AdminFE
5 years ago
rinpatch
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
Alexander Strizhakov
22d52f5691
same copyright date format
5 years ago
Haelwenn (lanodan) Monnier
2a850abbeb
MastoFE: Bundle 2020-01-20
5 years ago
Mark Felder
bdd603e9f3
Merge branch 'develop' into update/pleroma-fe-20200228
5 years ago
Mark Felder
c28de93912
Update PleromaFE bundle for the 2.0 release
5 years ago
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
5 years ago
Mark Felder
554bc88e8a
Update AdminFE build
5 years ago
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago