Haelwenn
|
77c4c60e55
|
Merge branch 'prometheus-update' into 'develop'
prometheus update for OTP 23
See merge request pleroma/pleroma!2746
|
2020-07-10 08:27:41 +00:00 |
|
Alexander Strizhakov
|
b6688030fa
|
prometheus update for OTP 23
|
2020-07-10 10:35:59 +03:00 |
|
Alexander Strizhakov
|
b1b8f5f11a
|
docs and descriptions for s3 settings
|
2020-07-10 09:16:53 +03:00 |
|
Angelina Filippova
|
ac9f18de11
|
Update type for :replace settings
|
2020-07-10 03:32:53 +03:00 |
|
Angelina Filippova
|
6b9210e886
|
Update type for :groups setting
|
2020-07-10 03:07:55 +03:00 |
|
stwf
|
08211eff22
|
Re-enable the federated tests, increase timeout
|
2020-07-09 13:49:30 -04:00 |
|
|
|
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
|
2020-07-09 17:23:15 +00:00 |
|
Haelwenn (lanodan) Monnier
|
cc7153cd82
|
user: Add support for custom emojis in profile fields
|
2020-07-09 19:21:58 +02:00 |
|
Mark Felder
|
2b979cc90c
|
Add AdminFE reports URL to report emails
|
2020-07-09 11:55:40 -05:00 |
|
Alexander Strizhakov
|
79707e879d
|
cleap up
|
2020-07-09 19:13:16 +03:00 |
|
|
|
4db6678429
|
Merge branch 'chore/use-the-alias' into 'develop'
Use the Pleroma.Config alias
See merge request pleroma/pleroma!2740
|
2020-07-09 16:08:34 +00:00 |
|
Alexander Strizhakov
|
d5fcec8315
|
fix for info after tag/untag user
|
2020-07-09 18:59:48 +03:00 |
|
Alexander Strizhakov
|
c2edfd16e0
|
fix for user revoke invite task
|
2020-07-09 18:59:15 +03:00 |
|
Mark Felder
|
d23804f191
|
Use the Pleroma.Config alias
|
2020-07-09 10:53:51 -05:00 |
|
|
|
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
|
2020-07-09 14:33:24 +00:00 |
|
Mark Felder
|
49c4e24953
|
Merge branch 'develop' into fix/csp-for-captcha
|
2020-07-09 09:08:59 -05:00 |
|
lain
|
8ca1f3e8c6
|
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
|
2020-07-09 13:10:05 +00:00 |
|
lain
|
f4469dc741
|
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
|
2020-07-09 13:09:31 +00:00 |
|
Haelwenn
|
bdc7b60610
|
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
|
2020-07-09 12:10:26 +00:00 |
|
eugenijm
|
c2be0da79f
|
Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated
|
2020-07-09 14:57:40 +03:00 |
|
Haelwenn
|
68036f5a3b
|
Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
|
2020-07-09 10:32:24 +00:00 |
|
Haelwenn
|
34d6009d82
|
Merge branch 'patch-2' into 'develop'
fix wide2x emojis within nicknames
See merge request pleroma/pleroma!2737
|
2020-07-09 09:50:08 +00:00 |
|
lain
|
393a588265
|
Merge branch 'patch-1' into 'develop'
added link to changelog, removed repetition
See merge request pleroma/pleroma!2736
|
2020-07-09 09:42:39 +00:00 |
|
lain
|
6d688f14fa
|
Merge branch 'bugfix/status-deletion' into 'develop'
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
|
2020-07-09 09:37:52 +00:00 |
|
Dym Sohin
|
ab773fa5c9
|
[static-fe] limit according to- and within- existing ruleset
|
2020-07-09 09:37:50 +00:00 |
|
lain
|
8be0c04b40
|
Merge branch 'issue/1880' into 'develop'
[#1880] fixed delete `Like` activity in remove user
See merge request pleroma/pleroma!2725
|
2020-07-09 09:31:15 +00:00 |
|
lain
|
8594181597
|
Update static-fe.css
|
2020-07-09 09:30:15 +00:00 |
|
lain
|
6854c5ba2f
|
Merge branch 'patch-3' into 'develop'
missed `:` (colon) before mrf_steal_emoji
See merge request pleroma/pleroma!2738
|
2020-07-09 09:25:10 +00:00 |
|
Dym Sohin
|
6465257e1f
|
missed : (colon) before mrf_steal_emoji
|
2020-07-09 09:23:21 +00:00 |
|
Dym Sohin
|
8eecc708ef
|
fix wide2x emojis within nicknames
|
2020-07-09 09:03:24 +00:00 |
|
Alexander Strizhakov
|
4cbafcef0c
|
load default config in mix tasks
|
2020-07-09 11:17:43 +03:00 |
|
Maksim Pechnikov
|
31259cabcc
|
fix test
|
2020-07-09 07:16:52 +03:00 |
|
Dym Sohin
|
6e54972252
|
added link to changelog, removed repetition
|
2020-07-09 03:15:51 +00:00 |
|
Angelina Filippova
|
33e6285636
|
Update types for :headers and :options settings in MediaProxy Invalidation group
|
2020-07-09 01:33:23 +03:00 |
|
Ivan Tashkinov
|
123352ffa1
|
Removed unused trigram index on users. Fixed users_fts_index usage.
|
2020-07-08 22:50:15 +03:00 |
|
stwf
|
af9eb7a2b1
|
re-enable federation tests
|
2020-07-08 11:32:04 -04:00 |
|
lain
|
00e54f8fe7
|
ActivityPub: Remove follow and fix issues.
|
2020-07-08 17:07:24 +02:00 |
|
lain
|
9dda8b5427
|
CommonAPI: Switch to pipeline for following.
|
2020-07-08 15:40:56 +02:00 |
|
Alexander Strizhakov
|
b28cc15459
|
don't restart pleroma in mix tasks
|
2020-07-08 15:58:47 +03:00 |
|
Alexander Strizhakov
|
72ad3a66f4
|
don't fully start pleroma in mix tasks
|
2020-07-08 15:58:47 +03:00 |
|
lain
|
172f4aff8e
|
Transmogrifier: Move following to the pipeline.
|
2020-07-08 14:30:53 +02:00 |
|
lain
|
29fa75d00d
|
Notification: For follows, notify the followed.
|
2020-07-08 14:29:29 +02:00 |
|
lain
|
7d0e2b3fdd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
|
2020-07-08 13:23:07 +02:00 |
|
lain
|
cdc153db31
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
|
2020-07-08 13:21:58 +02:00 |
|
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
|
2020-07-08 10:55:03 +00:00 |
|
Ivan Tashkinov
|
704a383055
|
Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
|
2020-07-08 13:14:18 +03:00 |
|
Ivan Tashkinov
|
a6495f4a68
|
[#1895] credo fix.
|
2020-07-08 12:54:23 +03:00 |
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
2020-07-08 11:52:29 +02:00 |
|
Ivan Tashkinov
|
3f8370a285
|
[#1895] Applied code review suggestion.
|
2020-07-08 12:36:44 +03:00 |
|
Maksim Pechnikov
|
e341f81785
|
fixed delete Like activity in remove user
|
2020-07-08 09:06:23 +03:00 |
|
