* upstream/develop: (37 commits)
Match users using startsWith instead of match.
Match emoji using startsWith instead of match.
remove-unused-settings
Preserve subject in replies.
Don't use nsfw clickthrough if the post is collapsed by default.
correct /static/config.json decoding
save /api/statusnet/config.json connection
rename apiStatusnetConfigSitePleromafe to apiConfig
fix typo
Add a checkbox for marking a post's attachments as NSFW
When a post with a subject is collapsed, hide its attachments.
Make interface language configurable from settings
attachment: add support for rendering alt text on images
Don't hide replies when inConversation.
Fix indentation
Remove old implementation of isReply.
Add settings for changing the visibility of replies in the timeline.
Update Russian translations
update
fixed error not displaying for 500 error.
...
The locale can now be configured in settings and is stored in
Vuex. The changes are applied immidiately after selection. The list of
languages is taken from the messages file, which contains all the
available locales (and a new value, `interfaceLanguage`, to control
the translation of this option in the options menu)
Closes#36
* notifications:
error display
removed style for rounding bottom part of notifications because there's now always "load more" footer
fix custom emoji in username, fix gif avatar not being animated when hovering on the notification
Hide initial desktop notifications spam when FE is opened and there's a lot of unseen notifications.
Updated localization files
Drop the entire thing about hidden "own" timeline since it doesn't necessarily contain all of the users posts (it doesn't contain DMs) even though it's "us". Since this is a workaround anyway just fetch home timeline instead. It could end up making more queries if user doesn't post that often.
* upstream/develop: (23 commits)
Rename expandCW to collapseMessageWithSubject.
fix indent
Add support for configurable CW clickthrough.
Merge upstream
fix lint issues
allow default visibility scope to be configured
Revert "storing entire config instead of each separate thing of it, so that future"
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.
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
...
