Henry Jameson 0ca42bd3d6 Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences ... * 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 ...		2018-11-26 04:33:41 +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 feature/scope_preferences	2018-11-26 04:33:41 +03:00
i18n	Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences	2018-11-26 04:33:41 +03:00
lib	Removed warning. Added support for working without static/config.json	2018-09-17 18:00:56 +03:00
modules	Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences	2018-11-26 04:33:41 +03:00
services	add support for disabling rich text formatting	2018-09-22 03:54:05 +00:00
_variables.scss	alternate usercard	2018-05-12 16:17:04 +03:00
App.js	fix some missing stuff	2018-09-17 17:51:39 +03:00
App.scss	Fixed non-masked image looking weird in chrome.	2018-09-03 22:18:59 +03:00
App.vue	show features panel only if not login	2018-09-03 16:02:06 +09:00
main.js	Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences	2018-11-26 04:33:41 +03:00