* 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:
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
...
* 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
