5.10.5

chore(intl/locales/fr): update and new translations (#2260 )
chore(intl/locales/fr): update translation
2017-07-05 17:36:31 +02:00 · 2017-07-04 14:44:52 +02:00 · 2017-07-04 12:21:27 +02:00 · 2017-07-04 12:21:07 +02:00 · 2017-07-04 11:40:34 +02:00 · 2017-07-03 16:24:04 +02:00
5 changed files with 1490 additions and 149 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": false,
  "name": "xo-web",
-  "version": "5.10.3",
+  "version": "5.10.5",
  "license": "AGPL-3.0",
  "description": "Web interface client for Xen-Orchestra",
  "keywords": [
--- a/src/common/intl/locales/es.js
+++ b/src/common/intl/locales/es.js
--- a/src/common/intl/locales/fr.js
+++ b/src/common/intl/locales/fr.js
--- a/src/common/intl/messages.js
+++ b/src/common/intl/messages.js
@@ -255,7 +255,7 @@ var messages = {
  noJobs: 'No jobs found.',
  noSchedules: 'No schedules found',
  jobActionPlaceHolder: 'Select a xo-server API command',
-  jobTimeoutPlaceHolder: ' Timeout (number of seconds after which a VM is considered failed)',
+  jobTimeoutPlaceHolder: 'Timeout (number of seconds after which a VM is considered failed)',
  jobSchedules: 'Schedules',
  jobScheduleNamePlaceHolder: 'Name of your schedule',
  jobScheduleJobPlaceHolder: 'Select a Job',
--- a/src/common/react-novnc.js
+++ b/src/common/react-novnc.js
@@ -104,7 +104,7 @@ export default class NoVnc extends Component {
    // a port is required
    //
    // if not available from the URL, use the default ones
-    const { port = isSecure ? 443 : 80 } = url
+    const port = url.port || (isSecure ? 443 : 80)

    rfb.connect(url.hostname, port, null, clippedPath)
    disableShortcuts()
Author	SHA1	Message	Date
Julien Fontanet	79a85659aa	5.10.5	2017-07-05 17:36:31 +02:00
Pierre Donias	eca145e113	chore(intl/locales/fr): update and new translations (#2260 )	2017-07-04 14:44:52 +02:00
Julien Fontanet	04b75fb3b3	chore(intl/locales/fr): update translation	2017-07-04 12:21:27 +02:00
Julien Fontanet	582e220a02	chore(intl/messages): remove extraneous space	2017-07-04 12:21:07 +02:00
Julien Fontanet	2e87abefc4	fix(react-novnc): use correct port	2017-07-04 11:40:34 +02:00
Julien Fontanet	5ea19ee56f	chore(intl/locales/es): update (#2256 )	2017-07-03 16:24:04 +02:00
Julien Fontanet	2ee733399e	5.10.4	2017-06-30 19:34:31 +02:00
Julien Fontanet	73f228c719	Merge branch 'next-release' into stable	2017-06-30 19:34:19 +02:00
Julien Fontanet	86b0962063	fix(react-novnc): url.port is not undefined when empty	2017-06-30 19:32:08 +02:00