charithag
|
67a912cfc3
|
Update operation module path
|
9 years ago |
charithag
|
ffe2302583
|
Fix listing issue
|
9 years ago |
charithag
|
245fa7bdc1
|
Delete ignored .car files
|
9 years ago |
charithag
|
8a89411fd2
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
charithag
|
efb8a77c02
|
Changes to Nuwansa's PR
|
9 years ago |
sajithar
|
0b56ba432d
|
removed '.car' files
|
9 years ago |
sajithar
|
0f1f1a04c4
|
removed '.car' files
|
9 years ago |
charithag
|
f221efb998
|
Changes to Nuwansa's PR
|
9 years ago |
sajithar
|
9467643116
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
Conflicts:
features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.ui.header.logo/logo.hbs
Resolved conflicts when merging.
|
9 years ago |
sajithar
|
b1de1dcfcc
|
removed unnecessary client-side js
|
9 years ago |
sajithar
|
e80b8db1bd
|
added register user link via unit extending
|
9 years ago |
sajithar
|
a4817b6037
|
app name from app-conf configuration
|
9 years ago |
sajithar
|
b1fd611527
|
set 'isAnonymous' in register unit definition
|
9 years ago |
sajithar
|
0efc953366
|
added app-conf.json
|
9 years ago |
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 |
NuwanSameera
|
e964e6e202
|
Update digital display related files
|
9 years ago |
NuwanSameera
|
12bdceb2ac
|
Update digital display related files
|
9 years ago |
Rasika Perera
|
f29d41a270
|
styling for device type select
|
9 years ago |
Rasika Perera
|
b1d59d8eda
|
adding dynamic templates for device types listing
|
9 years ago |
Rasika Perera
|
644d755029
|
adding api link for device type page
|
9 years ago |
Rasika Perera
|
df45153a2e
|
resolve conflicts
|
9 years ago |
Rasika Perera
|
ee3b5c95bd
|
refactoring and adding qr code gen
|
9 years ago |
Rasika Perera
|
6e645667b1
|
fixing ui styling issues
|
9 years ago |
Rasika Perera
|
e139eb8a40
|
changing logo title
|
9 years ago |
charithag
|
ab10da2fec
|
Ignore generated car files from git
|
9 years ago |
charithag
|
305d6e53b5
|
Enabled live graphs in device-details page
|
9 years ago |
charithag
|
6207a5345d
|
Merge branch 'master' of https://github.com/charithag/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
charithag
|
24e13475c2
|
Android sense agent updated
|
9 years ago |
Rasika Perera
|
826d427143
|
refeactoring
|
9 years ago |
Rasika Perera
|
e1aa0e5236
|
moving into cdmf layout
|
9 years ago |
Rasika Perera
|
ee224271e7
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
Rasika Perera
|
580a80bcab
|
adding download popup
|
9 years ago |
menaka
|
461ed82d76
|
Merge remote-tracking branch 'origin/IoTS-1.0.0-M1' into IoTS-1.0.0-M1
Conflicts:
features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/agent/androidsense.apk
|
9 years ago |
Menaka Madushanka
|
1aaf83d787
|
new android sense apk
|
9 years ago |
charithag
|
0bf5c09bee
|
Android sense agent updated
|
9 years ago |
charithag
|
0b44235220
|
Add required configs for android sense
|
9 years ago |
menaka
|
776b6744b8
|
removed unnecessary images and fixed typo issue
|
9 years ago |
Rasika Perera
|
f2f85cdf5c
|
Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1
|
9 years ago |
Rasika Perera
|
d868970c40
|
adding device type config for download agent
|
9 years ago |
Ruwan
|
55e05d1974
|
Merge pull request #32 from charithag/master
Merge menaka's changes and virtual firealarm thumbnail update
|
9 years ago |
Charitha Goonetilleke
|
ba0ee708d8
|
Merge pull request #6 from menaka121/IoTS-1.0.0-M1
thumb.png added
|
9 years ago |
Menaka Madushanka
|
19fa69907f
|
thumb.png added
|
9 years ago |
charithag
|
15e425eb1b
|
Update virtual firealarm thumbnail
|
9 years ago |
Menaka Madushanka
|
483963788a
|
Android sense units added
|
9 years ago |
Rasika Perera
|
59cfb4cb7c
|
adding device type configs
|
9 years ago |
Rasika Perera
|
6e763a20e1
|
fixing android unit p2 touch points
|
9 years ago |
Rasika Perera
|
c1a6423888
|
adding device type specific units
|
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 |