Commit Graph

1583 Commits

Author SHA1 Message Date
Hasunie
36cbc96713 adding swagger annotations 2016-12-08 16:04:46 +05:30
Madawa Soysa
548213d601 Fixing issue with COSU policy configuration 2016-12-08 14:22:23 +05:30
Rasika Perera
f8817988b6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 14:03:18 +05:30
Madawa Soysa
22dccce027 IOTS-296: Moving windows operation-mod to android plugin
This commit moves the operation-mod functions to windows plugin and refactor policy CRUD code to use plugin specific operation mod functions.
2016-12-08 12:26:36 +05:30
Menaka Jayawardena
49ee7c2986 Added new battery history chart gadget. 2016-12-08 12:16:22 +05:30
Menaka Jayawardena
779435a91d Persisting battery data stream and added analytics scripts. 2016-12-08 12:15:43 +05:30
Madawa Soysa
0b8db53b91 IOTS-296: Moving android operation-mod to android plugin
This commit moves the operation-mod functions to android plugin and refactor policy CRUD code to use plugin specific operation mod functions.
2016-12-08 10:32:35 +05:30
Rasika Perera
c722dfa779 Adding ui permissions to the operations on android 2016-12-07 22:57:53 +05:30
Menaka Jayawardena
2bd3c4a50c Added android sense battery execution plan. 2016-12-07 17:19:27 +05:30
Megala
f808478c92 Fixing bundle loading problem 2016-12-07 15:29:32 +05:30
inoshperera
fc3cb449be adding UI for clear passcode 2016-12-07 14:35:22 +05:30
Menaka Jayawardena
0e32b646d3 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
# Conflicts:
#	components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
2016-12-07 12:09:50 +05:30
Menaka Jayawardena
8ad1b0a891 Removed unwanted analytics graphs and added redirect to portal app. 2016-12-07 11:57:46 +05:30
Megala
82c2227929 Merge remote-tracking branch 'upstream/release-3.0.x' into embed 2016-12-07 11:03:48 +05:30
sinthuja
f23fd9c85f Merge branch 'android-sense-agent-fixes' into release-3.0.x 2016-12-07 11:00:49 +05:30
Hasunie
0456502bbe implementing windows 10 enrollment 2016-12-07 09:18:43 +05:30
Menaka Jayawardena
8a759db8da Changed the type check of location execution plan to 'gps'. 2016-12-07 01:32:18 +05:30
Megala
6e23d498b8 Fixing the parent path problem 2016-12-06 21:35:44 +05:30
Charitha Goonetilleke
7fa0a4b11f Merge pull request #454 from madawas/IOTS-296
IOTS-296: Genaralizing policy view UI for windows and android
2016-12-06 19:11:24 +05:30
charitha
5fc3e82d35 Fix agent download issue 2016-12-06 19:00:56 +05:30
sinthuja
ce8134bd28 Merge pull request #456 from Megala21/embed
Fixing the version problem
2016-12-06 17:46:33 +05:30
Megala
5a3809b493 Fixing the version problem 2016-12-06 17:40:27 +05:30
sinthuja
fa933059da Merge pull request #455 from Megala21/embed
Adding siddhi extension and analytics for android-agent
2016-12-06 17:32:50 +05:30
Megala
363dedaedd Adding the focus point for map 2016-12-06 17:29:41 +05:30
Megala
02f87e7531 Removing unwanted files 2016-12-06 17:26:35 +05:30
Menaka Jayawardena
a2e8537fcf Changed the realtime gadgets to get query parameters. 2016-12-06 17:26:00 +05:30
Ace
17f82d1da3 Adding changes to descriptor and ui changes 2016-12-06 17:22:45 +05:30
Megala
4bfd9a72b6 Adding siddhi extension and analytics for android-agent 2016-12-06 17:18:20 +05:30
sinthuja
6426a87c8d Fixing 'The cache status is not STARTED' issue whe sending the events from android sense. 2016-12-06 16:40:18 +05:30
Rasika Perera
ac51eadade Merge pull request #423 from ctienshi/master
Corrected spelling mistake
2016-12-06 16:36:43 +05:30
inoshperera
d3c5625eec Merge pull request #451 from inoshperera/master
adding a button and connection to ios factory reset backend API
2016-12-06 13:53:52 +05:30
Ace
3d21f84a76 merging with upstream 2016-12-06 13:34:28 +05:30
Ace
3dd59ed250 Adding changes to descriptor and ui changes 2016-12-06 13:31:41 +05:30
Madawa Soysa
cb44d9a824 IOTS-296: Genaralizing policy view UI for windows and android
Moving device type specific UI components related to policy view. This commit includes modifications for both android and windows plugins.
2016-12-06 12:22:25 +05:30
sinthuja
59fd3a6fc7 Merge pull request #450 from menakaj/android-sense-agent-fixes
Android sense agent fixes
2016-12-06 10:53:38 +05:30
Menaka Jayawardena
1cb9be42fd Corrected package names. 2016-12-05 21:49:15 +05:30
Menaka Jayawardena
9e92fc6963 Added classes for reading network data. 2016-12-05 21:48:22 +05:30
Imesh Chandrasiri
c884ec34d1 Fixing text overlapping and UX issues in device pages commit 2 2016-12-05 16:20:32 +05:30
Imesh Chandrasiri
f642b18b29 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-05 16:13:41 +05:30
Imesh Chandrasiri
ba0eea6344 Fixing text overlapping and UX issues in device pages 2016-12-05 16:13:23 +05:30
Megala
ba0c973aa9 Addding execution plan 2016-12-05 15:32:21 +05:30
Megala
453989db03 Adding execution plan for android sense geolocation 2016-12-05 15:27:55 +05:30
Menaka Jayawardena
60cc084170 Modifications for Android Sense app.
1. Updated agent enrollment process.
2. Fixed ArrayIndexOutOfBound exception when enrolling.
3. Added Network data to the event stream.
2016-12-05 15:10:44 +05:30
Charitha Goonetilleke
c9a8566e94 Merge pull request #446 from DimalChandrasiri/release-3.0.x
Layout changes for device enrollment views
2016-12-05 14:19:44 +05:30
sinthuja
9e9a480486 Merge pull request #447 from Megala21/embed
Adding minor fixes to geo fencing
2016-12-05 14:12:30 +05:30
Megala
f851b15e49 Reverting changes to android-sense 2016-12-05 13:49:20 +05:30
Megala
e55c380120 Removing the hard coded type 2016-12-05 13:43:15 +05:30
Charitha Goonetilleke
e4ce5a29fa Merge pull request #445 from GPrathap/release-3.0.x
added expiration time of application access token
2016-12-05 12:53:28 +05:30
Imesh Chandrasiri
446e2427e0 Layout changes for device enrollment views commit 2 2016-12-05 12:15:29 +05:30
Imesh Chandrasiri
b55c64d551 Layout changes for device enrollment views 2016-12-05 11:49:40 +05:30
Ace
749f680dad Adding missed configurations 2016-12-05 10:42:01 +05:30
Ace
8a96aa204c Adding generalizations to android-operations bar 2016-12-05 10:35:40 +05:30
GPrathap
752b2e8dbf added expiration time of application access token 2016-12-05 09:57:10 +05:30
Megala
7045a94615 Changing the publishes and execution plans to work with android-sense 2016-12-03 23:02:10 +05:30
Megala
09805d451c Adding initial fixes for geo dashboard 2016-12-03 02:59:53 +05:30
Madawa Soysa
3ed9b530f5 IOTS-296: Generalizing policy UI for windows device type
This commit includes moving policy flow device type specific client side logic and UI components to the windows plugin.
2016-12-02 17:06:02 +05:30
Madawa Soysa
37f0bc396d IOTS-296: Moving policy profile generation to android plugin
Policy profile generation part is removed from the CDMF core and moved to plugins as policy profile is dependent on the device type. In this commit, policy profile generation for android device type is implemnted in android plugin.
2016-12-02 17:03:19 +05:30
WSO2 Builder
619dab548e [maven-release-plugin] prepare for next development iteration 2016-12-01 13:52:49 +00:00
WSO2 Builder
4a0aa3be8e [maven-release-plugin] prepare release v3.0.2 2016-12-01 13:50:48 +00:00
charitha
ee496d93fe removed unnecessary logs 2016-12-01 17:18:57 +05:30
charitha
e6eb6bb2d2 Merge branch 'release-3.0.x' of https://github.com/hasuniea/carbon-device-mgt-plugins into release-3.0.x 2016-12-01 17:08:57 +05:30
charitha
693515c4df Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-01 16:48:05 +05:30
madhawap
d7c3f5c18a refactored code 2016-12-01 16:34:49 +05:30
Hasunie
8ff55aada8 changing add enromment 2016-12-01 16:21:57 +05:30
Hasunie
b19629ab23 adding windows enrollment image 2016-12-01 16:20:05 +05:30
madhawap
d66292f933 refactored code 2016-12-01 16:11:01 +05:30
madhawap
429b52f037 resolve conflicts 2016-12-01 16:04:43 +05:30
madhawap
3249079965 Seperate out task operations 2016-12-01 15:41:07 +05:30
Megala
5ec4e7dcb2 Adding IOT statistics dashboard feature 2016-12-01 14:06:01 +05:30
Hasunie
fc10431b41 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-01 09:42:40 +05:30
Hasunie
35ba0b2a9b fixing windows enrollment flow 2016-12-01 09:40:29 +05:30
Hasunie
0fd317d027 adding windows operation bar 2016-12-01 09:35:01 +05:30
Hasunie
fa6ef30d17 fixing windows device view issues 2016-12-01 09:26:14 +05:30
charitha
721e6e2321 Bug fixes 2016-11-30 19:06:27 +05:30
Ruwan
84dd19a53c Merge pull request #437 from charithag/release-3.0.x
Move geo dashboard to components
2016-11-30 18:26:15 +05:30
charitha
2ca8e732de Move geo dashboard to components 2016-11-30 18:15:33 +05:30
Chatura Dilan
7dc3535af6 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2016-11-30 17:24:35 +05:30
Chatura Dilan
df20fbc0aa Added COSU policy wizard 2016-11-30 17:24:13 +05:30
Charitha Goonetilleke
621ef6fd37 Merge pull request #436 from ruwany/release-3.0.x
Adding android operations-bar related changes
2016-11-30 17:09:33 +05:30
Ace
326d59e7c1 Adding android operations-bar related changes 2016-11-30 16:51:49 +05:30
Charitha Goonetilleke
ac50d49e8f Merge pull request #435 from lgobinath/feature-android-analytics-new-sensors
Add new sensors to the android sense plugin
2016-11-30 15:06:34 +05:30
Gobinath
ab418dbde3 Add new sensors to the android sense plugin
Incoming and outgoing calls tracker
    Screen on off detector
    SMS tracker
    Audio playing and headset tracker
    Application install and uninstall detector
    User activity detector
2016-11-30 14:55:53 +05:30
GPrathap
00a12f3ae1 removed oauth token sending as query param 2016-11-30 12:52:51 +05:30
GPrathap
b3a7ed91c0 oauth token retrieval mechanism changed
Now oauth token is taken from http cookie
2016-11-30 12:50:50 +05:30
Madawa Soysa
215fd51ffb Merge pull request #426 from madawas/IOTS-296
IOTS-296: Generalizing policy UI for Android device type
2016-11-29 18:37:32 +05:30
WSO2 Builder
4ae70fe1f1 [maven-release-plugin] prepare for next development iteration 2016-11-29 10:24:35 +00:00
WSO2 Builder
42c2b04c62 [maven-release-plugin] prepare release v2.2.7 2016-11-29 10:12:05 +00:00
Harshan Liyanage
3787ae1431 Merge pull request #431 from wso2/release-2.2.6
Updating component versions after release.
2016-11-29 15:34:08 +05:30
Harshan Liyanage
3673e38274 Updated android agent apk 2016-11-29 15:24:39 +05:30
WSO2 Builder
ab087bf934 [maven-release-plugin] prepare for next development iteration 2016-11-29 07:23:41 +00:00
WSO2 Builder
072dd089ef [maven-release-plugin] prepare release v2.2.6 2016-11-29 07:21:29 +00:00
Hasunie
1038c23c98 adding windows qr-code scanner 2016-11-29 11:24:22 +05:30
Harshan Liyanage
02baf19cc7 Added latest android agent 2016-11-29 10:35:14 +05:30
inoshperera
a9ca9cf352 adding a fix for web app user retrival. 2016-11-28 22:36:48 +05:30
Madawa Soysa
ea7da0724f IOTS-296: Generalizing policy UI for Android device type
This commit includes moving policy flow device type specific client side logic and UI components to the android plugin.
2016-11-28 16:45:10 +05:30
inoshperera
c36681baac Fixing the issue of duplicate application operations being set to the same device. 2016-11-28 16:18:46 +05:30
dilanua
4e001afef2 Changing emm device statistics menu item to work with relative path 2016-11-28 15:19:35 +05:30
geethkokila
b7f3691d90 Fixing the app manager issue by calling the correct getDevices method 2016-11-27 07:40:44 +05:30
dilanua
6de9925198 Changing EMM device statistics menu icon 2016-11-26 09:29:24 +05:30
dilanua
9fb5c3fd93 Fixes to JIRA: https://wso2.org/jira/browse/EMM-1845 2016-11-26 08:30:54 +05:30
Megala
7b3be4294e Fixing problems in displaying operation bar for ios 2016-11-25 15:49:10 +05:30
ching
074e500cda Corrected spelling mistakes in the UI 2016-11-25 15:28:00 +05:30
ching
c8315101c3 Corrected spelling mistakes in the UI 2016-11-25 15:23:59 +05:30
WSO2 Builder
bfa2c5fa61 [maven-release-plugin] prepare for next development iteration 2016-11-25 09:14:26 +00:00
WSO2 Builder
09d434bda9 [maven-release-plugin] prepare release v3.0.1 2016-11-25 09:11:13 +00:00
Charitha Goonetilleke
cd30635715 Merge pull request #422 from DimalChandrasiri/IoTS-1.0.0
Changes for IoT build
2016-11-25 11:00:44 +05:30
Megala
6c9c4a15fd Removing the sender id 2016-11-25 09:44:23 +05:30
sinthuja
4da1d5ec3a Adding JSON message format support for secure-websocket. 2016-11-25 00:08:09 +05:30
GPrathap
dca34e7fb3 added cron expression 2016-11-24 18:46:16 +05:30
Imesh Chandrasiri
bc075dedf0 Changes for IoT build 2016-11-24 18:29:35 +05:30
inoshperera
78232cd34c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-11-24 16:09:04 +05:30
inoshperera
18c0760ba5 Changing gcm endpoint to fcm 2016-11-24 16:08:48 +05:30
Harshan Liyanage
e1afb5bcdc Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-11-24 13:40:06 +05:30
inoshperera
3b867a533d fixing http status code 2016-11-24 12:46:33 +05:30
Harshan Liyanage
6cc3f39dd3 Added security filters to emm-web-agent app 2016-11-24 12:36:36 +05:30
GPrathap
dd86f91de6 moved from org.wso2.carbon.device.mgt.iot.androidsense.analytics2 2016-11-23 23:49:51 +05:30
inoshperera
d9a449dd26 adding modify enrollment capability to save chnages in enrollment such as GCM token update 2016-11-23 12:36:05 +05:30
ayyoob
cf5525dc3f removed device type and feature annotation 2016-11-21 20:55:12 +05:30
ayyoob
d6bfce396d Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-21 19:18:32 +05:30
ayyoob
c7a29f0637 few changes in coding issues 2016-11-21 19:14:21 +05:30
sinthuja
cf1782391f Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-21 17:10:28 +05:30
sinthuja
d3d176ebdc fixing some issues in the andriod analytics carbon apps. 2016-11-21 17:10:10 +05:30
inoshperera
b027f5dbe9 adding a button and connection to ios factory reset backend API 2016-11-21 11:53:33 +05:30
Ace
f3de1cf85e Adding windows-web-agent 2016-11-21 11:15:30 +05:30
dilanua
1cce94cef9 Fixing operation button stuck issue 2016-11-20 22:31:27 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
dilanua
861c5f861e Updating device statistics menu item url 2016-11-20 12:09:59 +05:30
dilanua
dbeedf246b Adding deviceStatisticsEnabled property to check visibility of device-statistics menu item 2016-11-20 10:55:56 +05:30
ayyoob
bfb9c62968 changed device access verification approach 2016-11-20 02:37:42 +05:30
dilanua
edd400bde4 Changing menu item names 2016-11-18 19:54:59 +05:30
Ruwan
93ed31c584 Merge pull request #413 from ayyoob/IoTS-1.0.0
changes in operation bar and deployer files
2016-11-18 16:52:08 +05:30
ayyoob
68f1fb34fe changes in operation bar and deployer.xml 2016-11-17 23:33:26 +05:30
sinthuja
f3fc531a53 Adding the new version of android analytics carbon apps. 2016-11-17 22:51:54 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00
WSO2 Builder
4746bf0c74 [maven-release-plugin] prepare release v3.0.0 2016-11-16 13:55:17 +00:00
Ace
ae33d236fa Adding android device-view changes 2016-11-16 15:43:23 +05:30
Ace
7e3df67548 Adding android-base-plugin 2016-11-16 15:07:44 +05:30
charitha
1170263139 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:45 +05:30
Dilan U. Ariyaratne
9c69e914e0 Merge pull request #409 from Megala21/master
Adding additional configurations to SSO
2016-11-16 11:04:25 +05:30
inoshperera
e25e9fd4a1 adding support for webclip uninstallation for ios 2016-11-16 09:33:43 +05:30
Megala
3ff394902e Removing unnecessary require statements 2016-11-15 23:04:51 +05:30
Megala
6d3fbc422f Adding link for the dashboard in tenant mode 2016-11-15 22:59:12 +05:30
Megala
57e46525f8 Changing the dashboard menu to be only visible for super-tenant users 2016-11-15 10:25:33 +05:30
Megala
dec2950f6e Adding additional configurations for app-conf 2016-11-13 19:21:15 +05:30
Malintha Fernando
5722a9fbe6 Fixing javax.xml.parsers.import.pkg.version issue 2016-11-11 14:04:23 +05:30
Ace
ea14e32337 Adding android-web-agent 2016-11-11 10:05:12 +05:30
Malintha Fernando
09f004bfd8 importing javax.xml package for javax.xml.XMLConstants 2016-11-11 06:38:36 +05:30
sinthuja
0ef0d871fb fixing the issues when reading the mqtt receiver configurations. 2016-11-10 21:23:14 +05:30
Kamidu Sachith Punchihewa
218e7aa58f Merge pull request #406 from Malintha/master
Adding secured documentBuilder factory
2016-11-10 15:08:25 +05:30
Malintha Fernando
13cb358153 Adding secured documentBuilder factory 2016-11-10 15:04:03 +05:30