10 commits

Author	SHA1	Message	Date
Henry Jameson	e06717fd0d	Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences ... * 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.	2018-11-26 04:38:44 +03:00
William Pitcock	1ad642c598	incorporate most translation changes from MR 368	2018-11-14 15:43:27 +00:00
William Pitcock	d0a4152f3c	update french translation	2018-11-14 15:36:55 +00:00
Henry Jameson	6165b7366a	Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences ... * upstream/develop: i think it's due to my shitty js-to-json regex	2018-09-25 14:48:02 +03:00
Henry Jameson	455cd0d028	settings for scope/subject	2018-09-25 14:47:02 +03:00
Henry Jameson	85235981d1	i think it's due to my shitty js-to-json regex	2018-09-25 14:30:05 +03:00
Haelwenn (lanodan) Monnier	8cb62fae70	src/i18n/fr.json: More accurate translation	2018-09-24 16:55:19 +02:00
William Pitcock	2f674eb13d	update french translation	2018-09-22 04:46:09 +00:00
William Pitcock	1af5c8fd39	add support for disabling rich text formatting	2018-09-22 03:54:05 +00:00
Henry Jameson	b4a5fddea8	all other languages which do not have MRs related to them separated	2018-09-06 21:29:39 +03:00