Commit Graph

2542 Commits

Author SHA1 Message Date
Nirothipan
abe08f8560 changes due to change in folder structure of SDK 2017-06-23 15:42:40 +05:30
Nirothipan
d5a30724da chnages due to the file location of current sdk file formats 2017-06-23 15:20:37 +05:30
lasantha
4a32c90642 Adding latest Font WSO2 2017-06-23 14:56:37 +05:30
Pasindu
69561d49be Remove unwanted tabspace 2017-06-23 13:58:55 +05:30
Pasindu
27bfa583ba Remove unwanted spaces 2017-06-23 13:57:11 +05:30
Pasindu
e3f7466482 Remove unintentional changes happended during mergings 2017-06-23 13:54:33 +05:30
Pasindu
6af05fa75b Fix formatting and unwanted vars 2017-06-23 13:01:51 +05:30
Pasindu
9b33e378f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-23 11:54:16 +05:30
Harshan Liyanage
b9d026da5e Merge pull request #713 from Kamidu/master
fixing the back listing application view issue in policy view
2017-06-23 10:35:23 +05:30
Harshan Liyanage
2b671443fa Merge pull request #714 from hasuniea/master
Windows enrollment issue was resolved from wso2/product-iots#1029
2017-06-23 10:31:01 +05:30
Ayyoob Hamza
31de51e3d4 Merge pull request #710 from lasanthaDLPDS/master
Android Sense Migration
2017-06-23 09:48:22 +05:30
WSO2 Builder
2bb08d04ff [WSO2 Release] [Jenkins #2794] [Release 4.0.6] prepare for next development iteration 2017-06-23 08:14:21 +05:30
WSO2 Builder
ec798d6cee [WSO2 Release] [Jenkins #2794] [Release 4.0.6] prepare release v4.0.6 2017-06-23 08:14:07 +05:30
Pasindu
619db14ab3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-23 07:57:26 +05:30
Ayyoob Hamza
8707c7254b Merge pull request #705 from rasika/master
Changing artifact uploader admin service resource path
2017-06-23 05:36:40 +05:30
lasantha
9252970262 removing unnecessary unit 2017-06-22 23:01:40 +05:30
lasantha
12ebe74380 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 21:33:23 +05:30
WSO2 Builder
ad7b87917f [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare for next development iteration 2017-06-22 21:03:37 +05:30
WSO2 Builder
5888a5321a [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare release v4.0.5 2017-06-22 21:03:24 +05:30
kamidu
f1c054ae62 fixing the baclisting application view issue in policy view 2017-06-22 20:51:42 +05:30
lasantha
3774eb8d1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 20:42:40 +05:30
ayyoob
15bfa09a84 fixed commit issues 2017-06-22 20:37:19 +05:30
ayyoob
dc3420cadb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-22 20:22:14 +05:30
lasantha
20f3201f10 Adding required changes for Location Stream (geofence) 2017-06-22 20:12:10 +05:30
lasantha
de98cdeb32 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 17:52:34 +05:30
Kamidu Sachith Punchihewa
87255d05b1 Merge pull request #711 from dunithd/master
Adding new UX design for Raspberry Pi device details page.
2017-06-22 17:00:20 +05:30
dunithd
da21efe9be Adding new UX design for Raspberry Pi device details page. 2017-06-22 16:51:19 +05:30
lasantha
dab6eb7b17 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 16:00:23 +05:30
sinthuja
39f45539c8 Merge pull request #700 from Nirothipan/master
AndroidTryIt Emulator
2017-06-22 15:43:14 +05:30
Pasindu
01381d1254 fixes issue wso2/product-iots#990 2017-06-22 15:23:52 +05:30
Nirothipan
f141836cba adding space in print ln 2017-06-22 15:14:04 +05:30
Nirothipan
fe342b6eb3 Adding correction 2017-06-22 15:06:36 +05:30
Nirothipan
73a0176c3a removind version 2017-06-22 15:06:16 +05:30
lasantha
489073bdd4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 14:16:30 +05:30
Pasindu
80529706be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 14:05:03 +05:30
Pasindu
7e2b3220ea COSU profile configuration policy UI added. 2017-06-22 14:02:58 +05:30
kamidu
b2cba60b7d Fixing the wordinng missmatch in android virtual devices 2017-06-22 13:52:26 +05:30
Nirothipan
da6d525d25 copying jar file to target directory 2017-06-22 13:36:18 +05:30
Nirothipan
558cb57815 adding file permissions 2017-06-22 13:35:30 +05:30
Nirothipan
44e667d814 creating ant directory in target 2017-06-22 13:34:46 +05:30
Nirothipan
6aba44e6c7 Chnage in download Artifacts method 2017-06-22 13:33:45 +05:30
lasantha
d16c3a2daa Removing unnecessary log prints 2017-06-22 12:45:29 +05:30
kamidu
00a6b1b12c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 12:42:49 +05:30
lasantha
1e7664f206 Adding new Android sense real-time analytic view 2017-06-22 12:42:25 +05:30
kamidu
e39c2a1d8d Fixing Notification validation issue
;
2017-06-22 12:42:15 +05:30
lasantha
bb975d26f6 Adding new Android sense analytic view 2017-06-22 12:24:24 +05:30
lasantha
71a979ef0b Adding new Android sense device view 2017-06-22 12:11:54 +05:30
lasantha
98e0b38244 Adding Android sense API for batch analytics 2017-06-22 12:03:05 +05:30
lasantha
032b9a524c Adding a maximum event count 2017-06-22 12:00:04 +05:30
lasantha
74edcfe307 Adding table name into constant file 2017-06-22 11:57:16 +05:30
lasantha
f605a5cbd3 Removed word count feature from build.xml 2017-06-22 11:46:21 +05:30
lasantha
6b1c711ccb Resolved dependency issues 2017-06-22 11:44:37 +05:30
lasantha
42df1d1a23 Removed unnecessary stream configuration files 2017-06-22 11:42:46 +05:30
lasantha
ce703232e0 Renamed gravity streams 2017-06-22 11:18:54 +05:30
lasantha
bf732ec169 Renamed rotation streams 2017-06-22 11:15:05 +05:30
lasantha
977c6d12c2 Renamed gyroscope, magnetic, pressure and proximity streams 2017-06-22 11:12:26 +05:30
lasantha
e4c8e37c7a renamed stream names 2017-06-22 11:05:24 +05:30
lasantha
e7268d1977 rename filter audio stream 2017-06-22 11:02:06 +05:30
lasantha
26bc2d5716 Renamed device details and SMS stream names 2017-06-22 10:58:05 +05:30
Kamidu Sachith Punchihewa
b4be9ce670 Merge pull request #706 from dunithd/master
Adding new UX design for Windows/virtual fire alarm device details page
2017-06-22 10:54:04 +05:30
lasantha
9b02e40e18 Renamed location and screen stream names 2017-06-22 10:51:50 +05:30
lasantha
705013b5fd Renamed call and data stream names 2017-06-22 10:47:40 +05:30
lasantha
b64e47a26a Refactored Android battery artifacts 2017-06-22 10:41:26 +05:30
lasantha
4e15337655 Refactored Android audio artifacts 2017-06-22 10:38:29 +05:30
lasantha
f4aad41a34 refactored Android activity artifacts 2017-06-22 10:18:27 +05:30
lasantha
1518ef2d54 refactored android sense execution plan 2017-06-22 10:15:28 +05:30
lasantha
9585d31663 refactored accelerometer artifacts 2017-06-22 10:07:53 +05:30
lasantha
ca6f19931e removed dashboard files 2017-06-22 09:56:02 +05:30
ayyoob
61a3455ec5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-22 04:51:41 +05:30
Nirothipan
3fec4edf90 adding warn messages 2017-06-21 23:13:58 +05:30
Nirothipan
dbe3820290 changing file permissions 2017-06-21 22:53:31 +05:30
lasantha
f66fe4f598 Removed non-compliant features gadget, pressure gadget, and related UI publishers 2017-06-21 21:06:38 +05:30
lasantha
59860b960a Removed unnecessary gadgets and ui publishers from android sense 2017-06-21 20:17:07 +05:30
savidude
5755d5bbe3 Restructuring RaspberryPi analytics 2017-06-21 19:45:23 +05:30
savidude
239487d30a Providing a client ID to the agent 2017-06-21 19:42:54 +05:30
dunithd
16812a9943 Adding new UX design for Windows/virtual fire alarm device details page 2017-06-21 19:37:42 +05:30
lasantha
34e05c7a33 removed gyroscope, magnetic, proximity, realtime battery gadget, and related ui publisher 2017-06-21 19:06:32 +05:30
lasantha
f2fb62d85e removed gravity gadget and ui publisher 2017-06-21 18:19:11 +05:30
lasantha
b4e78959d1 removed unnecessary gadgets (Android details, Android device grouping, Android device search box, Android filtered by gadget, Android frequent contacts list) 2017-06-21 18:09:21 +05:30
Nirothipan
11774f5f8b changing version 2017-06-21 17:53:30 +05:30
Nirothipan
a2d703334a reformatting code 2017-06-21 17:34:20 +05:30
Nirothipan
6388ea1e45 getting the project verion automatically 2017-06-21 17:16:03 +05:30
Nirothipan
ef8b53960d README modified to be more clear 2017-06-21 17:15:31 +05:30
Nirothipan
e270290105 with corrections 2017-06-21 17:14:42 +05:30
Nirothipan
3361c79317 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-21 15:46:54 +05:30
Nirothipan
eccad44dff edits 2017-06-21 14:24:22 +05:30
Nirothipan
9a2fe3cfb1 edits 2017-06-21 14:11:51 +05:30
Nirothipan
14583ac30c ile permissions 2017-06-21 14:11:33 +05:30
Nirothipan
ce8893e41c Adding File Permissions 2017-06-21 14:10:42 +05:30
Kamidu Sachith Punchihewa
08992be99d Merge pull request #704 from dunithd/master
Applying new UX for Android device details page
2017-06-21 12:05:58 +05:30
Nirothipan
f4037a8885 Chaging Java App name 2017-06-21 11:27:14 +05:30
Nirothipan
0a6ddb3b0f Adding maven-dependency-plugin 2017-06-21 11:26:43 +05:30
Nirothipan
b646dc6801 removing output directory attribute 2017-06-21 11:26:05 +05:30
Rasika Perera
6b340597b4 Changing artifact uploader admin service resource path 2017-06-21 10:59:42 +05:30
Nirothipan
054c10df3e updates 2017-06-21 09:57:30 +05:30
Nirothipan
85346a531b . 2017-06-21 09:57:13 +05:30
Nirothipan
acc82acdbe Change of Module order 2017-06-21 09:56:40 +05:30
ayyoob
a983ae7c2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-21 04:11:33 +05:30
dunithd
c4fcaaf498 Applying new UX for Android device details page 2017-06-21 04:08:51 +05:30
Nirothipan
952a78b81b . 2017-06-21 00:12:45 +05:30
Nirothipan
7fc365f205 changes after code review 2017-06-20 23:52:35 +05:30
Nirothipan
ad09d0d21f adding constants 2017-06-20 20:30:12 +05:30
Nirothipan
414af3339e Givins as system properties 2017-06-20 20:29:40 +05:30
Nirothipan
944a28aae0 Adding correction 2017-06-20 20:28:58 +05:30
lasantha
22ecc0dd53 removed unnecessary gadgets 2017-06-20 20:11:26 +05:30
ayyoob
e708a4a7c5 few changes on analytics 2017-06-20 19:33:12 +05:30
savidude
a83b9a70ed Removing default policy in Virtual Firealarm advanced agent 2017-06-20 19:31:05 +05:30
WSO2 Builder
76a68034d1 [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare for next development iteration 2017-06-20 18:19:13 +05:30
WSO2 Builder
8a30ed71ee [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare release v4.0.4 2017-06-20 18:18:59 +05:30
Hasunie
fbd31b77ef Windows enrollment issue was resolved from wso2/product-iots#1029 2017-06-20 17:36:34 +05:30
Harshan Liyanage
452ea9a888 Merge pull request #698 from janakamarasena/high-priority-fixes
UI fixes
2017-06-20 17:24:20 +05:30
lasantha
228da3cf3e removed unnecessary UI publishers 2017-06-20 17:15:59 +05:30
lasantha
1c61e1a68d removed android activity chart gadget, android battery history chart gadget, android battery percentage chart gadget 2017-06-20 16:58:34 +05:30
lasantha
4afc699278 removed android active time chart gadget 2017-06-20 16:27:58 +05:30
lasantha
9f967b4e17 removed android active stack chart gadget 2017-06-20 16:18:38 +05:30
lasantha
b1dc1f8d88 removed accelerometer gadget 2017-06-20 16:07:35 +05:30
WSO2 Builder
b56771328f [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare for next development iteration 2017-06-20 15:49:39 +05:30
WSO2 Builder
3150193276 [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare release v4.0.3 2017-06-20 15:49:25 +05:30
lasantha
6a1dd284a1 Modified Android sense artifacts and removed word count feature 2017-06-20 15:38:24 +05:30
Harshan Liyanage
e81868b448 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-20 15:30:13 +05:30
Harshan Liyanage
dbfdb0d084 Prevented unnecessary API calls to fetch device-info if the device is disenrolled which resolves wso2/product-iots#429 2017-06-20 15:29:59 +05:30
Nirothipan
6acf7c4225 edits in print messages in kilServer Method 2017-06-20 11:12:31 +05:30
Nirothipan
702287e09b Adding kill-server method 2017-06-20 11:01:27 +05:30
Nirothipan
d786b7d839 Edits 2017-06-20 10:52:16 +05:30
Nirothipan
b1e8687751 Code clean up 2017-06-19 22:30:39 +05:30
Nirothipan
7c5c0de4ee README changes 2017-06-19 18:19:24 +05:30
Hasunie
2dc23d0574 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-19 18:17:48 +05:30
Nirothipan
1e10d31801 README changes 2017-06-19 18:14:41 +05:30
Nirothipan
5e7a0c73ec Edits in README 2017-06-19 18:04:57 +05:30
Nirothipan
603ec856a6 type corrections 2017-06-19 17:59:47 +05:30
Nirothipan
f70cc79590 correction 2017-06-19 17:57:57 +05:30
Nirothipan
9569b0bba7 correction 2017-06-19 17:42:51 +05:30
Nirothipan
424a02fa20 edits 2017-06-19 17:07:04 +05:30
Nirothipan
eee153eee9 Adding org.wso2.carbon.device.mgt.mobile.android.emulator module 2017-06-19 17:00:35 +05:30
Nirothipan
0a0448ab97 Android Emulator client 2017-06-19 16:58:37 +05:30
WSO2 Builder
25de54d79d [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare for next development iteration 2017-06-19 16:39:43 +05:30
WSO2 Builder
d5ca9bec5c [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare release v4.0.2 2017-06-19 16:39:28 +05:30
Pasindu
bfe680ca95 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-19 08:23:02 +05:30
ayyoob
d1500dcd6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-17 19:31:22 +05:30
ayyoob
b14ddd609a fixing few issues after testing 2017-06-17 18:54:39 +05:30
Janak Amarasena
22e9cca3f3 UI fixes 2017-06-16 16:53:28 +05:30
Rasika Perera
7b34fddf6e Updating version 2017-06-16 16:00:04 +05:30
Rasika Perera
13d777ff71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-16 15:50:57 +05:30
ayyoob
7117fdeafc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-16 03:47:46 +05:30
WSO2 Builder
428fabd043 [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare for next development iteration 2017-06-15 16:37:19 +05:30
WSO2 Builder
2e8fb5739b [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare release v4.0.1 2017-06-15 16:37:06 +05:30
Ayyoob Hamza
bf86b72a41 Merge pull request #697 from GDLMadushanka/master
Virtual fire alarm streams changed
2017-06-15 15:59:01 +05:30
WSO2 Builder
a72dbe91ef [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare for next development iteration 2017-06-15 15:32:45 +05:30
WSO2 Builder
5be8ef0a50 [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare release v4.0.0 2017-06-15 15:32:32 +05:30
GDLMadushanka
4397451cdd adding the temp stream back 2017-06-15 15:06:53 +05:30
GDLMadushanka
a089caf14e temperature stream added back 2017-06-15 15:02:42 +05:30
GDLMadushanka
b2d283eb8f Virtual fire alarm streams changed 2017-06-15 11:49:53 +05:30
Hasunie
592d6e7085 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-14 17:56:36 +05:30
ayyoob
e36fcfad37 updated version 2017-06-14 13:23:24 +05:30
ayyoob
fd369d55de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-14 13:19:26 +05:30
Rasika Perera
eb5552cf3d updating version 2017-06-14 11:34:28 +05:30
Rasika Perera
cac3600070 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-14 10:45:38 +05:30
Hasunie
40ee0203aa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-13 17:25:05 +05:30
Harshan Liyanage
ed28a72483 Prevented getDevice calls from loading uncessary device-info. 2017-06-13 17:12:40 +05:30
Rasika Perera
b8716e11b8 Fixing geo dashboard car file missing dependencies 2017-06-12 20:20:05 +05:30
Rasika Perera
72f53ba55c Fixing geo extension installer issue 2017-06-12 17:56:27 +05:30
WSO2 Builder
657178a829 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare for next development iteration 2017-06-12 16:20:24 +05:30
WSO2 Builder
b6d9066cb6 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare release v3.0.42 2017-06-12 16:20:03 +05:30
Rasika Perera
4894273230 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-12 15:59:59 +05:30
Rasika Perera
07ab82a0a8 Fixing typo 2017-06-12 15:53:02 +05:30
Rasika Perera
971001c43c Updating version 2017-06-12 15:38:10 +05:30
Rasika Perera
ecc070e0ea Removed siddhi gpl geo plugin dependencies 2017-06-12 15:37:55 +05:30
Rasika Perera
55a50aa679 Removed geo dashboard portal features 2017-06-12 15:34:47 +05:30
Rasika Perera
965f85a71e Removed gpl siddhi geo extension plugin 2017-06-12 15:33:34 +05:30
Rasika Perera
4713448c4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-12 15:14:08 +05:30
GDLMadushanka
16b85e8ff9 Removing hardcoded values 2017-06-12 12:23:27 +05:30
ayyoob
2afa84bfb4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-12 11:50:03 +05:30
GDLMadushanka
7138ba3953 button removed 2017-06-12 11:42:48 +05:30
GDLMadushanka
e63a58df0e Virtual Firealarm - broken pipe issue fixed and removed unwanted buttons 2017-06-12 08:05:54 +05:30
WSO2 Builder
266d49f812 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare for next development iteration 2017-06-09 13:55:42 +05:30
WSO2 Builder
8def362081 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare release v3.0.41 2017-06-09 13:55:28 +05:30
ayyoob
b96ba00d6c updated pom version 2017-06-08 14:45:46 +05:30
ayyoob
64107c3386 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-08 14:28:17 +05:30
WSO2 Builder
8e29ae8cae [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare for next development iteration 2017-06-07 22:49:40 +05:30
WSO2 Builder
3a27834115 [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare release v3.0.40 2017-06-07 22:49:26 +05:30
Pasindu
f0a9c0b78f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-07 07:20:38 +05:30
WSO2 Builder
b9ad0c9eed [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare for next development iteration 2017-06-06 12:16:40 +05:30
WSO2 Builder
6179ccc4fc [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare release v3.0.39 2017-06-06 12:16:26 +05:30
ayyoob
bef24e75d1 fixed few issues after testing 2017-06-06 11:01:04 +05:30
Rasika Perera
3427d7b637 Fixing issues in gpl siddhi geo extension feature 2017-06-06 10:46:59 +05:30
Rasika Perera
575e4932e6 Fixing geo script issue 2017-06-06 05:36:36 +05:30
Hasunie
c627699bdf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-05 14:08:16 +05:30
Rasika Perera
9c23a39709 Version bump on gpl siddhi geo extension 2017-06-05 11:01:16 +05:30
Rasika Perera
1eb4118712 Version bump thrift adapter 2017-06-05 10:43:14 +05:30
Rasika Perera
7aa2cfde67 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-05 10:30:32 +05:30
Rasika Perera
646221d308 Thrift transport pom version bump 2017-06-05 10:20:00 +05:30
Rasika Perera
dcbf9f30b0 Removed publishing into org.wso2.android.agent.Stream 2017-06-05 10:18:14 +05:30
Rasika Perera
9d3f1a40d6 Changes to IoT Analytic artifacts 2017-06-05 10:07:25 +05:30
GDLMadushanka
c93083e11a New config added to AndroidSense device type to redirect to DAS analytics page 2017-06-05 09:41:39 +05:30
Pasindu
eb9be0e124 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-05 09:07:33 +05:30
Pasindu
096ea49ab9 Daily commit 2017-06-05 09:02:52 +05:30
ayyoob
6b8682f2d8 few fixes after testing 2017-06-04 18:18:20 +05:30
ayyoob
796de7456f Few changes after testing mqtt and http flow 2017-06-04 06:52:51 +05:30
ayyoob
6242fde431 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-03 19:45:44 +05:30
ayyoob
9dc836928c few changes on content transformation logic 2017-06-03 13:27:40 +05:30
WSO2 Builder
d708765bda [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare for next development iteration 2017-06-02 21:21:42 +05:30
WSO2 Builder
4f9d50ca91 [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare release v3.0.38 2017-06-02 21:21:27 +05:30
Harshan Liyanage
a3abf93715 Code refactoring which Resolves harshanl/product-iots#518 2017-06-02 15:49:24 +05:30
Hasunie
30eb8ca91d adding debug logs to GlobalThrowableMapper 2017-06-02 12:44:48 +05:30
ayyoob
3a7536f1f6 update version 2017-06-01 23:26:02 +05:30
Rasika Perera
54e5994b0b Removed redundant analytics artifacts 2017-06-01 22:05:58 +05:30
Rasika Perera
e6de7a4d90 Removed android analytics feature, a common set of streams,execution plan and receivers will be used 2017-06-01 22:04:09 +05:30
ayyoob
a1fb2ed9c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-01 17:32:29 +05:30
ayyoob
8381070bf6 Implemented Pull Notification Support 2017-06-01 17:21:23 +05:30
Rasika Perera
9d336caee8 Fixes to geo-fencing ui 2017-06-01 05:00:00 +05:30
Rasika Perera
d94f624518 Added geo fencing unit 2017-05-31 10:58:49 +05:30
Rasika Perera
7b88ae13ba Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt-plugins 2017-05-31 08:06:58 +05:30
Rasika Perera
62f0b3f2a5 Version bump on gpl siddhi geo extension 2017-05-30 22:32:32 +05:30
Harshan Liyanage
ca0a9be6a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-30 17:10:03 +05:30
Harshan Liyanage
ea5c865826 Resolves harshanl/product-iots#518 2017-05-30 17:09:44 +05:30
Rasika Perera
6261995bea Adding GPL Siddhi Geo Exension 2017-05-30 16:32:18 +05:30
Rasika Perera
84711e58c6 Added geo-fencing to the devicemgt app 2017-05-30 16:32:18 +05:30
Pasindu
ee9c3ad5ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-30 12:16:03 +05:30
WSO2 Builder
e7af2ee4a4 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare for next development iteration 2017-05-30 11:07:50 +05:30
WSO2 Builder
dff15c5978 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare release v3.0.37 2017-05-30 11:07:36 +05:30
Pasindu
f49ecb2539 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
Some changes in android plugin for runtime permission is included.
2017-05-30 10:15:21 +05:30
ayyoob
ef274b0b3e fixed formatting issue 2017-05-30 00:38:48 +05:30
ayyoob
94d626ca3c changed event definition 2017-05-30 00:31:04 +05:30
ayyoob
aaeac03cfb fixed issues in mqtt input adapter and thrift adapter after testing with multitenancy 2017-05-30 00:04:49 +05:30
madhawap
af0ce14af1 Adding android agent apk after pasindujw's fixes 2017-05-29 18:58:25 +05:30
madhawap
a1a8ac3c71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-29 18:55:19 +05:30
ayyoob
1b4de09d7b added missing imports 2017-05-29 12:11:31 +05:30
ayyoob
b32bf11c91 fixed multi tenant issues after testing thrift endpoint with multitenant 2017-05-29 01:01:26 +05:30
Pasindu
4f4d783c37 Runtime permission policy per app changes 2017-05-24 12:03:48 +05:30
Pasindu
5bb1662dfb Resolve merging errors happened previously 2017-05-22 14:53:47 +05:30
ayyoob
e4247a98ff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-05-19 14:50:26 +05:30
Pasindu
444dbdf865 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-19 07:01:20 +05:30
WSO2 Builder
84e12c7cca [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare for next development iteration 2017-05-17 16:51:16 +05:30
WSO2 Builder
400da8f05e [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare release v3.0.36 2017-05-17 16:51:01 +05:30
megala21
20f8708edb Fixing issues in virtual fire alarm 2017-05-17 15:50:57 +05:30
Pasindu
1d832234df Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-17 10:10:16 +05:30
WSO2 Builder
9fcee2917f [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare for next development iteration 2017-05-16 14:24:47 +05:30
WSO2 Builder
c0c002a34b [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare release v3.0.35 2017-05-16 14:24:33 +05:30
Pasindu
1c358dac44 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-16 08:26:46 +05:30
ayyoob
92ee01d597 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-05-15 18:16:08 +05:30
Hasunie
3727bcb1e1 Merge pull request #660 from sameeragunarathne/master
fix multi tenant issues in windows device enrollment
2017-05-15 17:06:37 +05:30
Pasindu
913cc567fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-15 10:09:47 +05:30
Pasindu
b8a0fd04e7 merge fix 2017-05-15 09:51:45 +05:30
megala21
0ed2b1c71b Fixing minor issue in android sense car file deployment 2017-05-15 09:27:00 +05:30
kamidu
103b795a86 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-11 21:36:52 +05:30
kamidu
0c1ff01697 chaning the notification msg 2017-05-11 21:36:40 +05:30
WSO2 Builder
2242a1169b [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare for next development iteration 2017-05-11 13:04:58 +05:30
WSO2 Builder
87bccbdf1c [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare release v3.0.34 2017-05-11 13:04:42 +05:30
ayyoob
0117db8d9f fixed issues related to analytics feature installation to DAS-3.1.0 2017-05-10 23:10:44 +05:30
ayyoob
6a1beb8ead fixed issues related to multi tenant analytics flow and operation flow for reference device types 2017-05-10 13:51:04 +05:30
ayyoob
654bb84c6d handle disconnection scenario for multi tenant mqtt receiver 2017-05-09 19:21:40 +05:30
ayyoob
f3a729204e fixed issue when default value is set for qos 2017-05-09 18:11:21 +05:30
ayyoob
01edaeeab4 changed log from printing stack trace to meaning logs stating waiting for either broker or key manager 2017-05-09 16:11:50 +05:30
ayyoob
39097abcec set default value for mqtt input adapter 2017-05-09 16:11:09 +05:30
ayyoob
2f56874e83 few fixes on analytics flow after testing the end to end flow 2017-05-09 16:10:25 +05:30
sinthuja
5f773a51c7 Merge branch 'wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
2017-05-09 12:09:22 +05:30
madhawap
a2897012f9 Fix for disabling reboot and upgrade-firmware operations on UI
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled.
2017-05-09 12:03:08 +05:30
Pasindu
5f700c5b4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-09 08:49:00 +05:30
Pasindu
60470d039a Creating runtime permission policy for android devices 2017-05-09 08:33:17 +05:30
ayyoob
33f73eb2b3 merged with origin 2017-05-09 01:00:31 +05:30
ayyoob
728a8f4953 removed unused files and refactored few device type profile specific from the new device type feature structure, 2017-05-09 00:58:11 +05:30
ayyoob
0abbf55714 moved default input and output configurations to global properties 2017-05-09 00:57:14 +05:30
ayyoob
06d646c87a moved artifact deployment to the platform configuration 2017-05-09 00:56:21 +05:30
sinthuja
48bbf1153b Fixing the warning and mismatch version in the pom.xml. 2017-05-08 18:08:47 +05:30
WSO2 Builder
f0a70d7f27 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration 2017-05-08 18:04:55 +05:30
WSO2 Builder
24460ebde1 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 2017-05-08 18:04:39 +05:30
sinthuja
37a15e927d Merge branch 'wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml
2017-05-08 14:28:07 +05:30
WSO2 Builder
df7df6ffa6 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
3cdec9843a [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +05:30
sinthuja
79bdfa642c Merge branch 'wso2-master'
# Conflicts:
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
#	features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/src/main/resources/p2.inf
#	features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/p2.inf
#	features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf
2017-05-07 23:02:06 +05:30
ayyoob
5a25f15d08 removing the fix did in cloud setup - jasinthas 2017-05-05 03:21:13 +05:30
ayyoob
359184429e Added missing fixes that was done for multi tenancy in cloud branch 2017-05-05 01:57:48 +05:30
sinthuja
bbc8c8efce Fixing the issue in consuming the events for carbon.super from mqtt. 2017-05-04 22:15:36 +05:30
WSO2 Builder
2db4069053 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
902d7e3cf2 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
warunalakshitha
543e68771e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-01 20:53:24 +05:30
WSO2 Builder
e2becd3169 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
85c36c0ca8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
Rasika Perera
9d00038199 #665 : Added some improvements to the fix 2017-05-01 19:38:16 +05:30
Rasika Perera
f7dbc156b3 #665 : Added some changes to reuse PropertyUtils.replaceTenantDomainProperty() 2017-05-01 19:15:11 +05:30
Rasika Perera
be99ca571b #665 : Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue 2017-05-01 18:54:01 +05:30
warunalakshitha
568538cc13 add comments for performance configs 2017-04-30 13:58:49 +05:30
WSO2 Builder
c3fb32f3bc [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration 2017-04-28 10:33:09 +05:30
WSO2 Builder
1b0047c39f [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29 2017-04-28 10:32:49 +05:30
Ayyoob Hamza
5397fc3563 Merge pull request #662 from Megala21/master
Adding security filters for secured-websocket war
2017-04-28 10:05:29 +05:30
WSO2 Builder
99e587eb78 [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration 2017-04-28 08:38:44 +05:30
WSO2 Builder
9b8929a8cd [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28 2017-04-28 08:38:35 +05:30
Kamidu Sachith Punchihewa
6759a99ae9 Merge pull request #657 from rasika/master
Fixing Android policy view and policy edit doesn't honor isCloud enabled param
2017-04-28 07:58:30 +05:30
megala21
d1ee78eaed Adding security filters for websocket web.xml 2017-04-27 17:37:17 +05:30
sameera910409
08adfda735 fix multi tenant issues in windows device enrollment 2017-04-27 10:32:05 +05:30
ayyoob
155135a70d fixed few issues after testing analytics 2017-04-26 01:34:57 +05:30
Rasika Perera
511c61175c #654 : Fixing Android policy view and policy edit doesn't honor isCloud enabled parameter 2017-04-25 14:46:55 +05:30
WSO2 Builder
1a91d1ddc0 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration 2017-04-25 13:14:01 +05:30
WSO2 Builder
426a016c37 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27 2017-04-25 13:13:43 +05:30
WSO2 Builder
de5ff24046 Merge commit 'dc4c32129ac05dfe6247cb060cc0949fcdf5c2ed' into db9e6dc2-9fc6-4b4a-8465-9e6ea06cdee0 2017-04-25 12:50:57 +05:30
WSO2 Builder
dc4c32129a [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration 2017-04-25 11:47:30 +05:30
WSO2 Builder
b1c6ae0e2c [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26 2017-04-25 11:47:01 +05:30
charitha
9febce0601 Add latest agent (3.1.16) 2017-04-25 11:32:20 +05:30
Charitha Goonetilleke
186b3e16e4 Merge pull request #653 from ruwany/master
Merging cloud-310 branch with master
2017-04-25 11:29:04 +05:30
WSO2 Builder
72fab84bf9 [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration 2017-04-24 17:57:19 +05:30
WSO2 Builder
5ff67af60a [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25 2017-04-24 17:57:03 +05:30
inoshperera
3fb3ebd893 moving app subscription to a new thread 2017-04-24 17:33:56 +05:30
charitha
de0cb9a5a2 Add agent 3.1.15 for cloud
(cherry picked from commit 0d6800b)
2017-04-24 11:35:25 +05:30
charitha
ab91e3a6b0 Fixed https://github.com/wso2/cdmf-agent-android/issues/33
(cherry picked from commit fadd2e6)
2017-04-24 11:35:18 +05:30
charitha
d80c25ed2b Updating UIs of agents to latest
(cherry picked from commit 90c0618)
2017-04-24 11:35:07 +05:30
Rasika Perera
a1b0298374 Updating android agent into latest
(cherry picked from commit a41436d)
2017-04-24 11:34:37 +05:30
Jasintha
ce4365f601 Removing testing values
(cherry picked from commit 31d5977)
2017-04-24 11:33:46 +05:30
Jasintha
3980899686 Fixing MQTT adpater and analytics resources for androidsense userstory
(cherry picked from commit b04b583)
2017-04-24 11:33:25 +05:30
Rasika Perera
51a613f167 Resolving #642 : Improve UX on location updates for Android
(cherry picked from commit 64b1b33)
2017-04-24 11:24:26 +05:30
WSO2 Builder
4c0e505008 [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration 2017-04-21 16:28:48 +05:30
WSO2 Builder
b653b4871d [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24 2017-04-21 16:28:35 +05:30
amalhub
ec75361c57 Adding latest android-agent.apk (https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13) 2017-04-21 14:57:43 +05:30
WSO2 Builder
7a2b64605f [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration 2017-04-18 10:33:01 +05:30
WSO2 Builder
908ee841e9 [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23 2017-04-18 10:32:45 +05:30
ayyoob
310525d066 added token recovery option when token refresh failed 2017-04-17 17:44:38 +05:30
WSO2 Builder
84220e2c25 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare for next development iteration 2017-04-07 14:56:29 +05:30
WSO2 Builder
5da8bf98b8 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22 2017-04-07 14:56:13 +05:30
kamidu
bcdd78ae68 Merge branch 'master' into cloud-3.1.0 2017-04-07 14:31:11 +05:30
kamidu
dc0fda3925 fixing location and operation loading ui issues 2017-04-05 17:04:28 +05:30
kamidu
eb7a83bcc8 fixing location and operation loading ui issues 2017-04-05 17:02:38 +05:30
kamidu
9d3949ea37 enabling loading for location refrsh 2017-04-05 16:35:35 +05:30
kamidu
1d663e1b68 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-04-05 11:14:26 +05:30
kamidu
4662db6701 device status fic 2017-04-05 11:14:10 +05:30
charitha
6f3578f797 Adding agent 3.1.7 for cloud 2017-04-05 10:19:31 +05:30
kamidu
9ad8cb21ae android enrollment ui fixes and operation in progress animation fix 2017-04-04 17:13:02 +05:30
Kamidu Sachith Punchihewa
8f169d0116 Revert "Updated device-mgt version & interface." 2017-04-04 13:10:05 +05:30
kamidu
2abd8823a3 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-04-03 18:28:30 +05:30
Harshan Liyanage
ff5a1c9c5d Updated device-mgt version & interface. 2017-04-03 17:48:21 +05:30
kamidu
ee24a8baea merging upstream cloud-3.1.0 2017-04-03 17:35:44 +05:30
kamidu
ace58b6649 policy filtering and location reload for cloud 2017-04-03 17:27:23 +05:30
WSO2 Builder
2cf8496351 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare for next development iteration 2017-03-30 10:31:28 +05:30
WSO2 Builder
7d6def8976 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21 2017-03-30 10:31:12 +05:30
charitha
6398d79760 Fix https://github.com/wso2/product-iots/issues/332
(cherry picked from commit 0e4df87)
2017-03-29 23:16:39 +05:30
charitha
0e4df87dda Fix https://github.com/wso2/product-iots/issues/332 2017-03-29 23:15:59 +05:30
charitha
110c9405b1 Update device enrollement steps
(cherry picked from commit ca8ad9f)
2017-03-29 22:28:21 +05:30
charitha
ca8ad9f528 Update device enrollement steps 2017-03-29 22:27:26 +05:30
WSO2 Builder
de5f854367 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare for next development iteration 2017-03-29 15:23:01 +05:30
WSO2 Builder
13cbce1e37 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20 2017-03-29 15:22:46 +05:30
charitha
179cc93c1a Downgraded android OS version to avoid ANR
(cherry picked from commit e13aa77)
2017-03-29 14:37:08 +05:30
charitha
6ea597233b Add google play store links to device enrollment page
(cherry picked from commit 243a3df)
2017-03-29 14:36:38 +05:30
charitha
572d85dbd1 Instruct mac users to restart after installing HAXM
(cherry picked from commit b53fe60)
2017-03-29 14:35:59 +05:30
charitha
e13aa77b21 Downgraded android OS version to avoid ANR 2017-03-29 14:30:12 +05:30
charitha
2d67d33eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-29 14:09:02 +05:30
charitha
243a3df89d Add google play store links to device enrollment page 2017-03-29 14:06:15 +05:30
WSO2 Builder
0f3318e353 [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare for next development iteration 2017-03-29 11:13:40 +05:30
WSO2 Builder
41041f3f6d [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19 2017-03-29 11:13:18 +05:30
charitha
d8218ef221 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-29 09:46:07 +05:30
charitha
b53fe60807 Instruct mac users to restart after installing HAXM 2017-03-29 09:45:34 +05:30
WSO2 Builder
cf3d543fea [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration 2017-03-24 15:45:48 +05:30
WSO2 Builder
59194a1286 [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18 2017-03-24 15:45:32 +05:30