Commit Graph

7683 Commits (3e3d8fe1acdf470121714f3365a206e02695ce38)
 

Author SHA1 Message Date
lasantha 7ec652a910 resolved merging conflicts
7 years ago
WSO2 Builder 6603015614 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare for next development iteration
7 years ago
WSO2 Builder bb731cb264 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare release v3.0.182
7 years ago
Rasika Perera 092ae30738
Merge pull request #1123 from charithag/master
7 years ago
charitha 6cb3ffa3ca Fixed build failure due to incorrect class name
7 years ago
charitha 3c23a3cf5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha 1449698a3c OSGi improvement to #977
7 years ago
Ruwan b15b1cc7b3
Merge pull request #1120 from Gathika94/add-emm-analytics
7 years ago
Gathika94 7a2fc90a15 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics
7 years ago
Gathika94 c22a7f1882 minor ui changes
7 years ago
charitha b28e0822c7 Move archival DB script to correct place (missed from #977)
7 years ago
lasantha 1c6393959d adding app manager changes - not complete
7 years ago
Gathika94 356063a247 removed warnings created in geo deivice locations dashboard
7 years ago
WSO2 Builder b2fc6b4cad [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare for next development iteration
7 years ago
WSO2 Builder a55619b333 [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare release v3.0.181
7 years ago
Gathika94 89eff7b7bd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics
7 years ago
Gathika94 81b036678a minor changes in device locations UI
7 years ago
WSO2 Builder 3d522e7c62 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare for next development iteration
7 years ago
WSO2 Builder 08382cc965 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare release v3.0.180
7 years ago
Charitha Goonetilleke c05f1c4c6e
Merge pull request #1121 from charithag/master
7 years ago
Charitha Goonetilleke 61f88b54ff
Merge pull request #1122 from warunalakshitha/remote-control
7 years ago
Gathika94 cec1e1393e removed unnecessary files
7 years ago
Gathika94 dcac19480f removed unnecessary files
7 years ago
warunalakshitha 2313928741 Add remote control configurations as remove unused methods
7 years ago
charitha 3c85e21c79 Adding data archival configurations (missed from #977)
7 years ago
Gathika94 f4af47fae4 added unit and page
7 years ago
Gathika94 2e082fbbb7 removed unnecessary classes
7 years ago
WSO2 Builder 4c68ddd752 [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare for next development iteration
7 years ago
WSO2 Builder f28b740e9c [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare release v3.0.179
7 years ago
Gathika94 ad061d09a6 device details can be get through the api
7 years ago
Gathika94 f5d1ab7403 backend api working properly
7 years ago
Gathika94 c74a56cb45 geo hash algorithm
7 years ago
Gathika94 d3eb32b5cc working on ui features
7 years ago
Gathika94 4eb66f4e6b api for getting devices in geo grid working fine
7 years ago
Ruwan bde0965efe
Merge pull request #1119 from charithag/master
7 years ago
charitha f2fbf97b91 Reverting to column name based return of the generated keys as Statement.RETURN_GENERATED_KEYS are not handled consistently by H2 engine
7 years ago
charitha a966dc2655 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
lasantha 460bda420b adding role restriction DAO layer implementation
7 years ago
WSO2 Builder 16750a6f96 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare for next development iteration
7 years ago
WSO2 Builder 46c732a2a9 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare release v3.0.178
7 years ago
charitha 0f7e8b6435 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha 713c6a6755 Merge branch 'patch-1' of https://github.com/thomsonimjd/carbon-device-mgt
7 years ago
Charitha Goonetilleke c281374d95
Merge pull request #977 from dunithd/master
7 years ago
dunithd 7cdea248f7 Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
7 years ago
Dunith Dhanushka 7f9cf0ffea Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
7 years ago
lasantha d196e3e0e1 Adding DAO layer changes
7 years ago
WSO2 Builder 22fac48873 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare for next development iteration
7 years ago
WSO2 Builder 62678dd003 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare release v3.0.177
7 years ago
WSO2 Builder 3c027abbe4 Merge commit '41db467d7bf07bd76154b5588de8bdd34846bdae' into 36ea68d0-099b-430f-9991-b7f08d7b61ff
7 years ago
Ruwan 8ebf3eb8fa
Merge pull request #1070 from warunalakshitha/remote-control
7 years ago