Skip to content
Snippets Groups Projects
Commit 83c0e429 authored by Gabriel Engel's avatar Gabriel Engel
Browse files

Merge branch 'develop'

* develop: (67 commits)
  Remove toUpperCase from emojione popup config; Fixes #1955
  Make oembed parse title in ungreedy form
  Display time based on locale instead of using fixed 24h format
  Fix audio-recorder not stoping. Closes #1941.
  Sort room files by uploadedAt. Closes #1932
  Allow multi-line title on oembed
  Add some logs
  Fallback LDAP login to local account if LDAP fails
  Add connections status bar to login page
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: 'gabriel.engel@gmail.com'.
  send correct content-type for livechat. fixes #1951
  Fix redirect exceptions
  Add i18n strings
  Close #1768; Force SSL
  Close #1925; Add options to enable TLS on LDAP
  Improve admin disbleQuery
  Close #1923; Prevent erros update outgoing webhooks with empty channel
  Fix overlapping windows
  Add Raspberry Pi support announcement
  Updated base.less to use 480x270
  ...
parents 94c9ef3f c6d1814d
No related branches found
No related tags found
No related merge requests found
Showing
with 264 additions and 110 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment