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

Browse source

* upstream/develop: (33 commits)
  #383: content type error
  #376: update status timeline when it's empty
  #377: no exteral profile link for local users
  #371: show notification when user setting's saved
  Clean up CSS a bit
  #364: update ap_id error with username
  Rename: instanceSpecificPanelPresent
  Hide isp option if instance has panel disabled
  Take over branch and fix some issues
  Fix lint errors
  Better error handling
  Remove cropped image size restriction
  Remove modal component
  Make embedded image cropper
  Revert eslintrc changes
  Check if variable exists before using
  Remove event listeners when destory ImageCropper
  Localization of ImageCropper component
  Remove event listener when modal is destroyed
  Crop avatar image using minWidth/minHeight
  ...

...

This commit is contained in:

Henry Jameson 2019-02-21 19:32:49 +02:00

parent 59196e1dd9 c3fa2c90e2

commit 90a82b7dec

33 changed files with 490 additions and 1214 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

static/bg2.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 224 KiB

BIN

static/bgalt.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 323 KiB