NuwanSameera
|
0ec235ee15
|
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 |
NuwanSameera
|
e9bddf13d9
|
digital display p2.inf changes
|
9 years ago |
Shabirmean
|
dea6fa1b71
|
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 |
Shabirmean
|
ce2be9d9b6
|
added separate datasources for virtual_firealarm and removed unnecessary logs from XMPP
|
9 years ago |
NuwanSameera
|
91de097713
|
digital display p2.inf changes
|
9 years ago |
charithag
|
c7e07337e7
|
Fix build issue
|
9 years ago |
NuwanSameera
|
fd915da767
|
delete car files
|
9 years ago |
NuwanSameera
|
6c85ada9ac
|
Update digital display related files
|
9 years ago |
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 |
Shabirmean
|
ec06c1427d
|
Updating .gitignore file
|
9 years ago |
NuwanSameera
|
9f294b24e4
|
Digital display file changes
|
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 |
NuwanSameera
|
b6d82ed4b6
|
digital display plugin updated
|
9 years ago |
Ruwan
|
9233a6f8ff
|
Merge pull request #27 from GPrathap/IoTS-1.0.0-M1
adding drone as a device type
|
9 years ago |
GPrathap
|
39ed6c691e
|
added drone as a device type
|
9 years ago |
charithag
|
dc5d65547f
|
Moved operation mod to cdmf level
|
9 years ago |
charithag
|
2f9b3c7e8a
|
Fix analytics url
|
9 years ago |
charithag
|
1c335dc192
|
Removed platform configuration from IoTServer and moved to CDMF
|
9 years ago |
charithag
|
b00637fa1f
|
Add user registration UIs for IoT Server
|
9 years ago |
NuwanSameera
|
b1258ff04a
|
Merge remote-tracking branch 'upstream/master'
|
9 years ago |
NuwanSameera
|
177f3a2d19
|
Digital Display files updates
|
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 |
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 |
Menaka Madushanka
|
6251e70b86
|
Corrected the file structure of jaggeryapps
|
9 years ago |
Shabirmean
|
e59703ab61
|
adding VirtualFireAlarm feature specific code
|
9 years ago |
Menaka Madushanka
|
fd368807a2
|
build failure fixed
|
9 years ago |
Menaka Madushanka
|
566f86f13e
|
Added the Feature module
|
9 years ago |
Menaka Madushanka
|
1d288c6d94
|
Added android sense component and feature to the parent pom
|
9 years ago |
charithag
|
1575670637
|
Updated with authentication
|
9 years ago |
charithag
|
2d6aa46ca2
|
Add iot related stuffs
|
9 years ago |
charithag
|
60e99704d2
|
Add iot related stuffs
|
9 years ago |
charithag
|
9c43f0c965
|
Fix issue in logo unit
|
9 years ago |
charithag
|
d538f71744
|
Add type specific units
|
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
|
a84c0794a0
|
renamed feature from "device-mgt-iot" to "device-mgt-iot-feature"
|
9 years ago |
charithag
|
98ac42e801
|
Add android specific ui components
|
9 years ago |
Shabirmean
|
2db7585488
|
Merge branch 'master' of https://github.com/charithag/carbon-device-mgt-plugins
|
9 years ago |
Shabirmean
|
69a2225417
|
moving iot-server-extensions into device-plugins repo
|
9 years ago |
charithag
|
f08b1602ec
|
Update configuration
|
9 years ago |
charithag
|
48804b82de
|
Add uuf components
|
9 years ago |
charithag
|
d39e9d8cd8
|
Refactor before adding IoT stuffs
|
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 |
charithag
|
6d0e59ce67
|
Add Windows JAX-RS
|
9 years ago |
charithag
|
f5ae0e7cc3
|
Add Android JAX-RS
|
9 years ago |
Dileesha Rajapakse
|
5ff566baf8
|
Refactored Oracle DB scripts
|
9 years ago |
charithag
|
7cf3dfbf37
|
Fix mdm-admin app name
|
9 years ago |