* upstream/develop:
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
* upstream/develop: (36 commits)
remove deploy stage
remove deploy stage
updated and completed German translation
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Count spoiler text in the character count. Fixes#135.
Added Irish (Gaeilge) Language
Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
simplify code
adapt to destructive change of api
Adds Occitan locale
Updated italian translation
Update oc.json
Update oc.json
Update of the oc.json file Actualizacion del fichièr oc.json
Sort messages object by language code so that it's easier from the UI to browse them.
explicitly set collapseMessageWithSubject to undefined
Fall back to instance settings consistently
...
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
* 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
...
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: (26 commits)
Update status.vue
Update retweet_button.js
Update retweet_button.vue
Use serverside html rendering in usernames and bios if available.
Update status.vue
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
Hide all status actions if not logged in
hopefully, fix linter
Fixes broken custom emoji in autocomplete when proxying to remote BE
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
Remove trailing whitespace
Textarea is now focused when replying
the missing piece for invites system
Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are
fixed lint
cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
added ability to pick the style of highlighting
post-rebase fix, backported d7d787b84c
notifs fix
maybe i should actually add myself to contributors list?
...
