Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c04fcc86b48ce7bfeed793e45d1b5418d9c11a55 https://github.com/galaxyproject/galaxy/commit/c04fcc86b48ce7bfeed793e45d1b5... Author: yangyuanjie jayyoung@yangyuanjiedeMacBook-Pro.local Date: 2016-04-21 (Thu, 21 Apr 2016)

Changed paths: M client/galaxy/scripts/utils/localization.js

Log Message: ----------- Fix bug when determining locale

Commit: 9cd168bbabf1347a02a435cc1186fdf4aac183bb https://github.com/galaxyproject/galaxy/commit/9cd168bbabf1347a02a435cc1186f... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-21 (Thu, 21 Apr 2016)

Changed paths: M static/maps/utils/localization.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/utils/localization.js

Log Message: ----------- make client

Commit: 18dcf10aca7b65f2be2661886ddee86c6bb2c6c7 https://github.com/galaxyproject/galaxy/commit/18dcf10aca7b65f2be2661886ddee... Author: xiaojay xiaojay@gmail.com Date: 2016-04-21 (Thu, 21 Apr 2016)

Changed paths: M static/maps/utils/localization.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/utils/localization.js

Log Message: ----------- Merge pull request #1 from dannon/xiaojay_dev

Building the client

Commit: 266a45ad71002e391b646da24aa40eccda0f21cc https://github.com/galaxyproject/galaxy/commit/266a45ad71002e391b646da24aa40... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-21 (Thu, 21 Apr 2016)

Changed paths: M client/galaxy/scripts/utils/localization.js M static/maps/utils/localization.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/utils/localization.js

Log Message: ----------- Merge pull request #2213 from xiaojay/dev

Fix bug when determining locale

Compare: https://github.com/galaxyproject/galaxy/compare/be588228869a...266a45ad7100