Commit Graph

2280 Commits

Author SHA1 Message Date
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
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
charitha
52060c9d40 Fixed unzipping issue in tryit tool
(cherry picked from commit 01187db)
2017-03-24 14:45:19 +05:30
charitha
33342e0e97 Fix documentation links 2017-03-24 14:44:55 +05:30
charitha
01187db029 Fixed unzipping issue in tryit tool 2017-03-24 14:35:31 +05:30
WSO2 Builder
82ac8417d3 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration 2017-03-23 13:14:16 +05:30
WSO2 Builder
d0e9362ee1 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17 2017-03-23 13:14:05 +05:30
charitha
6aee69ef5b Updated splash screen images 2017-03-23 08:53:28 +05:30
charitha
8ee81f497d Adding latest Android agent 2017-03-23 01:11:14 +05:30
charitha
3bfa383cea Adding Android-tryit tool
(cherry picked from commit c3e241e)
2017-03-23 01:08:33 +05:30
Charitha Goonetilleke
6c6cde7df0 Merge pull request #623 from sameeragunarathne/master
fix android apk install operation issue by checking resource access s…
2017-03-22 20:06:50 +05:30
sinthuja
09033aef51 Fixing the issue in feature installation. 2017-03-22 19:04:47 +05:30
sameera910409
d907f1bc51 fix https://wso2.org/jira/browse/EMM-1880 2017-03-22 19:02:47 +05:30
sinthuja
b1af6eeaf4 Moving the cdmf-analytics repo components to device-mgt-iot-plugins. 2017-03-22 18:19:17 +05:30
WSO2 Builder
2049e44319 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration 2017-03-22 15:53:43 +05:30
WSO2 Builder
d15dc25c13 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16 2017-03-22 15:53:34 +05:30
Geeth
bc7b77e07a Merge pull request #622 from charithag/master-androidtryit
Adding Android-tryit tool
2017-03-22 15:32:54 +05:30
charitha
c3e241e1d5 Adding Android-tryit tool 2017-03-22 15:29:37 +05:30
WSO2 Builder
8df6e56f40 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration 2017-03-21 20:11:47 +05:30
WSO2 Builder
2e8f5a63d2 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15 2017-03-21 20:11:33 +05:30
Ayyoob Hamza
632547447c Merge pull request #621 from sinthuja/master
Changes to adhere to the new directory structure.
2017-03-21 19:56:07 +05:30
megala21
c8f25a0b77 Updating json version 2017-03-16 21:42:44 +05:30
Harshan Liyanage
893eccd817 Merge pull request #618 from hasuniea/master
resolved #616
2017-03-16 15:55:27 +05:30
Harshan Liyanage
bd2ded8563 Removed unnecessary braces. 2017-03-16 15:54:39 +05:30
Susinda
1c13f1b97d Cloud and general doc links issue fixed 2017-03-16 14:42:09 +05:30
Hasunie
809a30fc7a fixing code format issue 2017-03-16 14:22:24 +05:30
Hasunie
7de234c164 resolved #616 2017-03-16 14:14:32 +05:30
Hasunie
42cc311f00 Fixing NPE in AndroidAPIUtils
resolved #616
2017-03-16 12:57:04 +05:30
Hasunie
143569b83b Fixing null property in AndriodAPIUtils 2017-03-16 12:26:37 +05:30
Hasunie
a30fbfdbec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-16 12:04:24 +05:30
WSO2 Builder
c49b33bb4a [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration 2017-03-15 18:08:34 +05:30
WSO2 Builder
e1064dca07 [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14 2017-03-15 18:08:26 +05:30
Kamidu Sachith Punchihewa
95f64b0a15 Merge pull request #615 from wso2/cloud-3.1.0
Cloud related fixes
2017-03-15 17:47:31 +05:30
WSO2 Builder
68f329cbda [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration 2017-03-14 16:48:21 +05:30
WSO2 Builder
8669d1b44e [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13 2017-03-14 16:48:11 +05:30
Harshan Liyanage
2753deb365 Merge pull request #602 from sameeragunarathne/master
refactor code for firebase cloud messaging
2017-03-14 16:41:19 +05:30
sinthuja
2f20502d81 Merge branch 'wso2-master' 2017-03-14 00:45:59 +05:30
sinthuja
5c79504529 Resolving the startup issue in the broker profile. 2017-03-13 21:51:52 +05:30
Harshan Liyanage
1882171824 Merge pull request #611 from Kamidu/cloud-3.1.0
android view related ui fixes
2017-03-13 17:47:10 +05:30
WSO2 Builder
18d3518236 [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration 2017-03-13 17:43:20 +05:30
WSO2 Builder
867790d3cb [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12 2017-03-13 17:43:10 +05:30
kamidu
c97dfb4080 android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local 2017-03-13 17:40:26 +05:30
sameera910409
078209347a refactor code for firebase cloud messaging 2017-03-13 14:30:27 +05:30
Susinda
1ebc84450f revert the implementation 'agent download from github release' 2017-03-13 14:15:03 +05:30
Susinda
286d293ddd revert the implementation 'agent download from github release' 2017-03-13 13:55:42 +05:30
Susinda
7c3d94cf77 Added README file to avoid git ignoring empty dirs 2017-03-10 12:43:31 +05:30
Susinda
f96389e671 Android agent downloadded from github relese location, Hasuni's fix on initial operations added 2017-03-10 12:00:27 +05:30
Susinda Perera
fb6cfb6699 Merge pull request #1 from susinda/cloud-3.1.0
Merging from Cloud 3.1.0
2017-03-09 12:45:44 +05:30
kamidu
d2d56651cc fix for leaflet tile not loading issues
(cherry picked from commit 6604c23257)
2017-03-07 15:25:24 +05:30
ayyoob
2dd7f53489 added log support for server to server communication 2017-03-07 02:04:26 +05:30
Harshan Liyanage
b82a59c828 Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0 2017-03-03 17:45:26 +05:30
Hasunie
7fcf4e9a3b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:38:39 +05:30
Hasunie
3e50f0b737 adding initial operations 2017-03-03 17:37:55 +05:30
Harshan Liyanage
dc054e6ed5 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:10:17 +05:30
Harshan Liyanage
f2761e9b0a Removed info operation addition upon page load 2017-03-03 17:10:02 +05:30
ayyoob
a10eb7cb14 removed feature 2017-03-03 17:03:57 +05:30
ayyoob
77ec1c4107 fixed operation bar permission rendering issue 2017-03-02 20:27:46 +05:30
Milan Perera
360a58dce6 Merge pull request #596 from Kamidu/cloud-3.1.0
fix for leaflet tile not loading issues
2017-03-02 15:23:48 +05:30
kamidu
6604c23257 fix for leaflet tile not loading issues 2017-03-02 15:20:27 +05:30
ayyoob
eda4710211 resolved device type download issue in windows OS and added log support for service clients. 2017-03-02 00:32:39 +05:30
susinda
5ad6dc1f1d Fxing PhoneNumber Serach for android 2017-02-28 20:28:48 +05:30
lakshani
3505cc8abc Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu' 2017-02-28 20:28:43 +05:30
Susinda Perera
6f9ea52218 Merge pull request #593 from wso2/cloud-3.1.0
Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28
2017-02-28 19:25:12 +05:30
ayyoob
384ab40f5b added ssl context 2017-02-27 16:44:26 +05:30
Hasunie
17c017379c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-21 11:50:12 +05:30
lakshani
ffee269a0e Fixed the issue in server startup- removed error logs 2017-02-20 14:01:56 +05:30
lakshani
964e2aade7 Fixed the issue in server startup error logs 2017-02-20 13:53:18 +05:30
Kamidu Sachith Punchihewa
740bb976fa adding location operation to device view page 2017-02-19 19:10:20 +05:30
kamidu
afaa75d3a9 adding screen shots 2017-02-17 20:46:09 +05:30
kamidu
463d8a9dff wording sugessions for cloud 2017-02-16 00:23:58 +05:30
Imesh Chandrasiri
20bd1b399b Removed conflict markings 2017-02-15 11:16:41 +05:30
Imesh Chandrasiri
a890d9fb89 Device enrollment page revamp 2017-02-15 11:14:07 +05:30
Imesh Chandrasiri
bccc47ebd2 Conflict fix 2017-02-15 10:46:07 +05:30
Imesh Chandrasiri
4b7637a426 Device enrollment page revampl 2017-02-15 10:43:47 +05:30
Imesh Chandrasiri
37b032d710 Merge branch 'cloud-3.1.0' into cloud-3.1.0 2017-02-15 10:20:21 +05:30
Imesh Chandrasiri
67313882ed Device enrollment page changes for cloud 2017-02-14 22:39:17 +05:30
kamidu
71c93eec29 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-14 19:27:11 +05:30
kamidu
305df1c2bd enhansing the device cloud ui 2017-02-14 19:27:02 +05:30
kamidu
9d733d6cc1 Fixing android location issue 2017-02-14 12:58:13 +05:30
Susinda Perera
8a9affc4b8 Merge pull request #582 from ayyoob/210releasepatch
added device management api to be default
2017-02-14 12:06:48 +05:30
Imesh Chandrasiri
f10e26f0a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-14 10:27:20 +05:30
Imesh Chandrasiri
2fcd5ca020 Model Popup title space issue fix 2017-02-14 10:26:56 +05:30
Hasunie
0c87c32094 Merging changes 2017-02-14 10:18:57 +05:30
lakshani
f5d71d917e Added change device status feature to mobile plugings 2017-02-09 14:14:44 +05:30
ayyoob
a294c20a2a added device management api to be default 2017-02-09 09:59:24 +05:30
lakshani
3c349a71e6 removed unwanted repositories from restconnector 2017-02-07 10:42:28 +05:30
lakshani
edb8e71ac2 Added change device status feature to mobile plugings 2017-02-07 10:38:12 +05:30
ayyoob
e66311b844 fixed few multi tenant issues 2017-02-06 03:47:54 +05:30
ayyoob
00feadac97 fixed validation url property 2017-02-05 21:49:37 +05:30
ayyoob
dd3017578a added artefact deployment support for device types 2017-02-05 17:52:52 +05:30
kamidu
fe338aa412 removing the module vfa plugin 2017-02-03 17:20:25 +05:30
Kamidu Sachith Punchihewa
68b36babe6 Merge pull request #575 from wso2/master
UI fixes for device cloud
2017-02-03 16:53:19 +05:30
kamidu
bd715b7aac resolving branch conflicts 2017-02-03 16:51:25 +05:30
kamidu
53840dcc37 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-03 13:01:21 +05:30
ayyoob
56de095599 resolved app connector build slowness issue 2017-02-03 05:00:57 +05:30
WSO2 Builder
d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration 2017-02-02 16:06:06 +05:30
WSO2 Builder
1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11 2017-02-02 16:05:58 +05:30
Hasunie
3b98e0f754 Merge pull request #572 from charithag/master-update-swagger-docs
Update swagger docs
2017-02-02 14:58:11 +05:30
ayyoob
e0f6e9579d fixed multi tenant issues after testing 2017-02-02 03:17:19 +05:30
ayyoob
2cfc4540f4 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-02 01:59:53 +05:30
ayyoob
50d8aedade fixed analytics multi tenant issues 2017-02-02 01:59:48 +05:30
charitha
9bf38af4f7 Fix issues in swagger docs 2017-02-01 15:03:10 +05:30
Milan Perera
99782e6360 Resolved conflicts and merged 2017-02-01 14:13:01 +05:30
Hasunie
1ab1def2b6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-01 12:04:18 +05:30
Hasunie
fb28a4042f fixing windows config issues 2017-02-01 12:02:50 +05:30
Milan Perera
cc8066896b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud 2017-02-01 11:31:42 +05:30
Milan Perera
e1a419425e Added cloud agent to the download page 2017-02-01 11:31:15 +05:30
ayyoob
73eb590a7c renamed grant type to default 2017-02-01 00:08:32 +05:30
Kamidu Sachith Punchihewa
64cb8b5223 Update load-map.js 2017-01-31 14:10:29 +05:30
kamidu
55489d5e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-01-31 13:44:12 +05:30
kamidu
192e1c3edc adding missing classes in hbs 2017-01-31 13:41:01 +05:30
WSO2 Builder
7034dae2b5 [maven-release-plugin] prepare for next development iteration 2017-01-31 12:58:56 +05:30
WSO2 Builder
a2224f96ff [maven-release-plugin] prepare release v3.0.10 2017-01-31 12:58:45 +05:30
lakshani
67663449d2 removed unwanted versions from the pom 2017-01-31 11:02:49 +05:30
Hasunie
f9bb3f6e89 removing swagger annotation from enrollment
(cherry picked from commit 3dc1418)
2017-01-31 10:23:02 +05:30
Hasunie
3dc1418290 removing swagger annotation from enrollment 2017-01-31 10:16:56 +05:30
lakshani
1319806a6c removed snapshot versions 2017-01-30 19:32:26 +05:30
lakshani
f62e7021d6 updated the pom to latest version 2017-01-30 19:03:30 +05:30
lakshani
8f53a05962 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-01-30 18:44:33 +05:30
lakshani
fff1a3f168 fixed the issues in rest connector 2017-01-30 18:44:23 +05:30
WSO2 Builder
4554d8929d [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration 2017-01-30 18:07:35 +05:30
WSO2 Builder
da7c040224 [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9 2017-01-30 18:07:24 +05:30
GPrathap
1d488b06a8 allowing every internal users to view device analytics dashboard 2017-01-30 17:53:02 +05:30
lakshani
ffdcd2b217 updated pom based on review comments 2017-01-30 11:45:19 +05:30
lakshani
ebc6c6ec11 added java doc comments 2017-01-30 09:41:39 +05:30
lakshani
d6b6da9c14 added rest-connector 2017-01-30 09:29:33 +05:30
ayyoob
036d6936a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-25 14:05:36 +05:30
ayyoob
3021947f30 updated saml grant type config name 2017-01-25 14:03:57 +05:30
GPrathap
21abaa8270 changed websocket token retrieval mechanism 2017-01-25 11:24:41 +05:30
ayyoob
8b5dd4d811 resolved merge issues 2017-01-24 19:57:25 +05:30
ayyoob
4f1f1a3e7e Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-24 19:46:39 +05:30
WSO2 Builder
e64fe695ab [maven-release-plugin] prepare for next development iteration 2017-01-20 13:36:50 +00:00
WSO2 Builder
5fbd40c579 [maven-release-plugin] prepare release v3.0.8 2017-01-20 13:31:44 +00:00
kamidu
0679aab11d adding missing classes in hbs 2017-01-20 18:26:15 +05:30
Rasika Perera
1fdaf0dc2f Merge pull request #554 from ayyoob/arduino
arduino fix is added
2017-01-20 18:01:23 +05:30
Rasika Perera
10428e7ca2 Merge pull request #553 from hasuniea/windows10
fixing synapse configs
2017-01-20 18:01:09 +05:30
ayyoob
affbd00796 arduino fix is added 2017-01-20 17:05:41 +05:30
Hasunie
8eed99c215 fixing passcode issue 2017-01-20 16:09:18 +05:30
sinthuja
f517975bf0 Adding wso2 event receiver to geo capp. 2017-01-20 15:33:01 +05:30
Hasunie
9467c52707 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-20 15:31:53 +05:30
Rasika Perera
3fc33d9e49 Merge pull request #552 from Jasintha/release-3.0.x
MQTT subscription topic patten should changed to this format to get policy updates
2017-01-20 14:56:59 +05:30
Jasintha
d515dc6d03 Fixing policy topic chanaged issue 2017-01-20 14:28:38 +05:30
Hasunie
636eb91a0a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-20 10:21:10 +05:30
Hasunie
b3d096f02c removining app restriction policy from policy edit UI 2017-01-20 08:07:46 +05:30
WSO2 Builder
9687362258 [maven-release-plugin] prepare for next development iteration 2017-01-20 02:04:54 +00:00
WSO2 Builder
ee063a1a43 [maven-release-plugin] prepare release v3.0.7 2017-01-20 02:03:09 +00:00
Rasika Perera
0d6dd3b96e Merge pull request #548 from hasuniea/windows10
Removing windows app restriction policy from Policy UI
2017-01-19 23:34:08 +05:30
Hasunie
68631a2dbd removing windows app restriction policy from Policy UI 2017-01-19 23:26:43 +05:30
Chatura Dilan
57d6fb12ce updating android agent 2017-01-19 22:54:34 +05:30
kamidu
c6d0c4ba44 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-19 22:39:15 +05:30
kamidu
50a2c3d89a Enable opasity variation with time on location records 2017-01-19 22:38:52 +05:30
Hasunie
10cab941ee Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-19 22:35:30 +05:30
Hasunie
86d91c3bdf fixing Windows synapse config issues 2017-01-19 22:33:58 +05:30
Chatura Dilan
b2ff6c4181 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-19 21:33:16 +05:30
Chatura Dilan
57cdf8e1a5 updating android agent 2017-01-19 21:31:07 +05:30
kamidu
09de477e74 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-19 21:30:39 +05:30
kamidu
eb9c789b51 Enable opasity variation with time on location records 2017-01-19 21:30:29 +05:30
Rasika Perera
3b5159bed5 Merge pull request #542 from hasuniea/windows10
Fixing Windows10 passcode policy issue
2017-01-19 19:33:15 +05:30
kamidu
60046823dd Enable location histry for android sense 2017-01-19 18:42:58 +05:30
kamidu
156402153d git Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-19 17:41:26 +05:30
kamidu
86a3b18464 adding location history to map view 2017-01-19 17:41:08 +05:30
Rasika Perera
737d1da07b Changed webapps title [EMM] into [IoT Server] 2017-01-19 17:04:01 +05:30
Hasunie
857e971fa6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-19 15:58:01 +05:30
Hasunie
399496ce82 fixing windows10 policy issue 2017-01-19 15:57:19 +05:30
Menaka Jayawardena
872baf637f Replacing android sense agent apk. 2017-01-19 13:00:35 +05:30
Menaka Jayawardena
ed28fb6adb Adding permission updater for other device types. 2017-01-19 13:00:35 +05:30
Menaka Jayawardena
a7692b66d4 Removing commented code and refactoring. 2017-01-19 13:00:35 +05:30
Rasika Perera
3b7257c93f Fixing "process" not found issues 2017-01-19 07:41:13 +05:30
Rasika Perera
9a3fc7e446 Cleaned windows-web-agent config.json 2017-01-19 01:34:48 +05:30
Rasika Perera
fe6c35ebca Cleaned android-web-agent config.json 2017-01-19 01:34:48 +05:30
Rasika Perera
c04851d448 Removed iOS stuff from windows-web-agent 2017-01-19 01:34:48 +05:30
Rasika Perera
8b1a27a181 Merge pull request #536 from hasuniea/windows10
Fixing Windows plugin issues
2017-01-19 01:26:08 +05:30
Rasika Perera
a521b41352 Merge pull request #539 from menakaj/release-3.0.x
Permissions added for android sense
2017-01-19 01:24:07 +05:30
Rasika Perera
0bc380c7d0 Merge pull request #538 from Kamidu/release-3.0.x
Enable location history
2017-01-19 01:23:55 +05:30
Rasika Perera
1d10dbee88 Now UI configs supports system parameters with eg. %iot.core.host% 2017-01-19 00:58:13 +05:30
Menaka Jayawardena
6df9479fea device-mgt user permissions added for android sense. 2017-01-18 22:51:31 +05:30
Menaka Jayawardena
e19802312e Operation bar removed from android-sense device. 2017-01-18 22:51:31 +05:30
kamidu
c522809bd5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-18 22:41:48 +05:30
kamidu
234157b6f5 adding location history to map view 2017-01-18 22:41:11 +05:30
Megala
574a106977 Adding fixes to path 2017-01-18 21:46:37 +05:30
Hasunie
736b09de31 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-18 19:14:02 +05:30
Hasunie
164ae997b1 fixing synapse config issues 2017-01-18 19:09:46 +05:30
Hasunie
1362e2d7fe Fixing windows policy issues 2017-01-18 18:03:28 +05:30
Rasika Perera
357010120a Merge pull request #535 from Jasintha/release-3.0.x
receiving message format has been changed ,so updated the client according to …
2017-01-18 17:27:43 +05:30
Jasintha
55e0cec875 receving message has been chaged ,so updated the client according to that 2017-01-18 16:20:46 +05:30
Chatura Dilan
7e58c17b1e Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-18 15:20:25 +05:30
Chatura Dilan
6db0885eb9 remove cosu whitelisting apps 2017-01-18 15:19:05 +05:30
Menaka Jayawardena
8e33e31704 Giving high priority for call and sms receivers and replacing android sense agent. 2017-01-18 11:59:14 +05:30
Megala
c35727ae0b resolving conflicts 2017-01-18 09:47:00 +05:30
Megala
444119790c Fixing geo dashboard issues 2017-01-18 02:33:04 +05:30
ayyoob
f1e75d9375 apim seperation 2017-01-18 01:48:43 +05:30
Rasika Perera
1d0753ab8d Merge pull request #529 from DimalChandrasiri/release-3.0.x
Fixed android type view notification pane message inconsistancy issue
2017-01-17 19:41:19 +05:30
Rasika Perera
c74e9de2f5 Merge pull request #527 from dunithd/release-3.0.x
Formatting the anchor text after fixing 500 error
2017-01-17 19:40:38 +05:30
Rasika Perera
00ff43bfb4 Merge pull request #530 from hasuniea/windows10
fixing win10, 8.1 conflicting issues
2017-01-17 19:40:22 +05:30
Imesh Chandrasiri
dc840c389a Fix for inconsistant notification message 2017-01-17 17:48:12 +05:30
Imesh Chandrasiri
62ba568e05 Fixed android type view notification pane message inconsistancy issue 2017-01-17 17:34:51 +05:30
Hasunie
95a7ff6aaf fixing windows app-conf issue 2017-01-17 16:48:10 +05:30
Hasunie
e030be3d24 fixed code conflicts 2017-01-17 16:40:06 +05:30
Menaka Jayawardena
88b8901f75 Removed unused Test page from portal dashboard. 2017-01-17 16:15:23 +05:30
Menaka Jayawardena
f699ba54b3 Added Api annotation to AndroidSenseService 2017-01-17 16:14:49 +05:30
Hasunie
38216c4b9d fixing win10,8.1 conflicting issues 2017-01-17 16:04:48 +05:30
Dunith Dhanushka
bbbfff28d9 UI Improvements for Geo Fencing 2017-01-17 15:40:27 +05:30
Dunith Dhanushka
d4107747ab Update device-view.js 2017-01-17 15:35:59 +05:30
Rasika Perera
05e2cb7bb8 Changed [EMM] title into [IoT Server] 2017-01-17 15:34:08 +05:30
Dunith Dhanushka
54b08f9b7a Adding the JSON formatted anchor text 2017-01-17 15:10:46 +05:30
Dunith Dhanushka
6634dded55 Building the anchor text 2017-01-17 15:09:05 +05:30
Rasika Perera
0b983855cf Merge pull request #522 from DimalChandrasiri/release-3.0.x
Fix for multiple popup issue
2017-01-17 11:49:59 +05:30
Dunith Dhanushka
c6437c3065 Formatting the title 2017-01-17 11:14:58 +05:30
Dunith Dhanushka
c1de144bcf Setting device id and type to page title 2017-01-17 11:04:19 +05:30
ayyoob
dad3a34a27 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 22:40:03 +05:30
Dunith Dhanushka
b4f876d961 Updating the label text for Geo fencing link 2017-01-16 18:57:45 +05:30
Dunith Dhanushka
97d4fb1ef9 Removing advanced Geo fencing controls 2017-01-16 18:54:42 +05:30
Dunith Dhanushka
2c696b7222 Displaying the sidebar while page loads 2017-01-16 18:41:10 +05:30
ayyoob
76326b936c Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 18:30:01 +05:30
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
Menaka Jayawardena
ed85f78311 Replacing android-sense agent 2017-01-16 14:14:18 +05:30
Menaka Jayawardena
d8c2d65f05 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 00:13:35 +05:30
Imesh Chandrasiri
8eb95c3695 Fix for multiple popup issue 2017-01-14 23:56:51 +05:30
Imesh Chandrasiri
d918e32d59 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 23:51:43 +05:30
Imesh Chandrasiri
e112371d8e Fix for multiple popup issue 2017-01-14 23:51:07 +05:30
WSO2 Builder
3f1b7a6005 [maven-release-plugin] prepare for next development iteration 2017-01-14 12:22:40 +00:00
WSO2 Builder
91a0edb0a0 [maven-release-plugin] prepare release v3.0.6 2017-01-14 12:17:46 +00:00
Menaka Jayawardena
4eb186140a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 16:37:52 +05:30
Rasika Perera
3ae9fba143 Updating IoTS doc links 2017-01-13 23:14:26 +05:30
Rasika Perera
a3e97b4356 Merge pull request #521 from dunithd/release-3.0.x
Replacing the value of GLOBAL-STATE param with comma separated deviceId,deviceType
2017-01-13 22:42:53 +05:30
Dunith Dhanushka
a097482b91 Passing deviceId and deviceType into view 2017-01-13 20:26:13 +05:30
Dunith Dhanushka
33e57efc3d Replacing JSON object with comma separated values 2017-01-13 20:25:03 +05:30
Chatura Dilan
d55e0f21b7 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-13 20:21:33 +05:30
Chatura Dilan
809d292c95 Added Android scopes 2017-01-13 20:21:14 +05:30
Hasunie
bd0f1f1900 fixing windows requestToken issue 2017-01-13 19:31:35 +05:30
Hasunie
810bbafea3 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-13 18:43:48 +05:30
Hasunie
ed0b40215a fixing synapse config issues 2017-01-13 18:43:03 +05:30
Hasunie
c162f379b4 adding windows operation scope 2017-01-13 18:19:40 +05:30
Rasika Perera
f84e3526f5 changed [fw-ok] with [fw-success] 2017-01-13 17:50:19 +05:30
Hasunie
97705311b9 removing install app tab from the device view 2017-01-13 16:09:45 +05:30
Hasunie
a2ae12f9d1 adding windows 10 updates 1607/1511 changes 2017-01-13 16:08:58 +05:30
Hasunie
4c4fd00593 fixing issue in different type of windows device payloads 2017-01-13 16:06:31 +05:30
Hasunie
8655da595e removing swagger definition from the soap endpoints 2017-01-13 16:05:10 +05:30
Rasika Perera
72d9e2d0d3 Merge pull request #515 from hasuniea/windows10
Fixing gateway issues in windows
2017-01-13 13:01:40 +05:30
Hasunie
e81d2b1c20 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-13 09:08:04 +05:30
Hasunie
429266d9d2 adding windows synaps configs 2017-01-13 09:07:33 +05:30
ayyoob
09f7fb3a5f moved the traffic through the gateway 2017-01-13 04:49:35 +05:30
ayyoob
466c2b1151 moved to gateway mode 2017-01-12 19:29:59 +05:30
Rasika Perera
ebe47ef972 Merge pull request #516 from DimalChandrasiri/release-3.0.x
Updating font wso2 to version 1.2.1
2017-01-11 22:41:29 +05:30
Milan Perera
76f52af4a5 Refactored android sense agent 2017-01-11 15:44:50 +05:30
Hasunie
32d99bcab6 fixing jira IOTS-378 2017-01-11 14:13:08 +05:30
Imesh Chandrasiri
fc3d15887e Updating font wso2 to version 1.2.1 2017-01-11 11:20:21 +05:30
Hasunie
43a61d046b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-11 09:03:35 +05:30
Hasunie
a905f22651 fixing Windows gatway issues 2017-01-11 09:03:03 +05:30
Menaka Jayawardena
672f153551 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-10 14:34:33 +05:30
Milan Perera
2eb18e304a Change scope of android configuration 2017-01-10 11:39:09 +05:30
charitha
b812b6af2e Fixed issue in showing android device location map 2017-01-09 12:36:06 +05:30
Hasunie
9e59993900 fixing issue in admin service tag 2017-01-09 08:25:54 +05:30
ayyoob
1df7d20a81 moved common configuration to global properties for input and output adapters 2017-01-08 21:26:14 +05:30
ayyoob
4cb6aca5b0 merge with upstream 2017-01-08 01:32:16 +05:30
ayyoob
ccaf47112a removed DCR, added global configuration values for input and output adapter 2017-01-08 01:20:04 +05:30
WSO2 Builder
b10579950b [maven-release-plugin] prepare for next development iteration 2017-01-07 11:25:51 +00:00
WSO2 Builder
b7a5454c2f [maven-release-plugin] prepare release v3.0.5 2017-01-07 11:22:33 +00:00
ayyoob
2e8279b61a removed scep impl from virtual fire alarm 2017-01-07 14:54:46 +05:30
Rasika Perera
0790689635 Removing unused package import in virtual_firealarm 2017-01-06 21:43:26 +05:30
Rasika Perera
7d07585cf1 Merge pull request #509 from hasuniea/windows10
Windows10 Location support
2017-01-06 20:36:01 +05:30
Hasunie
de533a0667 merging changes 2017-01-06 19:55:44 +05:30
Rasika Perera
82a1839fe9 Merge pull request #508 from dunithd/release-3.0.x
Adding Geo fencing link to Android device
2017-01-06 19:42:51 +05:30
madhawap
c98bb39fea resolving conflicts 2017-01-06 19:22:03 +05:30