1. 19 Feb, 2016 1 commit
  2. 18 Feb, 2016 1 commit
  3. 16 Feb, 2016 1 commit
  4. 15 Feb, 2016 1 commit
  5. 11 Feb, 2016 2 commits
  6. 05 Feb, 2016 1 commit
  7. 01 Feb, 2016 1 commit
  8. 29 Jan, 2016 1 commit
  9. 18 Jan, 2016 1 commit
  10. 24 Dec, 2015 2 commits
  11. 16 Dec, 2015 1 commit
  12. 09 Dec, 2015 1 commit
  13. 16 Nov, 2015 1 commit
  14. 12 Nov, 2015 1 commit
    • lankamadan's avatar
      Merge branch 'master' into easysetup · d0baf5ae
      lankamadan authored
      Resolved following in merge from master
      
      Conflicts:
      	service/SConscript
      	service/easy-setup/SConscript
      	service/easy-setup/sampleapp/enrollee/arduino/SConscript
      	service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
      	service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
      	service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/AndroidManifest.xml
      	service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
      	service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
      	service/easy-setup/sampleapp/mediator/linux/SConscript
      	service/easy-setup/sampleapp/mediator/linux/mediator.cpp
      	service/easy-setup/sdk/common/common.h
      	service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
      	service/easy-setup/sdk/enrollee/common/inc/easysetup.h
      	service/easy-setup/sdk/enrollee/common/inc/resourceHandler.h
      	service/easy-setup/sdk/enrollee/common/src/easysetup.cpp
      	service/easy-setup/sdk/enrollee/common/src/resourceHandler.cpp
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IpOnBoardingConnection.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceFactory.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiOnBoardingConfig.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
      	service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
      	service/easy-setup/sdk/mediator/inc/prov_adapter.h
      	service/easy-setup/sdk/mediator/inc/provisioning.h
      	service/easy-setup/sdk/mediator/src/prov_adapter.cpp
      	service/easy-setup/sdk/mediator/src/provisioning.cpp
      	service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
      
      Change-Id: I197e10e466ca08299dbcc58d78c72fb0b6d59e15
      Signed-off-by: default avatarlankamadan <lanka.madan@samsung.com>
      d0baf5ae
  15. 11 Nov, 2015 5 commits
  16. 04 Nov, 2015 1 commit
  17. 30 Oct, 2015 1 commit
  18. 28 Oct, 2015 2 commits
  19. 27 Oct, 2015 2 commits
  20. 25 Oct, 2015 1 commit
  21. 23 Oct, 2015 1 commit
  22. 22 Oct, 2015 3 commits
  23. 21 Oct, 2015 1 commit
  24. 20 Oct, 2015 2 commits
  25. 19 Oct, 2015 3 commits
  26. 16 Oct, 2015 2 commits