Megala
|
7c76638ba0
|
Merge remote-tracking branch 'upstream/master'
|
2016-11-10 12:04:59 +05:30 |
|
kamidu
|
f5c3a55aa8
|
add dashboard link to emm webapp
|
2016-11-10 11:06:35 +05:30 |
|
Megala
|
dd031d5c86
|
Merge remote-tracking branch 'upstream/master'
|
2016-11-10 09:07:01 +05:30 |
|
inoshperera
|
5ba338795e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-11-09 16:44:55 +05:30 |
|
inoshperera
|
b699cb8e4c
|
adding a new table to keep track of the profies pushed to an ios device
|
2016-11-09 16:44:43 +05:30 |
|
sinthuja
|
6bb0387dac
|
Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0
|
2016-11-09 16:07:42 +05:30 |
|
sinthuja
|
3001a31a33
|
updating the secure-ui publisher name.
|
2016-11-09 16:07:29 +05:30 |
|
Kamidu Sachith Punchihewa
|
3a40049269
|
Merge pull request #405 from madawas/cache-filter
Adding cache prevention filter to emm-web-agent app
|
2016-11-09 15:23:53 +05:30 |
|
Madawa Soysa
|
40907a954a
|
Adding cache prevention filter to emm-web-agent app
|
2016-11-09 15:06:02 +05:30 |
|
Chatura Dilan
|
557706e99c
|
Added android features to the descriptor
|
2016-11-09 14:13:51 +05:30 |
|
Ace
|
cea96cc841
|
Merging with master
|
2016-11-09 12:54:33 +05:30 |
|
Chatura Dilan
|
47ba440fbb
|
fixed extends
|
2016-11-09 12:36:37 +05:30 |
|
ayyoob
|
dedcf3b858
|
added correct db
|
2016-11-08 23:40:43 +05:30 |
|
Chatura Dilan
|
3b721cfc6c
|
Fixed android descriptor
|
2016-11-08 18:22:44 +05:30 |
|
Chatura Dilan
|
ca2d837ecc
|
Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0
|
2016-11-08 18:05:02 +05:30 |
|
Chatura Dilan
|
9e78b87365
|
Fixed issue in device operation bar
|
2016-11-08 18:04:42 +05:30 |
|
Chatura Dilan
|
d6701ee04c
|
Fixed issue in device view UI
|
2016-11-08 18:02:47 +05:30 |
|
Ayyoob Hamza
|
86ea0cae89
|
Merge pull request #402 from ruwany/st2
Adding windows/android datasources
|
2016-11-08 17:29:49 +05:30 |
|
Chatura Dilan
|
1f4cda26e9
|
Merge pull request #403 from GPrathap/IoTS-1.0.0
adding mb mqtt authorization extension
|
2016-11-08 16:05:30 +05:30 |
|
GPrathap
|
136f2f34b1
|
changing MQTT message broker port to 1886
|
2016-11-08 15:59:04 +05:30 |
|
GPrathap
|
c96f2a8162
|
adding mb mqtt authorization extension
|
2016-11-08 15:53:09 +05:30 |
|
Chatura Dilan
|
49dd83ed33
|
Adding CDMF operation bar to Android
|
2016-11-08 15:16:10 +05:30 |
|
Ace
|
43198565a2
|
Adding windows/android datasources
|
2016-11-08 15:11:04 +05:30 |
|
Chatura Dilan
|
b207e5d624
|
Added missing units
|
2016-11-08 15:08:57 +05:30 |
|
Ayyoob Hamza
|
c24a602c54
|
Merge pull request #401 from ruwany/st2
Updating device-type configs
|
2016-11-08 12:46:37 +05:30 |
|
Ace
|
9965fc13c8
|
Updating device-type configs
|
2016-11-08 12:44:53 +05:30 |
|
Ruwan
|
2802205d7e
|
Merge pull request #400 from ayyoob/IoTS-1.0.0
few changes in sample device types to load cdmc specific units
|
2016-11-07 06:04:20 +05:30 |
|
ayyoob
|
ecdbf6d272
|
few changes in sample device types to load cdmc specific units
|
2016-11-07 00:51:47 +05:30 |
|
Ayyoob Hamza
|
75c34eabfa
|
Merge pull request #399 from ruwany/st2
Restructuring iot and mobile plugins
|
2016-11-04 20:20:04 +05:30 |
|
Ace
|
7d14e23d00
|
merging with upstream
|
2016-11-04 20:09:13 +05:30 |
|
Ace
|
daf37338c6
|
merging changes with upstream
partial
|
2016-11-04 19:41:33 +05:30 |
|
Ace
|
46ad530735
|
adding missing files
continuation from restructuring effort.
|
2016-11-04 19:17:21 +05:30 |
|
Ace
|
e38941e81e
|
restructuring iot-plugins
removing mobile/iot base plugins and other restructuring
|
2016-11-04 19:16:44 +05:30 |
|
Chatura Dilan
|
3227f3f650
|
Chages to device view for Android
|
2016-11-04 11:17:41 +05:30 |
|
Chatura Dilan
|
269376a135
|
Changes to Android operation bar
|
2016-11-03 15:22:17 +05:30 |
|
Chatura Dilan
|
76887c4277
|
Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0
|
2016-11-03 14:50:55 +05:30 |
|
Chatura Dilan
|
1e3d8021e9
|
Adding Android and Windows operation bars
|
2016-11-03 14:48:14 +05:30 |
|
Megala
|
4d01b0523d
|
Merge remote-tracking branch 'upstream/master'
|
2016-11-02 14:23:40 +05:30 |
|
Charitha Goonetilleke
|
c2bfb7cce0
|
Merge pull request #397 from ayyoob/st2
refactored existing device types to support deployer
|
2016-11-02 13:04:52 +05:30 |
|
Harshan Liyanage
|
96cd41c634
|
Merge pull request #398 from Megala21/master
Updating apk
|
2016-11-02 11:38:23 +05:30 |
|
Megala
|
81eb6dc0d1
|
Merge remote-tracking branch 'upstream/master'
|
2016-11-02 11:21:12 +05:30 |
|
Megala
|
411d006f5e
|
Updating apk
|
2016-11-02 11:15:52 +05:30 |
|
sinthuja
|
e30d944d49
|
Revert: Fixing the build failure by adding the missing jar in the feature installation.
|
2016-11-02 10:45:18 +05:30 |
|
sinthuja
|
c3e87c10d4
|
Fixing the build failure by adding the missing jar in the feature installation.
|
2016-11-02 09:53:57 +05:30 |
|
ayyoob
|
685d57b452
|
merged with origin
|
2016-11-02 09:44:42 +05:30 |
|
ayyoob
|
bd05fb721a
|
merged with origin IoTS-1.0.0
|
2016-11-02 07:47:48 +05:30 |
|
sinthuja
|
d5a68fb5a9
|
Removing the mistakenly added getAllDevices permission from the andriod sense API
|
2016-11-01 18:38:34 +05:30 |
|
sinthuja
|
aa423787e8
|
Removing the mistakenly added getAllDevices from the andriod sense API
|
2016-11-01 18:37:09 +05:30 |
|
sinthuja
|
96e0ef92d7
|
Adding changes related to removing DAS components.
|
2016-11-01 18:35:09 +05:30 |
|
Charitha Goonetilleke
|
cc8f5d87a7
|
Merge pull request #396 from charithag/IoTS-1.0.0
Synced with master
|
2016-11-01 15:56:20 +05:30 |
|