From aabd51732ca78078270fafe0bc7d4c767c2e61a3 Mon Sep 17 00:00:00 2001 From: Cheton Wu Date: Thu, 22 Jun 2017 13:38:31 +0800 Subject: [PATCH 1/3] Explicitly set 'osx_image: xcode8.3' for macOS Sierra (10.12+) support --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ce152599a..fd9fb7265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ os: - linux - osx +osx_image: xcode8.3 + node_js: - '4' - '6' From b2e61341dfb4fb86345a072063bd35702e2ec2e9 Mon Sep 17 00:00:00 2001 From: Cheton Wu Date: Sun, 25 Jun 2017 12:06:54 +0800 Subject: [PATCH 2/3] Update dependencies --- package.json | 34 +++++++++++++++++----------------- src/package.json | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 5222b94cf..8dd1078bc 100644 --- a/package.json +++ b/package.json @@ -162,10 +162,10 @@ "gcode-interpreter": "~1.1.1", "gcode-parser": "~1.1.1", "gcode-toolpath": "~1.1.1", - "history": "~4.6.2", + "history": "~4.6.3", "hogan.js": "~3.0.2", "i18next": "~8.4.2", - "i18next-browser-languagedetector": "~1.0.1", + "i18next-browser-languagedetector": "~2.0.0", "i18next-express-middleware": "~1.0.5", "i18next-node-fs-backend": "~1.0.0", "i18next-xhr-backend": "~1.4.2", @@ -190,12 +190,12 @@ "push.js": "~0.0.13", "range_check": "~1.4.0", "rc-slider": "~8.1.3", - "react": "~15.5.4", - "react-addons-shallow-compare": "~15.5.2", - "react-addons-update": "~15.5.2", + "react": "~15.6.1", + "react-addons-shallow-compare": "~15.6.0", + "react-addons-update": "~15.6.0", "react-bootstrap": "~0.31.0", - "react-dom": "~15.5.4", - "react-dropzone": "~3.13.2", + "react-dom": "~15.6.1", + "react-dropzone": "~3.13.3", "react-facebook-loading": "~0.6.1", "react-infinite": "~0.11.0", "react-infinite-tree": "~0.7.0", @@ -207,7 +207,7 @@ "react-sortablejs": "~1.3.4", "react-toggle": "~4.0.1", "react-validation": "~2.10.9", - "redux": "~3.6.0", + "redux": "~3.7.0", "registry-auth-token": "~3.3.1", "registry-url": "~3.1.0", "rimraf": "~2.6.1", @@ -226,12 +226,12 @@ "static-eval": "~1.1.1", "superagent": "~3.5.2", "superagent-use": "~0.1.0", - "three": "~0.85.2", + "three": "~0.86.0", "universal-logger": "~1.0.1", "universal-logger-browser": "~1.0.1", - "uuid": "~3.0.1", + "uuid": "~3.1.0", "watch": "~1.0.2", - "webappengine": "~1.1.3", + "webappengine": "~1.2.0", "winston": "~2.3.1", "xterm": "~2.7.0" }, @@ -239,7 +239,7 @@ "babel-cli": "~6.24.1", "babel-core": "~6.25.0", "babel-eslint": "~7.2.3", - "babel-loader": "~7.0.0", + "babel-loader": "~7.1.0", "babel-plugin-transform-decorators-legacy": "~1.3.4", "babel-plugin-transform-proto-to-assign": "~6.23.0", "babel-plugin-transform-runtime": "~6.23.0", @@ -261,7 +261,7 @@ "eslint-loader": "~1.7.1", "eslint-plugin-import": "~2.3.0", "eslint-plugin-jsx-a11y": "~2.2.3", - "eslint-plugin-react": "~7.0.1", + "eslint-plugin-react": "~7.1.0", "eventsource-polyfill": "~0.9.6", "extract-text-webpack-plugin": "~2.1.2", "file-loader": "~0.11.2", @@ -293,13 +293,13 @@ "stylint-loader": "~1.0.0", "stylus": "~0.54.5", "stylus-loader": "~3.0.1", - "tap": "~10.3.4", + "tap": "~10.5.1", "text-table": "~0.2.0", "transform-loader": "~0.2.4", "url-loader": "~0.5.9", - "webpack": "~2.6.1", - "webpack-dev-middleware": "~1.10.2", - "webpack-dev-server": "~2.4.5", + "webpack": "~3.0.0", + "webpack-dev-middleware": "~1.11.0", + "webpack-dev-server": "~2.5.0", "webpack-hot-middleware": "~2.18.0", "webpack-manifest-plugin": "~1.1.0", "webpack-md5-hash": "0.0.5", diff --git a/src/package.json b/src/package.json index e5debd03b..1a1a99307 100644 --- a/src/package.json +++ b/src/package.json @@ -52,9 +52,9 @@ "spawn-default-shell": "~2.0.0", "static-eval": "~1.1.1", "superagent": "~3.5.2", - "uuid": "~3.0.1", + "uuid": "~3.1.0", "watch": "~1.0.2", - "webappengine": "~1.1.3", + "webappengine": "~1.2.0", "winston": "~2.3.1" } } From 25c39770e56f3ac014f9615a4219fe04beaed0bf Mon Sep 17 00:00:00 2001 From: Cheton Wu Date: Wed, 28 Jun 2017 22:58:01 +0800 Subject: [PATCH 3/3] Update resource.json --- src/web/i18n/hu/resource.json | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/web/i18n/hu/resource.json b/src/web/i18n/hu/resource.json index 01d67b1c4..4d8458722 100644 --- a/src/web/i18n/hu/resource.json +++ b/src/web/i18n/hu/resource.json @@ -187,11 +187,11 @@ "Go To Machine Zero On A Axis (G53 G0 A0)": "Menjen a gépi nullpontra az A tengelyen(G53 G0 A0)", "Zero Out Temporary A Axis (G92 A0)": "Ideiglenesen eltolt A tengely nullpontja (G92 A0)", "Un-Zero Out Temporary A Axis (G92.1 A0)": "Un-Zero Out Temporary A Axis (G92.1 A0)", - "Expand": "", - "Collapse": "", + "Expand": "Kinyitás", + "Collapse": "Összecsukás", "More": "Több", - "Enter Full Screen": "", - "Exit Full Screen": "", + "Enter Full Screen": "Teljes képernyő", + "Exit Full Screen": "Kilépés a teljesképernyőből", "User Defined": "Felhasználó által definiált", "Custom distance for every move operation": "Egyedi távolság minden mozdási műveletnél", "Increase custom distance by one unit": "Egyedileg beállított távolság növekszik egységenként", @@ -273,8 +273,8 @@ "Elapsed Time": "Eltelt idő", "Finish Time": "Befejezés ideje", "Remaining Time": "Hátralévő idő", - "Controller State": "", - "Controller Settings": "", + "Controller State": "Controller állapot", + "Controller Settings": "Controller beállítás", "Hide": "Elrejtés", "Show": "Megjelenítés", "Queue Reports": "Jelentési sor", @@ -307,15 +307,15 @@ "Laser": "Lézer", "Laser Intensity Control": "Lézer erősség szabályzás", "Laser Test": "Lézer teszt", - "Power (%)": "", - "Test duration": "", + "Power (%)": "Power (%)", + "Test duration": "Teszt időtartama", "ms": "ms", - "Maximum value": "", + "Maximum value": "Maximális érték", "Laser Off": "Lézer Kikapcsolás", - "New Macro": "", + "New Macro": "Új macro", "Macro Name": "Macro neve", - "Macro Commands": "", - "Macro Variables": "", + "Macro Commands": "Macro parancs", + "Macro Variables": "Macro változók", "Edit Macro": "Macro szerkesztés", "Delete Macro": "Macro törlés", "Are you sure you want to delete this macro?": "Biztos törölni akarod ezt a macro-t?", @@ -337,7 +337,7 @@ "Probe Feedrate": "Tapintás Előtolás", "Touch Plate Thickness": "Tapintási lemez vastagság", "Retraction Distance": "Visszahuzási távolság", - "Z-Probe": "", + "Z-Probe": "Z-Probe", "Apply tool length offset": "", "Run Z-Probe": "Futtatás Z-tapintó", "Spindle Speed": "Főorsó sebessége ", @@ -348,11 +348,11 @@ "Show System Settings": "Redszerbeállítások megjelenítése", "Show All Settings": "Minden beállítás megjelenítése", "List Self Tests": "Ellenörző teszt lista", - "Power Management": "", + "Power Management": "Energiagazdálkodás", "Motor Timeout: {{mt}} sec": "", - "Enable Motors": "", - "Disable Motors": "", - "Motor {{n}}": "", + "Enable Motors": "Motorok engedélyezve", + "Disable Motors": "Motorok tiltva", + "Motor {{n}}": "Motor {{n}}", "Velocity": "Velocity", "Line": "Vonal", "Path": "Pálya", @@ -377,10 +377,10 @@ "File": "Fájl", "3D rendering": "3D renderelés", "Reset Position": "Pozició Rezet", - "Zoom In": "", - "Zoom Out": "", - "Move the camera": "", - "Rotate the camera": "", + "Zoom In": "Közelítés", + "Zoom Out": "Távolítás", + "Move the camera": "Kamera mozgatás", + "Rotate the camera": "Kamera forgatás", "Watch Directory": "Figyelt Mappa", "Date modified": "Modosítás Dátuma", "Type": "Típus", @@ -398,9 +398,9 @@ "Use a built-in camera or a connected webcam": "Beépített Kamera vagy Csatlakoztatott Kamera", "Use a M-JPEG stream over HTTP": "Használj M-JPEG stream egy HTTP címen", "Webcam is off": "Webkamera Ki Van Kapcsolva", - "Rotate Left": "", - "Rotate Right": "", - "Flip Horizontally": "", - "Flip Vertically": "", - "Crosshair": "" + "Rotate Left": "Forgatás balra", + "Rotate Right": "Forgatás jobbra", + "Flip Horizontally": "Horzontális fordítás", + "Flip Vertically": "Vertikális fordítás", + "Crosshair": "Célkereszt" }