FloatingGhost
|
0d012ebea1
|
Revert "Merge branch 'remove/mastofe' into 'develop'"
This reverts commit 6b3842cf50 , reversing
changes made to 6b1282a829 .
|
2022-01-08 21:44:37 +00:00 |
|
Ivan Tashkinov
|
a7bdefc208
|
mix format
|
2021-12-29 11:44:33 +03:00 |
|
Ivan Tashkinov
|
0c7fb520bf
|
Added index on [:target_id, :relationship_type] to :user_relationships (speeds up Notification.exclude_blockers/_ ).
|
2021-12-29 11:41:21 +03:00 |
|
Alex Gleason
|
fa35e24a5e
|
Apps: add user_id index
|
2021-12-27 18:05:35 -06:00 |
|
Alex Gleason
|
f5c3d45120
|
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
|
2021-12-27 18:01:25 -06:00 |
|
marcin mikołajczak
|
de006443f0
|
MastoAPI: Profile directory
|
2021-12-26 02:35:17 +00:00 |
|
Alex Gleason
|
73609211a4
|
Merge branch 'account-notes' into 'develop'
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
|
2021-12-25 01:41:12 +00:00 |
|
Alex Gleason
|
1ff9ffed83
|
Merge branch 'live-dashboard' into 'develop'
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
|
2021-12-19 17:35:14 +00:00 |
|
Alex Gleason
|
bd853199d9
|
Merge branch 'v2-suggestions' into 'develop'
V2 suggestions
See merge request pleroma/pleroma!3547
|
2021-12-19 17:31:17 +00:00 |
|
Alex Gleason
|
e1b89fe3aa
|
Merge remote-tracking branch 'origin/develop' into live-dashboard
|
2021-12-15 19:05:36 -05:00 |
|
Alex Gleason
|
29d80b39f2
|
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
|
2021-12-15 19:05:27 -05:00 |
|
NEETzsche
|
182c563ed0
|
Force pinned_objects to be empty, not null
|
2021-11-29 18:08:09 +00:00 |
|
Alex Gleason
|
da06e1a17f
|
v2 Suggestions: add index on is_suggested column
|
2021-11-26 15:32:01 -06:00 |
|
Alex Gleason
|
b17360cd7c
|
v2 Suggestions: rudimentary API response
|
2021-11-26 14:34:10 -06:00 |
|
marcin mikołajczak
|
8e040e098b
|
Lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 18:17:06 +01:00 |
|
marcin mikołajczak
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
|
Ryo Ueno
|
5f2aefee1b
|
Translated using Weblate (Japanese)
Currently translated at 21.6% (23 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/
|
2021-10-06 06:12:17 +00:00 |
|
Ryo Ueno
|
84a7eb5597
|
Added translation using Weblate (Japanese)
|
2021-10-06 06:12:17 +00:00 |
|
Hồ Nhất Duy
|
a84aa10f70
|
Translated using Weblate (Vietnamese)
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/vi/
|
2021-10-06 06:12:17 +00:00 |
|
Hồ Nhất Duy
|
3647c8e45b
|
Added translation using Weblate (Vietnamese)
|
2021-10-06 06:12:17 +00:00 |
|
@liimee
|
a3909f30b6
|
Translated using Weblate (Indonesian)
Currently translated at 64.1% (68 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
|
2021-10-06 06:12:17 +00:00 |
|
@liimee
|
f0d0d4f6e4
|
Translated using Weblate (Indonesian)
Currently translated at 61.3% (65 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
|
2021-10-06 06:12:17 +00:00 |
|
@liimee
|
f2806adeed
|
Translated using Weblate (Indonesian)
Currently translated at 59.4% (63 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
|
2021-10-06 06:12:17 +00:00 |
|
@liimee
|
4a15fd8a0a
|
Translated using Weblate (Indonesian)
Currently translated at 55.6% (59 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
|
2021-10-06 06:12:17 +00:00 |
|
@liimee
|
bea8a204a9
|
Translated using Weblate (Indonesian)
Currently translated at 50.9% (54 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
|
2021-10-06 06:12:17 +00:00 |
|
@liimee
|
e00fe5b616
|
Translated using Weblate (Indonesian)
Currently translated at 4.7% (5 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
|
2021-10-06 06:12:17 +00:00 |
|
@liimee
|
477d839444
|
Added translation using Weblate (Indonesian)
|
2021-10-06 06:12:17 +00:00 |
|
marcin mikołajczak
|
8467065aba
|
Translated using Weblate (Polish)
Currently translated at 100.0% (104 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
|
2021-10-06 06:12:17 +00:00 |
|
Haelwenn (lanodan) Monnier
|
a17910a6c6
|
CI: Bump lint stage to elixir-1.12
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
|
2021-10-06 08:11:05 +02:00 |
|
Haelwenn
|
6b3842cf50
|
Merge branch 'remove/mastofe' into 'develop'
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
|
2021-09-07 16:41:53 +00:00 |
|
Sean King
|
6519732045
|
GET /api/v1/apps endpoint
|
2021-08-25 21:01:04 -06:00 |
|
marcin mikołajczak
|
edd2a38e53
|
Translated using Weblate (Polish)
Currently translated at 98.0% (102 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
|
2021-08-13 15:42:21 +00:00 |
|
marcin mikołajczak
|
7a9113deb1
|
Translated using Weblate (Polish)
Currently translated at 75.0% (78 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
|
2021-08-13 15:42:21 +00:00 |
|
Haelwenn
|
901204df22
|
Merge branch 'poll-notification' into 'develop'
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
|
2021-08-09 10:02:37 +00:00 |
|
Haelwenn
|
6384d78035
|
Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma!3314
|
2021-08-09 09:37:59 +00:00 |
|
Haelwenn (lanodan) Monnier
|
0910777d41
|
Update PleromaFE Bundle (2.4.0)
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
|
2021-08-08 15:21:21 +02:00 |
|
Ilja
|
1f52246a02
|
Add database migrations
* SimplePolicy
* quarentine
* transparency_exclusions
|
2021-08-06 07:59:53 +02:00 |
|
Haelwenn (lanodan) Monnier
|
5f8a9b671f
|
Update AdminFE bundle
|
2021-08-01 08:26:39 +02:00 |
|
Alex Gleason
|
62bf6d67e3
|
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
|
2021-07-18 11:49:22 -05:00 |
|
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
2021-07-17 22:19:38 -05:00 |
|
Sean King
|
5d279a22b1
|
Merge develop branch upstream
|
2021-07-10 11:04:16 -06:00 |
|
feld
|
84f42b92f0
|
Merge branch 'develop' into 'fix/prune-hashtags'
# Conflicts:
# CHANGELOG.md
|
2021-06-07 20:06:36 +00:00 |
|
Sean King
|
dc4814f0cd
|
Fix merge conflicts with upstream
|
2021-06-04 14:42:44 -06:00 |
|
Roman Chvanikov
|
e0bb655773
|
Add RenameInstanceChat migration
|
2021-06-01 11:49:47 -05:00 |
|
Snow
|
2fde1f2549
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 5.6% (6 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/
|
2021-05-30 17:43:00 +00:00 |
|
Snow
|
b3209c31bc
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 0.9% (1 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/
|
2021-05-30 17:43:00 +00:00 |
|
Snow
|
0107ec63a2
|
Added translation using Weblate (Chinese (Traditional))
|
2021-05-30 17:43:00 +00:00 |
|
faried nawaz
|
22b2451edd
|
migration: add on_delete: :delete_all to hashtags object_id fk
|
2021-05-08 02:00:34 +05:00 |
|
Alex Gleason
|
52fc59f125
|
Merge remote-tracking branch 'upstream/develop' into earmark
|
2021-04-30 13:17:03 -05:00 |
|
Sean King
|
2de41770d0
|
Remove Twemoji stuff from MastoFE
|
2021-04-16 18:02:08 -06:00 |
|