Charitha Goonetilleke
|
2220d2f851
|
Merge pull request #11 from NuwanSameera/IoTS-1.0.0-M1
digital display modifications
|
9 years ago |
NuwanSameera
|
62ed697e84
|
digital display modifications
|
9 years ago |
charithag
|
ea821f94f7
|
Update group with pagination
|
9 years ago |
charithag
|
7a3d9dcf24
|
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 |
Ruwan
|
7affc1f443
|
Merge pull request #46 from charithag/IoTS-1.0.0-M1
Merge Nuwansa's digital display PR
|
9 years ago |
charithag
|
88cab6ef53
|
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
|
7cc878873c
|
Fix links
|
9 years ago |
Ruwan
|
5856465c99
|
Merge pull request #45 from Shabirmean/IoTS-1.0.0-M1
added separate datasources for virtual_firealarm and removed unnecessary logs
|
9 years ago |
Charitha Goonetilleke
|
1a7eb84694
|
Merge pull request #9 from NuwanSameera/IoTS-1.0.0-M1
rename files and folders to digital_display
|
9 years ago |
NuwanSameera
|
cbae64d925
|
digital display modifications
|
9 years ago |
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 |
Ruwan
|
ff84ece786
|
Merge pull request #44 from charithag/IoTS-1.0.0-M1
Fix build issue
|
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 |
Ruwan
|
a2429a5a9c
|
Merge pull request #43 from charithag/IoTS-1.0.0-M1
Merge Nuwansa's PR and fix issues
|
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 |
Ruwan
|
df62623213
|
Merge pull request #42 from sajithar/IoTS-1.0.0-M1
Necessary changes for UUF update+bug fixes
|
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 |
Ruwan
|
450496a148
|
Merge pull request #39 from sumedharubasinghe/IoTS-1.0.0-M1
fixed license headers and removed creator tags
|
9 years ago |
Ruwan
|
f5c1f0731c
|
Merge pull request #40 from rasika90/IoTS-1.0.0-M1
Adding dynamic templates for device types listing
|
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
|
b22715d8a8
|
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
|
644d755029
|
adding api link for device type page
|
9 years ago |
Sumedha Rubasinghe
|
8dfbff8cfa
|
fixed license headers and removed creator tags
|
9 years ago |
Ruwan
|
b5d0fe4a95
|
Merge pull request #38 from rasika90/IoTS-1.0.0-M1
refactoring and adding qr code gen
|
9 years ago |
Rasika Perera
|
df45153a2e
|
resolve conflicts
|
9 years ago |