charithag
|
29cac74943
|
Merge remote-tracking branch 'origin/master' into IoTS-1.0.0-M1
# Conflicts:
# features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggerryapps/devicemgt/app/units/iot.unit.device.digitaldisplay-overview/digitaldisplay-overview.hbs
|
9 years ago |
Charitha Goonetilleke
|
55480f5fb5
|
Merge pull request #8 from NuwanSameera/master
Merge digital display changes
|
9 years ago |
Sumedha Rubasinghe
|
8dfbff8cfa
|
fixed license headers and removed creator tags
|
9 years ago |
Menaka Madushanka
|
40ce9da413
|
removing unnecessary comments
|
9 years ago |
NuwanSameera
|
783f6165c2
|
Update pom
|
9 years ago |
NuwanSameera
|
feae83dff2
|
Files updates
|
9 years ago |
NuwanSameera
|
7837c98092
|
digital display plugin updates
|
9 years ago |
menaka
|
776b6744b8
|
removed unnecessary images and fixed typo issue
|
9 years ago |
Menaka Madushanka
|
972484faef
|
code formatting and resource xml file/ deployment failure fixed
|
9 years ago |
charithag
|
636f2c921f
|
Fix build break after merge changes
|
9 years ago |
charithag
|
d425e06e0d
|
Merge branch 'master' of https://github.com/charithag/carbon-device-mgt-plugins
# Conflicts:
# pom.xml
|
9 years ago |
Charitha Goonetilleke
|
b7bc4cf771
|
Merge pull request #4 from NuwanSameera/master
digital display plugin updates
|
9 years ago |
Charitha Goonetilleke
|
dcd09ffb07
|
Merge pull request #3 from menaka121/IoTS-1.0.0-M1
Remaining sensor types (Streams) added.
|
9 years ago |
NuwanSameera
|
b6d82ed4b6
|
digital display plugin updated
|
9 years ago |
GPrathap
|
39ed6c691e
|
added drone as a device type
|
9 years ago |
menaka
|
2febeee349
|
Remaining sensor types (Streams) added.
|
9 years ago |
Ruwan
|
fb93935801
|
Merge pull request #22 from sumedharubasinghe/IoTS-1.0.0-M1
removing duplicate license entries
|
9 years ago |
Shabirmean
|
cd4d90563a
|
Correction to the dbscripts location path of IoTDevices, which is searched for when -Dsetup property is set
|
9 years ago |
Sumedha Rubasinghe
|
d4368dcccc
|
removing duplicate license entries
|
9 years ago |
NuwanSameera
|
b1258ff04a
|
Merge remote-tracking branch 'upstream/master'
|
9 years ago |
Charitha Goonetilleke
|
3b08c2d11f
|
Merge pull request #2 from menaka121/IoTS-1.0.0-M1
Android Sense feature and Component
|
9 years ago |
Shabirmean
|
df87b3f088
|
Merge branch 'master' of https://github.com/charithag/carbon-device-mgt-plugins
|
9 years ago |
Shabirmean
|
5f382eff2a
|
code formatting
|
9 years ago |
charithag
|
22fd42bdbc
|
Add mdm appmgt and mdmmgt to plugins
|
9 years ago |
menaka
|
66f690a694
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins
|
9 years ago |
Menaka Madushanka
|
c0f1cbd3ff
|
Removed unnecessary dependencies
|
9 years ago |
NuwanSameera
|
3d6f53a717
|
Merge remote-tracking branch 'upstream/master'
|
9 years ago |
NuwanSameera
|
668eee9515
|
Files update
|
9 years ago |
Shabirmean
|
e59703ab61
|
adding VirtualFireAlarm feature specific code
|
9 years ago |
menaka
|
ffbbee285d
|
changes according to the cdmf
|
9 years ago |
Menaka Madushanka
|
fd368807a2
|
build failure fixed
|
9 years ago |
Menaka Madushanka
|
083dddcfca
|
Added android sense component module
|
9 years ago |
Menaka Madushanka
|
1d288c6d94
|
Added android sense component and feature to the parent pom
|
9 years ago |
charithag
|
e7069e2d83
|
Updated with grouping changes
|
9 years ago |
charithag
|
c3835a1992
|
Fix compilation issue
|
9 years ago |
Ace
|
9233a33e8e
|
Adding Path annotation to the fireAlarm Webapp
|
9 years ago |
charithag
|
2d6aa46ca2
|
Add iot related stuffs
|
9 years ago |
charithag
|
60165b1698
|
Removed agent code from components
|
9 years ago |
Shabirmean
|
c65175ff10
|
Added VirtualFireAlarm DeviceType feature
|
9 years ago |
Shabirmean
|
6e09caf953
|
Added VirtualFireAlarm deviceType Plugin/Service components
|
9 years ago |
Shabirmean
|
a17f9142b4
|
removed unneccesary commented out code
|
9 years ago |
Shabirmean
|
69a2225417
|
moving iot-server-extensions into device-plugins repo
|
9 years ago |
charithag
|
d39e9d8cd8
|
Refactor before adding IoT stuffs
|
9 years ago |
charithag
|
faafdce5a9
|
Merged with upstream to comply with EMM 2.0.0-Alpha
|
9 years ago |
charithag
|
9db84846ce
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
# pom.xml
|
9 years ago |
manoj
|
be6d0647a6
|
Add notify to plugin for ios operations
|
9 years ago |
charithag
|
e0187fb41e
|
Updated android and windows jax-rs
|
9 years ago |
charithag
|
6d0e59ce67
|
Add Windows JAX-RS
|
9 years ago |
charithag
|
f5ae0e7cc3
|
Add Android JAX-RS
|
9 years ago |
manoj
|
aa19dc7261
|
APP manager integration
|
9 years ago |