Henry Jameson 6454837ea4 Merge remote-tracking branch 'upstream/develop' into notifications ... * 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? ...		2018-08-16 13:59:01 +03:00
..
assets	Make nsfw image easier to understand.	2018-05-16 13:01:17 +02:00
components	Merge remote-tracking branch 'upstream/develop' into notifications	2018-08-16 13:59:01 +03:00
i18n	Merge remote-tracking branch 'upstream/develop' into notifications	2018-08-16 13:59:01 +03:00
lib	Clean up, use translations, persist theme, add more presets.	2017-11-18 13:13:51 +02:00
modules	Merge remote-tracking branch 'upstream/develop' into notifications	2018-08-16 13:59:01 +03:00
services	Merge remote-tracking branch 'upstream/develop' into notifications	2018-08-16 13:59:01 +03:00
_variables.scss	alternate usercard	2018-05-12 16:17:04 +03:00
App.js	Add who-to-follow-panel	2018-02-24 23:04:44 +09:00
App.scss	Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme	2018-08-05 09:18:04 +03:00
App.vue	merge	2018-04-22 00:48:06 +09:00
main.js	Merge remote-tracking branch 'upstream/develop' into notifications	2018-08-16 13:59:01 +03:00