* upstream/develop:
addressed PR comments
added tooltip
Add userId property to timelines so that we don't overwrite user timeline meant for another user
Added option to auto-hide subject field when it's empty.
removes hacks from notifications storage, adds api call to let server update is_seen attribute
fixes vimium not giving retweet button a hint
* feature/theming2:
fallback for some weird case on my phone
todo
missing string
some more themes, fixes
localization strings, fixes
making inset shadows work on avatars again
fix retweeter avatar not getting proper shadow
avatars shadows, also allows drop-shadow use
* feature/theming2:
fixed keep checkboxes working when exporting
unbreak user profiles
fix preview input text using wrong string
fix panel link color, fix broken user profiles
* feature/theming2: (124 commits)
whoops
whoops
redmond update
better preview, collateral fixes
theme separation
more styles
cosmetic fixes
font control args to allow passing an option list of fonts, for future use
more fonts
initial font support
clean up
validity checks, no longer exploding when something is invalid
DM timeline: stream new statuses
collateral fixes
fixed indentation
some help strings
reset buttons, better disabled for shadows
added "keep opacity" option, fixed opacity loading, fixed missing shadows not affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
fix v1->v2 transition for localstorage
radii v1 fixes
...
* upstream/develop: (60 commits)
whoops
whoops
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
remove deploy stage
remove deploy stage
updated and completed German translation
On logout switch to public timeline.
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Put oauth text into description.
Display OAuth login on login form button.
...
