Commit Graph

1367 Commits (e7a5392aa214e0a0b1e9a61f835cb3dea43388fd)

Author SHA1 Message Date
Nirothipan 6acf7c4225 edits in print messages in kilServer Method
8 years ago
Nirothipan 702287e09b Adding kill-server method
8 years ago
Nirothipan d786b7d839 Edits
8 years ago
Nirothipan b1e8687751 Code clean up
8 years ago
Nirothipan 7c5c0de4ee README changes
8 years ago
Hasunie 2dc23d0574 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Nirothipan 1e10d31801 README changes
8 years ago
Nirothipan 5e7a0c73ec Edits in README
8 years ago
Nirothipan 603ec856a6 type corrections
8 years ago
Nirothipan f70cc79590 correction
8 years ago
Nirothipan 9569b0bba7 correction
8 years ago
Nirothipan 424a02fa20 edits
8 years ago
Nirothipan eee153eee9 Adding org.wso2.carbon.device.mgt.mobile.android.emulator module
8 years ago
Nirothipan 0a0448ab97 Android Emulator client
8 years ago
WSO2 Builder 25de54d79d [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare for next development iteration
8 years ago
WSO2 Builder d5ca9bec5c [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare release v4.0.2
8 years ago
Pasindu bfe680ca95 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
ayyoob d1500dcd6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
Janak Amarasena 22e9cca3f3 UI fixes
8 years ago
Rasika Perera 13d777ff71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
8 years ago
WSO2 Builder 428fabd043 [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare for next development iteration
8 years ago
WSO2 Builder 2e8fb5739b [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare release v4.0.1
8 years ago
WSO2 Builder a72dbe91ef [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare for next development iteration
8 years ago
WSO2 Builder 5be8ef0a50 [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare release v4.0.0
8 years ago
Hasunie 592d6e7085 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
ayyoob fd369d55de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
Rasika Perera cac3600070 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
8 years ago
Hasunie 40ee0203aa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Harshan Liyanage ed28a72483 Prevented getDevice calls from loading uncessary device-info.
8 years ago
WSO2 Builder 657178a829 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare for next development iteration
8 years ago
WSO2 Builder b6d9066cb6 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare release v3.0.42
8 years ago
Rasika Perera 4713448c4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
8 years ago
ayyoob 2afa84bfb4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
WSO2 Builder 266d49f812 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare for next development iteration
8 years ago
WSO2 Builder 8def362081 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare release v3.0.41
8 years ago
ayyoob 64107c3386 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
WSO2 Builder 8e29ae8cae [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare for next development iteration
8 years ago
WSO2 Builder 3a27834115 [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare release v3.0.40
8 years ago
Pasindu f0a9c0b78f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder b9ad0c9eed [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare for next development iteration
8 years ago
WSO2 Builder 6179ccc4fc [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare release v3.0.39
8 years ago
Hasunie c627699bdf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Rasika Perera 7aa2cfde67 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Rasika Perera dcbf9f30b0 Removed publishing into org.wso2.android.agent.Stream
8 years ago
Pasindu eb9be0e124 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Pasindu 096ea49ab9 Daily commit
8 years ago
ayyoob 6242fde431 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
WSO2 Builder d708765bda [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare for next development iteration
8 years ago
WSO2 Builder 4f9d50ca91 [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare release v3.0.38
8 years ago
Harshan Liyanage a3abf93715 Code refactoring which Resolves harshanl/product-iots#518
8 years ago
Hasunie 30eb8ca91d adding debug logs to GlobalThrowableMapper
8 years ago
Rasika Perera e6de7a4d90 Removed android analytics feature, a common set of streams,execution plan and receivers will be used
8 years ago
ayyoob a1fb2ed9c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
8 years ago
ayyoob 8381070bf6 Implemented Pull Notification Support
8 years ago
Rasika Perera 9d336caee8 Fixes to geo-fencing ui
8 years ago
Rasika Perera 7b88ae13ba Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt-plugins
8 years ago
Harshan Liyanage ca0a9be6a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Harshan Liyanage ea5c865826 Resolves harshanl/product-iots#518
8 years ago
Rasika Perera 84711e58c6 Added geo-fencing to the devicemgt app
8 years ago
Pasindu ee9c3ad5ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder e7af2ee4a4 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare for next development iteration
8 years ago
WSO2 Builder dff15c5978 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare release v3.0.37
8 years ago
Pasindu f49ecb2539 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
ayyoob 94d626ca3c changed event definition
8 years ago
madhawap af0ce14af1 Adding android agent apk after pasindujw's fixes
8 years ago
madhawap a1a8ac3c71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
ayyoob b32bf11c91 fixed multi tenant issues after testing thrift endpoint with multitenant
8 years ago
Pasindu 4f4d783c37 Runtime permission policy per app changes
8 years ago
Pasindu 5bb1662dfb Resolve merging errors happened previously
8 years ago
Pasindu 444dbdf865 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder 84e12c7cca [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare for next development iteration
8 years ago
WSO2 Builder 400da8f05e [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare release v3.0.36
8 years ago
Pasindu 1d832234df Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder 9fcee2917f [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare for next development iteration
8 years ago
WSO2 Builder c0c002a34b [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare release v3.0.35
8 years ago
Pasindu 1c358dac44 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Hasunie 3727bcb1e1 Merge pull request #660 from sameeragunarathne/master
8 years ago
Pasindu 913cc567fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Pasindu b8a0fd04e7 merge fix
8 years ago
kamidu 103b795a86 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
kamidu 0c1ff01697 chaning the notification msg
8 years ago
WSO2 Builder 2242a1169b [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare for next development iteration
8 years ago
WSO2 Builder 87bccbdf1c [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare release v3.0.34
8 years ago
madhawap a2897012f9 Fix for disabling reboot and upgrade-firmware operations on UI
8 years ago
Pasindu 5f700c5b4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Pasindu 60470d039a Creating runtime permission policy for android devices
8 years ago
ayyoob 33f73eb2b3 merged with origin
8 years ago
ayyoob 06d646c87a moved artifact deployment to the platform configuration
8 years ago
WSO2 Builder f0a70d7f27 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration
8 years ago
WSO2 Builder 24460ebde1 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33
8 years ago
WSO2 Builder df7df6ffa6 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3cdec9843a [maven-release-plugin] prepare release v3.0.32
8 years ago
ayyoob 359184429e Added missing fixes that was done for multi tenancy in cloud branch
8 years ago
WSO2 Builder 2db4069053 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration
8 years ago
WSO2 Builder 902d7e3cf2 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31
8 years ago
warunalakshitha 543e68771e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder e2becd3169 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration
8 years ago
WSO2 Builder 85c36c0ca8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30
8 years ago
warunalakshitha 568538cc13 add comments for performance configs
8 years ago
WSO2 Builder c3fb32f3bc [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration
8 years ago
WSO2 Builder 1b0047c39f [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29
8 years ago
WSO2 Builder 99e587eb78 [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration
8 years ago
WSO2 Builder 9b8929a8cd [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28
8 years ago
Kamidu Sachith Punchihewa 6759a99ae9 Merge pull request #657 from rasika/master
8 years ago
sameera910409 08adfda735 fix multi tenant issues in windows device enrollment
8 years ago
Rasika Perera 511c61175c #654 : Fixing Android policy view and policy edit doesn't honor isCloud enabled parameter
8 years ago
WSO2 Builder 1a91d1ddc0 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration
8 years ago
WSO2 Builder 426a016c37 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27
8 years ago
WSO2 Builder de5ff24046 Merge commit 'dc4c32129ac05dfe6247cb060cc0949fcdf5c2ed' into db9e6dc2-9fc6-4b4a-8465-9e6ea06cdee0
8 years ago
WSO2 Builder dc4c32129a [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration
8 years ago
WSO2 Builder b1c6ae0e2c [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26
8 years ago
charitha 9febce0601 Add latest agent (3.1.16)
8 years ago
Charitha Goonetilleke 186b3e16e4 Merge pull request #653 from ruwany/master
8 years ago
WSO2 Builder 72fab84bf9 [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration
8 years ago
WSO2 Builder 5ff67af60a [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25
8 years ago
charitha de0cb9a5a2 Add agent 3.1.15 for cloud
8 years ago
charitha ab91e3a6b0 Fixed https://github.com/wso2/cdmf-agent-android/issues/33
8 years ago
charitha d80c25ed2b Updating UIs of agents to latest
8 years ago
Rasika Perera a1b0298374 Updating android agent into latest
8 years ago
Rasika Perera 51a613f167 Resolving #642 : Improve UX on location updates for Android
8 years ago
WSO2 Builder 4c0e505008 [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration
8 years ago
WSO2 Builder b653b4871d [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24
8 years ago
amalhub ec75361c57 Adding latest android-agent.apk (https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13)
8 years ago
WSO2 Builder 7a2b64605f [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration
8 years ago
WSO2 Builder 908ee841e9 [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23
8 years ago
WSO2 Builder 84220e2c25 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare for next development iteration
8 years ago
WSO2 Builder 5da8bf98b8 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22
8 years ago
kamidu bcdd78ae68 Merge branch 'master' into cloud-3.1.0
8 years ago
kamidu dc0fda3925 fixing location and operation loading ui issues
8 years ago
kamidu eb7a83bcc8 fixing location and operation loading ui issues
8 years ago
kamidu 9d3949ea37 enabling loading for location refrsh
8 years ago
kamidu 1d663e1b68 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
kamidu 4662db6701 device status fic
8 years ago
charitha 6f3578f797 Adding agent 3.1.7 for cloud
8 years ago
kamidu 9ad8cb21ae android enrollment ui fixes and operation in progress animation fix
8 years ago
Kamidu Sachith Punchihewa 8f169d0116 Revert "Updated device-mgt version & interface."
8 years ago
kamidu 2abd8823a3 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
Harshan Liyanage ff5a1c9c5d Updated device-mgt version & interface.
8 years ago
kamidu ee24a8baea merging upstream cloud-3.1.0
8 years ago
kamidu ace58b6649 policy filtering and location reload for cloud
8 years ago
WSO2 Builder 2cf8496351 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare for next development iteration
8 years ago
WSO2 Builder 7d6def8976 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21
8 years ago
charitha 6398d79760 Fix https://github.com/wso2/product-iots/issues/332
8 years ago
charitha 0e4df87dda Fix https://github.com/wso2/product-iots/issues/332
8 years ago
charitha 110c9405b1 Update device enrollement steps
8 years ago
charitha ca8ad9f528 Update device enrollement steps
8 years ago
WSO2 Builder de5f854367 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare for next development iteration
8 years ago
WSO2 Builder 13cbce1e37 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20
8 years ago
charitha 179cc93c1a Downgraded android OS version to avoid ANR
8 years ago
charitha 6ea597233b Add google play store links to device enrollment page
8 years ago
charitha 572d85dbd1 Instruct mac users to restart after installing HAXM
8 years ago
charitha e13aa77b21 Downgraded android OS version to avoid ANR
8 years ago
charitha 2d67d33eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
charitha 243a3df89d Add google play store links to device enrollment page
8 years ago
WSO2 Builder 0f3318e353 [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare for next development iteration
8 years ago
WSO2 Builder 41041f3f6d [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19
8 years ago
charitha d8218ef221 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
charitha b53fe60807 Instruct mac users to restart after installing HAXM
8 years ago
WSO2 Builder cf3d543fea [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration
8 years ago
WSO2 Builder 59194a1286 [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18
8 years ago
charitha 52060c9d40 Fixed unzipping issue in tryit tool
8 years ago
charitha 33342e0e97 Fix documentation links
8 years ago
charitha 01187db029 Fixed unzipping issue in tryit tool
8 years ago
WSO2 Builder 82ac8417d3 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration
8 years ago
WSO2 Builder d0e9362ee1 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17
8 years ago
charitha 6aee69ef5b Updated splash screen images
8 years ago
charitha 8ee81f497d Adding latest Android agent
8 years ago
charitha 3bfa383cea Adding Android-tryit tool
8 years ago
sameera910409 d907f1bc51 fix https://wso2.org/jira/browse/EMM-1880
8 years ago
WSO2 Builder 2049e44319 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration
8 years ago
WSO2 Builder d15dc25c13 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16
8 years ago
Geeth bc7b77e07a Merge pull request #622 from charithag/master-androidtryit
8 years ago
charitha c3e241e1d5 Adding Android-tryit tool
8 years ago
WSO2 Builder 8df6e56f40 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration
8 years ago
WSO2 Builder 2e8f5a63d2 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15
8 years ago
Harshan Liyanage 893eccd817 Merge pull request #618 from hasuniea/master
8 years ago
Harshan Liyanage bd2ded8563 Removed unnecessary braces.
8 years ago
Susinda 1c13f1b97d Cloud and general doc links issue fixed
8 years ago
Hasunie 809a30fc7a fixing code format issue
8 years ago
Hasunie 7de234c164 resolved #616
8 years ago
Hasunie 42cc311f00 Fixing NPE in AndroidAPIUtils
8 years ago
Hasunie 143569b83b Fixing null property in AndriodAPIUtils
8 years ago
Hasunie a30fbfdbec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder c49b33bb4a [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration
8 years ago
WSO2 Builder e1064dca07 [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14
8 years ago
Kamidu Sachith Punchihewa 95f64b0a15 Merge pull request #615 from wso2/cloud-3.1.0
8 years ago
WSO2 Builder 68f329cbda [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration
8 years ago
WSO2 Builder 8669d1b44e [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13
8 years ago
Harshan Liyanage 2753deb365 Merge pull request #602 from sameeragunarathne/master
8 years ago
Harshan Liyanage 1882171824 Merge pull request #611 from Kamidu/cloud-3.1.0
8 years ago
WSO2 Builder 18d3518236 [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration
8 years ago
WSO2 Builder 867790d3cb [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12
8 years ago
kamidu c97dfb4080 android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local
8 years ago
sameera910409 078209347a refactor code for firebase cloud messaging
8 years ago
Susinda 1ebc84450f revert the implementation 'agent download from github release'
8 years ago
Susinda 286d293ddd revert the implementation 'agent download from github release'
8 years ago
Susinda 7c3d94cf77 Added README file to avoid git ignoring empty dirs
8 years ago
Susinda f96389e671 Android agent downloadded from github relese location, Hasuni's fix on initial operations added
8 years ago
Susinda Perera fb6cfb6699 Merge pull request #1 from susinda/cloud-3.1.0
8 years ago
kamidu d2d56651cc fix for leaflet tile not loading issues
8 years ago
Harshan Liyanage b82a59c828 Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0
8 years ago
Hasunie 7fcf4e9a3b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
Hasunie 3e50f0b737 adding initial operations
8 years ago
Harshan Liyanage dc054e6ed5 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
Harshan Liyanage f2761e9b0a Removed info operation addition upon page load
8 years ago
ayyoob a10eb7cb14 removed feature
8 years ago
ayyoob 77ec1c4107 fixed operation bar permission rendering issue
8 years ago
kamidu 6604c23257 fix for leaflet tile not loading issues
8 years ago
susinda 5ad6dc1f1d Fxing PhoneNumber Serach for android
8 years ago
Susinda Perera 6f9ea52218 Merge pull request #593 from wso2/cloud-3.1.0
8 years ago
Kamidu Sachith Punchihewa 740bb976fa adding location operation to device view page
8 years ago
kamidu afaa75d3a9 adding screen shots
8 years ago
kamidu 463d8a9dff wording sugessions for cloud
8 years ago
Imesh Chandrasiri 20bd1b399b Removed conflict markings
8 years ago
Imesh Chandrasiri a890d9fb89 Device enrollment page revamp
8 years ago
Imesh Chandrasiri bccc47ebd2 Conflict fix
8 years ago
Imesh Chandrasiri 4b7637a426 Device enrollment page revampl
8 years ago
Imesh Chandrasiri 37b032d710 Merge branch 'cloud-3.1.0' into cloud-3.1.0
8 years ago
Imesh Chandrasiri 67313882ed Device enrollment page changes for cloud
8 years ago
kamidu 71c93eec29 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
kamidu 305df1c2bd enhansing the device cloud ui
8 years ago
kamidu 9d733d6cc1 Fixing android location issue
8 years ago
Susinda Perera 8a9affc4b8 Merge pull request #582 from ayyoob/210releasepatch
8 years ago
Imesh Chandrasiri f10e26f0a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
Imesh Chandrasiri 2fcd5ca020 Model Popup title space issue fix
8 years ago
Hasunie 0c87c32094 Merging changes
8 years ago
lakshani f5d71d917e Added change device status feature to mobile plugings
8 years ago
ayyoob a294c20a2a added device management api to be default
8 years ago
lakshani edb8e71ac2 Added change device status feature to mobile plugings
8 years ago
ayyoob dd3017578a added artefact deployment support for device types
8 years ago
Kamidu Sachith Punchihewa 68b36babe6 Merge pull request #575 from wso2/master
8 years ago
kamidu 53840dcc37 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration
8 years ago
WSO2 Builder 1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11
8 years ago
Hasunie 3b98e0f754 Merge pull request #572 from charithag/master-update-swagger-docs
8 years ago
charitha 9bf38af4f7 Fix issues in swagger docs
8 years ago
Milan Perera 99782e6360 Resolved conflicts and merged
8 years ago
Hasunie 1ab1def2b6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Hasunie fb28a4042f fixing windows config issues
8 years ago
Milan Perera cc8066896b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud
8 years ago
Milan Perera e1a419425e Added cloud agent to the download page
8 years ago
ayyoob 73eb590a7c renamed grant type to default
8 years ago
Kamidu Sachith Punchihewa 64cb8b5223 Update load-map.js
8 years ago
kamidu 55489d5e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
kamidu 192e1c3edc adding missing classes in hbs
8 years ago
WSO2 Builder 7034dae2b5 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder a2224f96ff [maven-release-plugin] prepare release v3.0.10
8 years ago
Hasunie f9bb3f6e89 removing swagger annotation from enrollment
8 years ago
Hasunie 3dc1418290 removing swagger annotation from enrollment
8 years ago
WSO2 Builder 4554d8929d [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration
8 years ago