lain
|
48f98a2748
|
Merge branch 'mix-tasks-improvement' into 'develop'
Mix tasks improvement
See merge request pleroma/pleroma!2723
|
4 years ago |
|
lain
|
4d809144d8
|
Merge branch 'cluster-test-ci' into 'develop'
RE-enable cluster tests on CI
See merge request pleroma/pleroma!2743
|
4 years ago |
|
Haelwenn
|
5ea6387572
|
Merge branch 'user-search-nickname-rank-boost' into 'develop'
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
|
4 years ago |
|
Haelwenn
|
8743df5193
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2739
|
4 years ago |
|
Ben Is
|
b6de9b1987
|
Translated using Weblate (Italian)
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
|
4 years ago |
|
Ben Is
|
11c9654a32
|
Translated using Weblate (Polish)
Currently translated at 66.0% (70 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
|
4 years ago |
|
Haelwenn
|
77c4c60e55
|
Merge branch 'prometheus-update' into 'develop'
prometheus update for OTP 23
See merge request pleroma/pleroma!2746
|
4 years ago |
|
Alexander Strizhakov
|
b6688030fa
|
prometheus update for OTP 23
|
4 years ago |
|
stwf
|
08211eff22
|
Re-enable the federated tests, increase timeout
|
4 years ago |
|
feld
|
4301ae3861
|
Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'
Add AdminFE reports URL to report emails
Closes #1926
See merge request pleroma/pleroma!2742
|
4 years ago |
|
Mark Felder
|
2b979cc90c
|
Add AdminFE reports URL to report emails
|
4 years ago |
|
Alexander Strizhakov
|
79707e879d
|
cleap up
|
4 years ago |
|
feld
|
4db6678429
|
Merge branch 'chore/use-the-alias' into 'develop'
Use the Pleroma.Config alias
See merge request pleroma/pleroma!2740
|
4 years ago |
|
Alexander Strizhakov
|
d5fcec8315
|
fix for info after tag/untag user
|
4 years ago |
|
Alexander Strizhakov
|
c2edfd16e0
|
fix for user revoke invite task
|
4 years ago |
|
Mark Felder
|
d23804f191
|
Use the Pleroma.Config alias
|
4 years ago |
|
feld
|
6b14f0c514
|
Merge branch 'fix/csp-for-captcha' into 'develop'
Add Captcha endpoint to CSP headers when MediaProxy is enabled.
See merge request pleroma/pleroma!2718
|
4 years ago |
|
Mark Felder
|
49c4e24953
|
Merge branch 'develop' into fix/csp-for-captcha
|
4 years ago |
|
lain
|
8ca1f3e8c6
|
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
|
4 years ago |
|
lain
|
f4469dc741
|
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
|
4 years ago |
|
Haelwenn
|
bdc7b60610
|
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
|
4 years ago |
|
Haelwenn
|
68036f5a3b
|
Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
|
4 years ago |
|
Haelwenn
|
34d6009d82
|
Merge branch 'patch-2' into 'develop'
fix wide2x emojis within nicknames
See merge request pleroma/pleroma!2737
|
4 years ago |
|
lain
|
393a588265
|
Merge branch 'patch-1' into 'develop'
added link to changelog, removed repetition
See merge request pleroma/pleroma!2736
|
4 years ago |
|
lain
|
6d688f14fa
|
Merge branch 'bugfix/status-deletion' into 'develop'
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
|
4 years ago |
|
Dym Sohin
|
ab773fa5c9
|
[static-fe] limit according to- and within- existing ruleset
|
4 years ago |
|
lain
|
8be0c04b40
|
Merge branch 'issue/1880' into 'develop'
[#1880] fixed delete `Like` activity in remove user
See merge request pleroma/pleroma!2725
|
4 years ago |
|
lain
|
8594181597
|
Update static-fe.css
|
4 years ago |
|
lain
|
6854c5ba2f
|
Merge branch 'patch-3' into 'develop'
missed `:` (colon) before mrf_steal_emoji
See merge request pleroma/pleroma!2738
|
4 years ago |
|
Dym Sohin
|
6465257e1f
|
missed `:` (colon) before mrf_steal_emoji
|
4 years ago |
|
Dym Sohin
|
8eecc708ef
|
fix wide2x emojis within nicknames
|
4 years ago |
|
Alexander Strizhakov
|
4cbafcef0c
|
load default config in mix tasks
|
4 years ago |
|
Maksim Pechnikov
|
31259cabcc
|
fix test
|
4 years ago |
|
Dym Sohin
|
6e54972252
|
added link to changelog, removed repetition
|
4 years ago |
|
Ivan Tashkinov
|
123352ffa1
|
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
|
4 years ago |
|
stwf
|
af9eb7a2b1
|
re-enable federation tests
|
4 years ago |
|
lain
|
00e54f8fe7
|
ActivityPub: Remove `follow` and fix issues.
|
4 years ago |
|
lain
|
9dda8b5427
|
CommonAPI: Switch to pipeline for following.
|
4 years ago |
|
Alexander Strizhakov
|
b28cc15459
|
don't restart pleroma in mix tasks
|
4 years ago |
|
Alexander Strizhakov
|
72ad3a66f4
|
don't fully start pleroma in mix tasks
|
4 years ago |
|
lain
|
172f4aff8e
|
Transmogrifier: Move following to the pipeline.
|
4 years ago |
|
lain
|
29fa75d00d
|
Notification: For follows, notify the followed.
|
4 years ago |
|
lain
|
7d0e2b3fdd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
|
4 years ago |
|
lain
|
cdc153db31
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
|
4 years ago |
|
lain
|
6335b32aa8
|
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
|
4 years ago |
|
Ivan Tashkinov
|
704a383055
|
Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
|
4 years ago |
|
Ivan Tashkinov
|
a6495f4a68
|
[#1895] credo fix.
|
4 years ago |
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
4 years ago |
|
Ivan Tashkinov
|
3f8370a285
|
[#1895] Applied code review suggestion.
|
4 years ago |
|
Maksim Pechnikov
|
e341f81785
|
fixed delete `Like` activity in remove user
|
4 years ago |
