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 ...
No related branches found
No related tags found
Showing
- .docker/dockerfiles/develop/Dockerfile 2 additions, 4 deletions.docker/dockerfiles/develop/Dockerfile
- .docker/dockerfiles/latest/Dockerfile 1 addition, 3 deletions.docker/dockerfiles/latest/Dockerfile
- .meteor/versions 4 additions, 4 deletions.meteor/versions
- README.md 10 additions, 10 deletionsREADME.md
- i18n/ar.i18n.json 13 additions, 4 deletionsi18n/ar.i18n.json
- i18n/de.i18n.json 33 additions, 1 deletioni18n/de.i18n.json
- i18n/en.i18n.json 33 additions, 0 deletionsi18n/en.i18n.json
- i18n/fi.i18n.json 29 additions, 0 deletionsi18n/fi.i18n.json
- i18n/he.i18n.json 46 additions, 0 deletionsi18n/he.i18n.json
- i18n/hr.i18n.json 1 addition, 0 deletionsi18n/hr.i18n.json
- i18n/ko.i18n.json 1 addition, 0 deletionsi18n/ko.i18n.json
- i18n/nl.i18n.json 1 addition, 0 deletionsi18n/nl.i18n.json
- i18n/pl.i18n.json 24 additions, 1 deletioni18n/pl.i18n.json
- i18n/pt.i18n.json 4 additions, 0 deletionsi18n/pt.i18n.json
- i18n/ro.i18n.json 31 additions, 0 deletionsi18n/ro.i18n.json
- packages/rocketchat-api/server/routes.coffee 11 additions, 64 deletionspackages/rocketchat-api/server/routes.coffee
- packages/rocketchat-assets/.npm/package/npm-shrinkwrap.json 8 additions, 0 deletionspackages/rocketchat-assets/.npm/package/npm-shrinkwrap.json
- packages/rocketchat-assets/package.js 2 additions, 1 deletionpackages/rocketchat-assets/package.js
- packages/rocketchat-assets/server/assets.coffee 10 additions, 17 deletionspackages/rocketchat-assets/server/assets.coffee
- packages/rocketchat-authorization/i18n/ar.i18n.json 0 additions, 1 deletionpackages/rocketchat-authorization/i18n/ar.i18n.json
Loading
Please register or sign in to comment