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: (108 commits)
  Update user settings text: staff badges are only visible in user profile
  Fix naming
  Show back followees/followers counts
  Always show my own followees/followers
  Hide followers and followees tabs when they are disabled
  #137 - clean up emoji list
  #315 - revert changes
  #315 - separate export and fetch follows logic
  #137 - add red heart emoji
  Grammar
  Fix repeater html not showing properly
  #301 - add an option for default formatting
  #315 - clean up the request
  remove unnecessary div
  #315 - export all follows as CSV
  Make role badge visible only on user profile page
  Add theming support for admin/moderator badges
  Refactor visibleRole for better readability
  Allow to configure visibility for admin and moderator badges
  Add admin and moderator indicators to the user card
  ...
This commit is contained in:
Henry Jameson 2019-02-08 11:11:20 +02:00
commit 3f08301d6b
99 changed files with 3404 additions and 430 deletions
Download patch file Download diff file Expand all files Collapse all files

1
static/config.json
View file

@ -14,6 +14,7 @@
"collapseMessageWithSubject": false,
"scopeCopy": true,
"subjectLineBehavior": "noop",
"postContentType": "text/plain",
"alwaysShowSubjectInput": false,
"hidePostStats": false,
"hideUserStats": false,