8 commits

Author	SHA1	Message	Date
Henry Jameson	c241de4634	fix	2018-12-05 10:51:11 +03:00
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
Roger Braun	c34eebff6c	Add actual user search.	2018-11-14 20:31:06 +01:00
Roger Braun	b37a0f4f23	Add direct message tab.	2018-11-13 20:34:56 +01:00
Roger Braun	50264410f5	Add login form back in.	2018-11-07 16:56:12 +01:00
Roger Braun	b6cd4ff32a	Fix typo.	2018-11-06 21:47:11 +01:00
Roger Braun	fbe30b4922	Merge remote-tracking branch 'origin/develop' into oauth	2018-10-26 16:13:05 +02:00
Roger Braun	9af204b293	Move login to oauth.	2018-10-26 15:16:23 +02:00