Merge pull request #717 from SmartThingsCommunity/staging

Rolling up changes to production from staging 2016-03-31 Release
Merge pull request #742 from sabersd/tilesWork
2026-03-09 21:03:00 +00:00 · 2016-03-31 14:31:39 -07:00 · 2016-03-31 10:02:43 -05:00 · 2016-03-31 09:28:25 -05:00 · 2016-03-30 16:37:16 -07:00 · 2016-03-30 13:58:53 -07:00
8 changed files with 28 additions and 16 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,10 @@ apply plugin: 'smartthings-hipchat'

 buildscript {
    dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.3"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.6"
    }
    repositories {
+        mavenLocal()
        jcenter()
        maven {
            credentials {
--- a/circle.yml
+++ b/circle.yml
@@ -15,13 +15,13 @@ deployment:
  develop:
    branch: master
    commands:
-      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_DEV
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3Buckets="$S3_BUCKETS_DEV"
      - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
      - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD

  stage:
    branch: staging
    commands:
-      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_STAGING
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3Buckets="$S3_BUCKETS_STAGE"
      - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
      - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD
--- a/devicetypes/smartthings/smartpower-outlet.src/i18n/messages.properties
+++ b/devicetypes/smartthings/smartpower-outlet.src/i18n/messages.properties
@@ -28,4 +28,8 @@
 '''{{ device.displayName }} is On'''.ko={{ device.displayName }}켜졌습니다.
 '''{{ device.displayName }} is Off'''.ko={{ device.displayName }}꺼졌습니다.
 '''{{ device.displayName }} power is {{ value }} Watts'''.ko={{ device.displayName }} 전원은 {{ value }}와트입니다
+'''On'''.ko=켜기
+'''Off'''.ko=끄기
+'''Turning On'''.ko=켜기
+'''Turning Off'''.ko=끄기
 #==============================================================================
--- a/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
+++ b/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
@@ -65,10 +65,10 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
-				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
-				attributeState "turningOn", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
-				attributeState "turningOff", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
+				attributeState "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
+				attributeState "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
+				attributeState "turningOn", label: 'Turning On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
+				attributeState "turningOff", label: 'Turning Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
 			}
 			tileAttribute ("power", key: "SECONDARY_CONTROL") {
 				attributeState "power", label:'${currentValue} W'
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/i18n/messages.properties
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/i18n/messages.properties
@@ -43,3 +43,7 @@
 '''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 '''Updating device to garage sensor'''.ko=기기-차고 센서 업데이트 중
 '''Updating device to open/close sensor'''.ko=기기-열림/닫힘 센서 업데이트 중
+'''Inactive'''.ko=비활성
+'''Active'''.ko=활성
+'''Open'''.ko=열다
+'''Closed'''.ko=닫은
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -83,19 +83,19 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
-				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
+				attributeState "open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
+				attributeState "closed", label:'Closed', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
 				attributeState "garage-open", label:'Open', icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e"
 				attributeState "garage-closed", label:'Closed', icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821"
 			}
 		}
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
+			state("open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+			state("closed", label:'Closed', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
 		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
-			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
+			state("active", label:'Active', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'Inactive', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°',
--- a/smartapps/smartthings/hue-connect.src/hue-connect.groovy
+++ b/smartapps/smartthings/hue-connect.src/hue-connect.groovy
@@ -161,7 +161,7 @@ private sendDeveloperReq() {
 		headers: [
 			HOST: host
 		],
-		body: [devicetype: "$token-0", username: "$token-0"]], "${selectedHue}"))
+		body: [devicetype: "$token-0"]], "${selectedHue}"))
 }

 private discoverHueBulbs() {
--- a/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy
+++ b/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy
@@ -40,6 +40,7 @@ preferences {
    page name:"pageSetup"
    page name:"Setup"
    page name:"Settings"
+    page name: "timeIntervalInput"

 }

@@ -185,7 +186,8 @@ def Settings() {
    }   
 }

-page(name: "timeIntervalInput", title: "Only during a certain time", refreshAfterSelection:true) {
+def timeIntervalInput() {
+	dynamicPage(name: "timeIntervalInput") {
 		section {
 			input "startTimeType", "enum", title: "Starting at", options: [["time": "A specific time"], ["sunrise": "Sunrise"], ["sunset": "Sunset"]], defaultValue: "time", submitOnChange: true
 			if (startTimeType in ["sunrise","sunset"]) {
@@ -204,9 +206,10 @@ page(name: "timeIntervalInput", title: "Only during a certain time", refreshAfte
 				input "ending", "time", title: "End time", required: false
 			}
 		}
-        
+	}
 }

+
 def installed() {
 initialize()
 }
Author	SHA1	Message	Date
Vinay Rao	51fb7fc7a9	Merge pull request #717 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-31 Release	2016-03-31 14:31:39 -07:00
Doug Sabers	babc0206df	Merge pull request #742 from sabersd/tilesWork INTL-309 translating tiles	2016-03-31 10:02:43 -05:00
sabersd	d419fb8606	INTL-309 translating tiles	2016-03-31 09:28:25 -05:00
Lars Finander	70aae0d76c	Merge pull request #720 from larsfinander/staging_DVCSMP_1667_Authentication_update_Philips_Hue DVCSMP-1667 Authentication needs to be updated for Philips Hue	2016-03-30 16:37:16 -07:00
Lars Finander	1cd5c68e68	DVCSMP-1667 Authentication needs to be updated for Philips Hue -Philips updaded their API and current ST implementation will stop working when next Hue firmware is released without this change	2016-03-30 13:58:53 -07:00
tslagle13	9e427d4108	Merge pull request #718 from tslagle13/bug-fix-for-vacation-lighting-director Make timeIntervalInput dynamic page	2016-03-29 17:20:14 -07:00
tslagle13	a8628b7343	Make timeIntervalInput dynamic page Forgot to make timeIntervalInput a dynamic page so it can update view on selection.	2016-03-29 17:12:28 -07:00
Vinay Rao	eb8d5ed4c9	Merge pull request #706 from SmartThingsCommunity/production Rolling down build changes to staging from production	2016-03-25 16:47:12 -07:00
Vinay Rao	7b5d618de8	Merge pull request #705 from jeff-blaisdell/fix-production Update public repo to new build setup.	2016-03-25 16:45:47 -07:00
Jeff Blaisdell	c024e09fb8	Update public repo to new build setup.	2016-03-25 18:33:15 -05:00
Vinay Rao	fe92f7ad19	Merge pull request #698 from SmartThingsCommunity/master Rolling up master to staging	2016-03-24 13:25:36 -07:00
Vinay Rao	10245315ee	Merge pull request #697 from SmartThingsCommunity/staging Rolling down staging commits to master	2016-03-24 13:22:33 -07:00
Vinay Rao	0b239d4686	Merge pull request #696 from SmartThingsCommunity/revert-668-staging_remove_hue Revert "Revert "DVCSMP-1615 & DEVC-372""	2016-03-24 13:19:48 -07:00
Vinay Rao	9374290d64	Revert "Revert "DVCSMP-1615 & DEVC-372""	2016-03-24 13:12:23 -07:00
Vinay Rao	ffcacb9da5	Merge pull request #664 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-25 Release	2016-03-24 13:03:24 -07:00
Vinay Rao	c45129170a	Merge pull request #668 from larsfinander/staging_remove_hue Revert "DVCSMP-1615 & DEVC-372"	2016-03-24 12:56:35 -07:00
Lars Finander	633bef2ac5	Revert "DVCSMP-1615 & DEVC-372" This reverts commit `6fbef3b297`. (temporary for staging, MArch 25 deploy)	2016-03-22 14:29:32 -07:00
Vinay Rao	024a6cb698	Merge pull request #632 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-17 Release	2016-03-18 10:43:22 -07:00
Vinay Rao	62a965d90b	Merge pull request #599 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-03-10 Release	2016-03-10 16:26:26 -08:00
Vinay Rao	515b268374	Merge pull request #549 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-02-25 Release	2016-02-26 10:51:42 -08:00
Vinay Rao	a103d437c2	Merge pull request #523 from SmartThingsCommunity/staging Deploy to production 2/18	2016-02-18 09:28:02 -08:00
Vinay Rao	bdd88deb99	Merge pull request #504 from SmartThingsCommunity/staging Merging changes from staging to production	2016-02-11 22:40:38 -08:00