hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into shigusegubu

Browse source 
* upstream/develop:
  review
  review
  Update emoji-input.js
  Misc fixes: Fix uploads stretching on chrome, fix warnings in console
  apply font smoothing in webkit and firefox
  fix user search
  Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js
  properly position the caret after replacement
  Apply suggestion to src/services/api/api.service.js
  fix MFA crashing on user-settings page
  fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
  getting and setting user background via MastoAPI
  Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
  fix small annoyance
  fixed some bugs i found, also cleaned up some stuff + documentation
  self-review
  Linting
This commit is contained in:
Henry Jameson 2019-06-18 22:27:15 +03:00
commit cda2d6cb20
23 changed files with 214 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

1
static/config.json
View file

@ -9,7 +9,6 @@
"redirectRootLogin": "/main/friends",
"chatDisabled": false,
"showInstanceSpecificPanel": false,
"formattingOptionsEnabled": false,
"collapseMessageWithSubject": false,
"scopeCopy": true,
"subjectLineBehavior": "noop",