Commit graph

8 commits

Author SHA1 Message Date
Henry Jameson 2dbc5f757d whoops 2018-11-26 04:42:25 +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
Henry Jameson 347c2c02df proxying nodeinfo 2018-09-17 18:54:34 +03:00
William Pitcock fd25f68741 config: fix typo 2018-06-07 01:13:58 +00:00
Roger Braun fbee80474b Basic frontend changes for chat. 2017-12-04 19:08:33 +01:00
Roger Braun b6ac99fdf0 Use history routing. 2016-11-06 20:26:07 +01:00
Roger Braun eb9873ac74 Add proxied routes. 2016-10-27 18:01:33 +02:00
Roger Braun 191c02af1e Basic skeleton 2016-10-26 16:46:32 +02:00