* develop:
small fix
Made showing format selection optional and default to false
Fix mistakes
Change styles a bit, make pre-formatted blocks not overflow but scroll
Add styles for h1/2/3/4/5 tags in status html
post status form: styling fixes for content-type selector, align icons with selector
Pass user id to fetchFriends
i18n: make "plain text" translatable
add the ability to select a post's content type
fix
Add titles to source/expand buttons
Add titles to post visibility icons
* polish:
added option for logo in navbar to follow color scheme of the rest of the site also fixed potential mess-up between api/static configs
i18n: make "plain text" translatable
add the ability to select a post's content type
* upstream/develop:
Rename expandCW to collapseMessageWithSubject.
fix indent
Add support for configurable CW clickthrough.
Merge upstream
fix lint issues
allow default visibility scope to be configured
Add validation of the imported theme and the corresponding warning message
Unify button styles and use min-width
Add German localization for theme import/export
Add theme import feature
Refactor theme settings state initialization
Add theme export feature
* fixes-and-tweaks:
fixes hella ton of annoyances with file upload display
using custom ascend value as suggested here: https://github.com/fontello/fontello/issues/513#issuecomment-237551101 helped.
disable hinting because it breaks alignment on some icons (namely - locks)
fix for timeago being ass when post has replies. added hover colors for clickable icons on the right side. Reverted line-height to its original value
Configurable video looping, option to not to loop silent videos. Updated localization strings.
added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
Made pausing TL updating configurable. Added styles for disabled checkboxes. Shuffled settings a bit b/c all the settings are in "Attachments" section depsite the fact not all of them are attachments-related.
storing entire config instead of each separate thing of it, so that future options won't be lost during reloads because developer forgot to update that list of settings to be persisted
fix potential stretched spurdo
fixed custom emoji in nickname. changed icons on right side to be more streamlined. adjusted CSS so that all text in header of post is on same baseline and all icons/images are middle-aligned.