Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dawit #1

Merged
DawitG96 merged 10 commits from dawit into master 2018-06-01 21:36:48 +02:00
Conversation 0 Commits 10 Files Changed 20 +352 -1159

10 Commits

Author SHA1 Message Date
Giacomo
66f1bc3f7a Merge branches 'dawit' and 'master' of https://github.com/reti2vc-2018/SeniorAssistant into dawit 
# Conflicts:
#	.gradle/4.4/fileHashes/fileHashes.bin
#	.gradle/4.4/fileHashes/fileHashes.lock
#	.idea/gradle.xml
#	.idea/workspace.xml
#	build.gradle
#	src/test/java/TestLights.java

#MaybeThisTimeIsCorrect
 2018-06-01 21:33:50 +02:00
Giacomo
10942fa84f Removed .gradle .idea 2018-06-01 21:16:06 +02:00
Giacomo
79989af712 Merge branch 'master' into dawit 
# Conflicts:
#	.gradle/4.4/fileHashes/fileHashes.bin
#	.gradle/4.4/fileHashes/fileHashes.lock
#	.idea/workspace.xml
#	build.gradle
 2018-06-01 11:29:06 +02:00
Giacomo
8c2d94d90a Aggiunto jar per Z-Wave 2018-06-01 11:19:06 +02:00
f19stefano96
09f96fc590 Aggiunto classe Sensor e testSensor. NON SO se giusto 2018-05-31 21:14:58 +02:00
Dawit Gulino 20013954
749e9ed078 merged 2018-05-31 16:13:18 +02:00
Dawit Gulino 20013954
20bee22c1a Merge branch 'master' into dawit 2018-05-31 16:11:01 +02:00
Dawit Gulino 20013954
2f5b7826d9 non so 2018-05-31 16:00:00 +02:00
Giulia
7d28391db0 Added classes for manage authentication and retrieve data to/from fitbit... but the code needs some mods! 2018-05-31 15:00:59 +02:00
f19stefano96
b79a7615d2 lampadine funzionano 2018-05-29 10:39:16 +02:00