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 |
|
feld
|
4db6678429
|
Merge branch 'chore/use-the-alias' into 'develop'
Use the Pleroma.Config alias
See merge request pleroma/pleroma!2740
|
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 |
|
Maksim Pechnikov
|
31259cabcc
|
fix test
|
4 years ago |
|
Dym Sohin
|
6e54972252
|
added link to changelog, removed repetition
|
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 |
|
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
|
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 |
|
Haelwenn (lanodan) Monnier
|
31fef95e35
|
Add changelog and documentation
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
312fc55f14
|
Add [:instances_favicons, :enabled] setting, defaults to false
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
8c9df2d2e6
|
instance: Prevent loop of updates
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
013e2c5057
|
Use instances table instead of Cachex
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
6a679d80c9
|
Move get_favicon to Pleroma.Instances, use /
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f6d09fafee
|
Add support for remote favicons
|
4 years ago |
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
4 years ago |
|
Haelwenn
|
db13acf242
|
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
|
4 years ago |
|
lain
|
8939ff39e4
|
Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
|
4 years ago |
|
Ivan Tashkinov
|
20461137a3
|
[#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
|
4 years ago |
|
Ivan Tashkinov
|
3e08e77151
|
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
|
4 years ago |
|
Mark Felder
|
18438a9bf0
|
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
|
4 years ago |
|
lain
|
4c9295adcc
|
Update frontend
|
4 years ago |
|
lain
|
92e6801c17
|
Changelog: Add info about avatar removal
|
4 years ago |
|
lain
|
c8dd973af5
|
AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
|
4 years ago |
|
lain
|
1adda637d3
|
Docs: Document resetting of images
|
4 years ago |
|
lain
|
59cf78e412
|
AccountController: Allow removal / reset of user images.
|
4 years ago |
|
lain
|
4b53499bdc
|
Merge branch 'develop' into 'develop'
added hyper:// to default protocols
See merge request pleroma/pleroma!2727
|
4 years ago |
