Skip to content

Conversation

@dgatchell-sfdc
Copy link

Closes #ISSUE_NUMBER

rodrigok and others added 29 commits July 4, 2018 18:25
# Conflicts:
#	.docker/Dockerfile.rhel
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
Merge master into develop & Set version to 0.67.0-develop
@RocketChat/core 

Closes #9990

This pull request properly brings the web app manifest up-to-date to the current specification and resolves the incorrect start_url origin and the path to the broken images as seen in this screenshot.

This resolves the unwanted and incorrect behavior experienced in both Google Chrome and Mozilla Firefox for Android.

![image](https://user-images.githubusercontent.com/643503/36929663-052fe33c-1e49-11e8-8a68-3d8e666d30e8.png)
* Fix icons in channels message popup

* Fix descriptions in slash commands message popup

* Add scrolling in message popup
This pull request aims to format the SVG file containing the UI icons.

- [x] Fix indentation
- [x] Sort icons alphabetically by `id`
- [x] Recover icons lost in c1a5d57
# Conflicts:
#	.docker/Dockerfile.rhel
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
Merge master into develop & Set version to 0.67.0-develop
* improved callbacks promises run

* fixed default fname
ubarsaiyan and others added 29 commits August 31, 2018 15:44
Merge master into develop & Set version to 0.70.0-develop
* Provide a dedicated informal german language option

* Use a "virtual" language code de-IN for informal german
The IETF language specification compliant suffix "informal"  did not work with the i18n library used
@dgatchell-sfdc dgatchell-sfdc merged commit d838b8f into SFDC-CSIRT:develop Sep 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.