Commits · 6b14f0c514d19fe7c9717dd9d3ada29e442ba706 · Alex Gleason / pleroma

Jul 09, 2020
- Merge branch 'fix/csp-for-captcha' into 'develop' · 6b14f0c5
  feld authored 4 years ago
  
  Add Captcha endpoint to CSP headers when MediaProxy is enabled. See merge request pleroma/pleroma!2718
  6b14f0c5
- Merge branch 'develop' into fix/csp-for-captcha · 49c4e249
  feld authored 4 years ago
  
  49c4e249
- Merge branch '1723-token-fixes' into 'develop' · 8ca1f3e8
  lain authored 4 years ago
  
  AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694
  8ca1f3e8
- Merge branch 'features/favicons' into 'develop' · f4469dc7
  lain authored 4 years ago
  
  Add support for remote favicons See merge request pleroma/pleroma!2261
  f4469dc7
- Merge branch '1925-muting-reblogs' into 'develop' · bdc7b606
  Haelwenn authored 4 years ago
  
  AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732
  bdc7b606
- Merge branch 'follow-pipeline' into 'develop' · 68036f5a
  Haelwenn authored 4 years ago
  
  Handle `Follow` activities with the pipeline See merge request pleroma/pleroma!2734
  68036f5a
- Merge branch 'patch-2' into 'develop' · 34d6009d
  Haelwenn authored 4 years ago
  
  fix wide2x emojis within nicknames See merge request pleroma/pleroma!2737
  34d6009d
- Merge branch 'patch-1' into 'develop' · 393a5882
  lain authored 4 years ago
  
  added link to changelog, removed repetition See merge request pleroma/pleroma!2736
  393a5882
- Merge branch 'bugfix/status-deletion' into 'develop' · 6d688f14
  lain authored 4 years ago
  
  #1920 fix activity deletion See merge request pleroma/pleroma!2721
  6d688f14
- [static-fe] limit according to- and within- existing ruleset · ab773fa5
  Dym Sohin authored 4 years ago
  
  ab773fa5
- Merge branch 'issue/1880' into 'develop' · 8be0c04b
  lain authored 4 years ago
  
  [#1880] fixed delete `Like` activity in remove user See merge request pleroma/pleroma!2725
  8be0c04b
- Update static-fe.css · 85941815
  lain authored 4 years ago
  
  85941815
- Merge branch 'patch-3' into 'develop' · 6854c5ba
  lain authored 4 years ago
  
  missed `:` (colon) before mrf_steal_emoji See merge request pleroma/pleroma!2738
  6854c5ba
- missed `:` (colon) before mrf_steal_emoji · 6465257e
  Dym Sohin authored 4 years ago
  
  6465257e
- fix wide2x emojis within nicknames · 8eecc708
  Dym Sohin authored 4 years ago
  
  8eecc708
- fix test · 31259cab
  Maksim authored 4 years ago
  
  31259cab
- added link to changelog, removed repetition · 6e549722
  Dym Sohin authored 4 years ago
  
  6e549722
Jul 08, 2020
- ActivityPub: Remove `follow` and fix issues. · 00e54f8f
  lain authored 4 years ago
  
  00e54f8f
- CommonAPI: Switch to pipeline for following. · 9dda8b54
  lain authored 4 years ago
  
  9dda8b54
- Transmogrifier: Move following to the pipeline. · 172f4aff
  lain authored 4 years ago
  
  172f4aff
- Notification: For follows, notify the followed. · 29fa75d0
  lain authored 4 years ago
  
  29fa75d0
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline · 7d0e2b3f
  lain authored 4 years ago
  
  7d0e2b3f
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880 · cdc153db
  lain authored 4 years ago
  
  cdc153db
- Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' · 6335b32a
  lain authored 4 years ago
  
  [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
  6335b32a
- [#1895] credo fix. · a6495f4a
  Ivan Tashkinov authored 4 years ago
  
  a6495f4a
- AccountController: Fix muting / unmuting reblogs. · c0385cf4
  lain authored 4 years ago
  
  c0385cf4
- [#1895] Applied code review suggestion. · 3f8370a2
  Ivan Tashkinov authored 4 years ago
  
  3f8370a2
- fixed delete `Like` activity in remove user · e341f817
  Maksim authored 4 years ago
  
  e341f817
- Add changelog and documentation · 31fef95e
  Haelwenn authored 4 years ago
  
  Verified
  
  31fef95e
- Add [:instances_favicons, :enabled] setting, defaults to false · 312fc55f
  Haelwenn authored 4 years ago
  
  Verified
  
  312fc55f
- instance: Prevent loop of updates · 8c9df2d2
  Haelwenn authored 4 years ago
  
  Verified
  
  8c9df2d2
- Use instances table instead of Cachex · 013e2c50
  Haelwenn authored 4 years ago
  
  Verified
  
  013e2c50
- Move get_favicon to Pleroma.Instances, use / · 6a679d80
  Haelwenn authored 5 years ago
  
  Verified
  
  6a679d80
- Add support for remote favicons · f6d09faf
  Haelwenn authored 5 years ago
  
  Verified
  
  f6d09faf
- Merge branch '1918-avatar-background-header-reset-2' into 'develop' · a8447c38
  Haelwenn authored 4 years ago
  
  Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729
  a8447c38
- Merge branch 'fix/twitter-rich-media-preview' into 'develop' · db13acf2
  Haelwenn authored 4 years ago
  
  Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags. Closes #1923 See merge request pleroma/pleroma!2730
  db13acf2
Jul 07, 2020
- Merge branch 'remove-twitter-api' into 'develop' · 8939ff39
  lain authored 4 years ago
  
  Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327
  8939ff39
- [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting. · 20461137
  Ivan Tashkinov authored 4 years ago
  
  20461137
- [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting. · 3e08e771
  Ivan Tashkinov authored 4 years ago
  
  3e08e771
- Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags. · 18438a9b
  feld authored 4 years ago
  
  18438a9b