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
Rasika Perera
55a7cee60e
Removed unneccessary pom import
2017-01-06 19:04:52 +05:30
Hasunie
440473bc13
adding context path to web xml nonsecuredEndpoints
2017-01-06 18:49:52 +05:30
dunithd
8c36f31030
Adding Geo fencing link to Android device
2017-01-06 18:36:16 +05:30
Hasunie
e186ef6bb3
fixing jira issue IOTS-368
2017-01-06 18:29:32 +05:30
madhawap
9bb3839c87
Adding Swagger to Android sense end-points
2017-01-06 17:05:48 +05:30
Milan Perera
77d1e684f6
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-06 16:48:02 +05:30
Rasika Perera
530c112b8e
Merge pull request #505 from rasika/release-3.0.x
...
Replaced [EMM] with [IoT Server]
2017-01-06 16:46:48 +05:30
sinthuja
8b7be8db38
Adding date picker for the full history view.
2017-01-06 16:33:54 +05:30
Rasika Perera
2c9c02dc00
Replaced [EMM] with [IoT Server]
2017-01-06 16:26:59 +05:30
dunithd
41095da20c
Fixing the geo dashboard link for Android sense, Raspberry and Arduino devices
2017-01-06 15:40:13 +05:30
Hasunie
8bd06c60f2
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
2017-01-06 15:12:41 +05:30
Hasunie
32d603c8f6
updating API context and publish names
2017-01-06 14:56:57 +05:30
Hasunie
d7b94a7f07
adding location,reboot operation icons
2017-01-06 14:18:20 +05:30
Rasika Perera
46494c0d74
Merge pull request #502 from dunithd/release-3.0.x
...
Adding Geo Dashboard link for Arduino and RaspberryPi devices
2017-01-06 14:17:21 +05:30
Rasika Perera
81c62b3a13
Merge pull request #501 from ayyoob/release-3.0.x
...
made policy manager to be part of device mgt service
2017-01-06 14:15:23 +05:30
Hasunie
0a5cafd6ef
fixing windows device view
2017-01-06 14:14:25 +05:30
Hasunie
223a973cda
adding Windows 10 location support
2017-01-06 14:12:14 +05:30
inoshperera
7da5ae239b
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-06 11:38:41 +05:30
inoshperera
22a58121d2
changing the Andrid API tag to standerdise
2017-01-06 11:38:09 +05:30
dunithd
cff23fe7aa
Adding Geo Dashboard link for Arduino and RaspberryPi devices
2017-01-06 11:11:22 +05:30
Milan Perera
86aac810ce
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-06 10:11:16 +05:30
Milan Perera
d2d912fb6d
Refactored scopes strings
2017-01-06 10:10:45 +05:30
ayyoob
f603f58fd1
moved compliance payload generation code to api impl
2017-01-05 22:06:37 +05:30
dunithd
7dc5a2000d
Adding Geo Dashboard link to device view page
2017-01-05 21:23:34 +05:30
Maninda
0c7f1adcba
Fixed some issues reported with FindBugs while security plugin is enabled.
2017-01-05 19:36:52 +05:30
ayyoob
54011d2197
removed provider tenant domain and user from the web.xml
2017-01-05 17:57:04 +05:30
ayyoob
55d200514b
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-05 17:55:17 +05:30
Rasika Perera
04fcb0a0e3
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-05 17:19:27 +05:30
Rasika Perera
4fa044357b
Replaced [Enterprise Mobility Manager] with [WSO2 IoT Server]
2017-01-05 17:16:31 +05:30
Chatura Dilan
4f486ab633
Merge pull request #498 from madhawap/release-3.0.x
...
android sense fixes
2017-01-05 17:03:23 +05:30
madhawap
0aab12b1b2
android sense fixes
2017-01-05 16:59:04 +05:30
Menaka Jayawardena
a0646ff1ee
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-05 16:40:38 +05:30
ayyoob
3fa679a3e9
made policy manager to be part of device type mgt service
2017-01-05 14:37:27 +05:30
Madawa Soysa
855162c028
Improving scope annotations in windows plugin
2017-01-05 14:30:33 +05:30
Madawa Soysa
1b56ebb831
Improving scope annotations in android plugin
2017-01-05 14:26:43 +05:30
Rasika Perera
f3588c7951
config.json [usernameLength] moved to [userValidationConfig][usernameLength]
2017-01-04 22:28:12 +05:30
Rasika Perera
2550096cea
config.json [apimgt-gateway] renamed to [gatewayEnabled]
2017-01-04 22:15:01 +05:30
Rasika Perera
838223c67a
Removed unneccesary configs
2017-01-04 00:18:28 +05:30
Milan Perera
a05acad85e
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-03 15:08:13 +05:30
sinthuja
29cff5ae8a
fixing the ip resolving issue.
2017-01-03 13:31:30 +05:30
Milan Perera
45162ac155
Fixed conflicts and merged
2017-01-03 10:43:55 +05:30
GPrathap
809992fb9f
remove hardcoded oauth2 token
2017-01-02 15:33:01 +05:30
Menaka Jayawardena
c273fd4d0a
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-02 12:25:33 +05:30
WSO2 Builder
227d4685c9
[maven-release-plugin] prepare for next development iteration
2016-12-24 03:15:18 +00:00
WSO2 Builder
6c38ce6385
[maven-release-plugin] prepare release v3.0.4
2016-12-24 03:13:35 +00:00
Menaka Jayawardena
951acdd59a
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-23 12:27:14 +05:30
Ace
c302d7b25a
Coorecting version import ranges
2016-12-23 09:58:28 +05:30
Ruwan
dd9e04e75d
Merge pull request #493 from charithag/release-3.0.x-email-invites
...
Release 3.0.x email invites
2016-12-22 18:38:51 +05:30
charitha
a4841d87ba
Add custom email template for android
2016-12-22 18:31:05 +05:30
Menaka Jayawardena
bdb4421a8e
Changed the url to point to the portal home page. (Sensors view)
2016-12-22 17:52:24 +05:30
Menaka Jayawardena
2fcaf12373
Code reformatting.
2016-12-22 16:42:48 +05:30
Menaka Jayawardena
81b5b1a907
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-22 16:36:14 +05:30
Menaka Jayawardena
c45a06b95a
New gadgets were added for Accelerometer, Gyroscope, Rotation and Magnetic field.
2016-12-22 16:34:45 +05:30
Menaka Jayawardena
f0d7e4648a
Android sense execution plans changed to be used with multiline charts.
2016-12-22 16:33:27 +05:30
Menaka Jayawardena
4add08545a
Removed previously created accelerometer gadgets.
2016-12-22 16:32:06 +05:30
Rasika Perera
5465cea76d
Fixing QR modal unit not found issue
2016-12-22 14:03:49 +05:30
Ace
34c4d00d4f
Bumping identity dependencies
2016-12-22 12:34:28 +05:30
Ace
8ac0971a24
Updating identity dependencies to latest
2016-12-22 11:01:56 +05:30
Geeth
b8472666ad
Merge pull request #488 from Supun94/release-3.0.x
...
Support for Device Management Policy Merging
2016-12-22 10:37:59 +05:30
Rasika Perera
27e066e92a
IOTS-336: Fixing android and windows mobile agents title
2016-12-22 09:37:37 +05:30
charitha
0c2465d03e
Add enrollment invitations API EP for android
2016-12-20 23:48:21 +05:30
Menaka Jayawardena
8de3587717
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-20 12:34:10 +05:30
Menaka Jayawardena
f6927be10a
Created gadgets and streams for sensor data.
2016-12-20 12:31:49 +05:30
charitha
2211ad2a59
Update device type detail pages and moved QR modal to device mgt core
2016-12-19 15:26:29 +05:30
Ace
488c2abafa
removing slf4j from packing in the android devicemgt jaxrs
2016-12-19 15:24:02 +05:30
Charitha Goonetilleke
38903585ba
Merge pull request #486 from DimalChandrasiri/release-3.0.x
...
Adding email sender changes
2016-12-19 13:46:37 +05:30
Charitha Goonetilleke
8b258ce24f
Merge pull request #485 from hasuniea/windows10
...
adding Windows10 operation and policy support
2016-12-19 13:45:55 +05:30
Ace
6697dbcc59
upgrading to latest version of identity
2016-12-19 11:38:12 +05:30
Imesh Chandrasiri
48461af2c3
Adding email sender changes
2016-12-19 11:27:43 +05:30
Imesh Chandrasiri
6464fcb615
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-19 11:12:49 +05:30
Hasunie
45fdd2a7e0
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
2016-12-19 08:54:25 +05:30
Hasunie
2b2c38aa46
fixing formatting issues
2016-12-19 08:53:39 +05:30
Rasika Perera
d1842ca64c
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-19 08:41:18 +05:30
Hasunie
1d0752f09c
fixing device name issue in windows8.1 enrollment
2016-12-19 08:33:32 +05:30
Hasunie
0ffb142023
fixing windows10 enrollment endpoiny issues
2016-12-19 08:32:47 +05:30
Hasunie
965f396757
adding Device Details to Device-view UI
2016-12-19 08:21:58 +05:30
Hasunie
fcb5a354a2
fixing enrollment service issues
2016-12-19 08:11:46 +05:30
Hasunie
67e75ee38a
adding DeviceInfo operation handler
2016-12-19 08:06:36 +05:30
Supun94
57f0ea7ce4
Changing policy compliance view
2016-12-19 04:57:17 +05:30
Imesh Chandrasiri
da4eb14144
Device view changes for email invite and agent download
2016-12-16 14:56:15 +05:30
Megala
600e2529bd
Fixing race conditions in refresh token generation
2016-12-16 14:10:38 +05:30
Rasika Perera
a08e58a574
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-16 12:43:55 +05:30
Ruwan
bb1435e273
Merge pull request #482 from menakaj/release-3.0.x
...
Android Sense Analytics script modifications.
2016-12-16 10:46:39 +05:30
Menaka Jayawardena
9f4f70af61
Disabled unused battery script deployment.
2016-12-16 10:39:34 +05:30
Menaka Jayawardena
d4851c9815
Corrected android headset script name.
2016-12-16 10:38:11 +05:30
Menaka Jayawardena
08a0a290c2
Fixed : SMS Script not executing automatically.
2016-12-16 10:36:47 +05:30
Hasunie
d82670fa94
fixing windows annotation issues
2016-12-15 18:38:13 +05:30
Hasunie
c03a2fabc7
adding DeviceInfo properties
2016-12-15 16:46:26 +05:30
Hasunie
b3ffc7fdd7
adding win10 alert constants
2016-12-15 16:45:44 +05:30
Hasunie
1eb8c8e9db
adding win10 operation trigger alert
2016-12-15 16:44:49 +05:30
Hasunie
6857ba1b74
adding Device Info to win10
2016-12-15 16:43:14 +05:30
sinthuja
3d504afa35
Fixing issues in the full history view in geo fence.
2016-12-15 16:12:02 +05:30
Hasunie
69ebf70484
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
2016-12-15 14:53:33 +05:30
Hasunie
db03b6fc19
refactoring windows UI
2016-12-15 14:51:09 +05:30
Hasunie
19f289c8fa
adding windows operation properties
2016-12-15 14:46:21 +05:30
Hasunie
158e5fca2a
removing services path
2016-12-15 14:38:20 +05:30
Hasunie
90ad21e960
adding bean refference for win10
2016-12-15 14:35:24 +05:30
Hasunie
fc7d86801f
fixing windows8.1 Device name issue
2016-12-15 14:34:15 +05:30
Hasunie
9571d782c8
configure to enroll win10 on csr sigining step
2016-12-15 14:27:36 +05:30
Hasunie
b9b5edc342
adding new devicemanegement endpoint to getpending operations
2016-12-15 14:26:07 +05:30
Hasunie
c52c292d15
adding Device-Info operation
2016-12-15 14:25:01 +05:30
Hasunie
84a6522cb8
removing unwanted values from notification
2016-12-15 14:18:15 +05:30
Hasunie
120283adf4
adding windows10 csp
2016-12-15 14:09:54 +05:30
Megala
39bb1f92ba
Removing hard coded values and adding missing file
2016-12-15 14:05:16 +05:30
Hasunie
89a4482124
adding windows 10 plugin constants
2016-12-15 14:02:07 +05:30
Hasunie
471c8c628b
deleting unused hbs file
2016-12-15 13:59:39 +05:30
Menaka Jayawardena
ba5486c05c
Typo fixed in analytics scripts.
2016-12-14 18:08:57 +05:30
sinthuja
b223f7374e
Committing the changes for the android persisted goe alert.
2016-12-14 17:13:43 +05:30
sinthuja
550322fc0f
Merge pull request #479 from menakaj/release-3.0.x
...
Removed unwanted artifact dependency.
2016-12-14 16:57:47 +05:30
Menaka Jayawardena
e47ae4cad2
Removed unwanted artifact dependancy.
2016-12-14 15:08:37 +05:30
Imesh Chandrasiri
fe195ca8f7
UI Fixes
2016-12-14 14:03:41 +05:30
Megala
0b1acaa990
Updating the agent apk file
2016-12-14 10:56:03 +05:30
Milan Perera
72a33b7930
Fixed conflicts and merged
2016-12-14 09:20:42 +05:30
Megala
ec5936d013
Updating the apk file to switch between event enabling and disabling
2016-12-13 19:37:42 +05:30
Megala
5eefdfc2c0
Merge remote-tracking branch 'upstream/release-3.0.x' into embed
2016-12-12 17:56:39 +05:30
Hasunie
316362e974
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
2016-12-12 00:52:27 +05:30
Hasunie
d3bf748233
implementing windows10 devicemgt session
2016-12-12 00:34:23 +05:30
Hasunie
b57573ecae
Merging relese-3.0.x
2016-12-12 00:27:16 +05:30
Rasika Perera
b5e220799a
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-09 18:39:59 +05:30
WSO2 Builder
a398686ec7
[maven-release-plugin] prepare for next development iteration
2016-12-09 05:46:04 +00:00
WSO2 Builder
3bafccc303
[maven-release-plugin] prepare release v3.0.3
2016-12-09 05:43:17 +00:00
Hasunie
359bd948d2
Fixing bst issue
2016-12-09 10:53:07 +05:30
Hasunie
222ef41a3f
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-09 10:43:50 +05:30
Chatura Dilan
49d81766f6
fixed conflicts
2016-12-09 10:35:36 +05:30
Chatura Dilan
e22d4d3530
Fixed UI issues in the policy screen
2016-12-09 10:29:53 +05:30
Megala
5b7b4124b0
Adding minor UI fixes
2016-12-09 10:10:47 +05:30
Hasunie
0e680ab26b
fixing json provider issue in windows cxf
2016-12-09 09:36:27 +05:30
Milan Perera
6ad6bbbdc0
Commiting permission-scope mapping improvements
2016-12-08 20:41:44 +05:30
Charitha Goonetilleke
6cea2f19fc
Merge pull request #470 from hasuniea/release-3.0.x
...
fixing message issue in configurationmgtservice
2016-12-08 20:08:24 +05:30
charitha
a49a5650c6
Fix issues
2016-12-08 20:07:16 +05:30
Hasunie
34153371d3
fixing message issue in configurationmgtservice
2016-12-08 19:15:34 +05:30
charitha
1598748a5b
Merge branch 'release-3.0.x' of https://github.com/menakaj/carbon-device-mgt-plugins into release-3.0.x
2016-12-08 19:13:31 +05:30
charitha
5d7fd0d66d
Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x
2016-12-08 19:00:22 +05:30
Harshan Liyanage
ce5d907801
Added operation bar.json
2016-12-08 18:55:50 +05:30
Harshan Liyanage
2f7214cd5b
Resolved conflicts in device type-vies files.
2016-12-08 18:31:53 +05:30
Harshan Liyanage
f55cd20a73
Resolved conflicts in device type-vies files.
2016-12-08 18:27:56 +05:30
Ruwan
82c0af1053
Merge pull request #467 from madhawap/release-3.0.x
...
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:12:59 +05:30
Harshan Liyanage
26bbb55af5
Resolved conflicts with release-3.0.x
2016-12-08 18:07:14 +05:30
Menaka Jayawardena
bad0331dc7
Added new Android Sense Agent
2016-12-08 17:56:29 +05:30
madhawap
6618b919d1
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 17:40:43 +05:30
Charitha Goonetilleke
34fb3cad0b
Merge pull request #459 from menakaj/release-3.0.x
...
Android Sense stabilization
2016-12-08 17:23:57 +05:30
Hasunie
68cabad5b8
deleting unused components
2016-12-08 16:43:05 +05:30
Harshan Liyanage
559fa3fe38
Resolved conflicts
2016-12-08 16:40:18 +05:30
Menaka Jayawardena
862a14c2b5
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-08 16:37:52 +05:30
Menaka Jayawardena
e0afb8d205
Refactoring Android Sense agent.
...
Increased the battery data retrieving sequence.
Completed network data reading implementation.
The data publishing interval is changed to 1000ms.
2016-12-08 16:36:29 +05:30
Hasunie
d2d39a241e
adding error handler
2016-12-08 16:18:01 +05:30
Hasunie
b3eacb99cd
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2016-12-08 16:06:17 +05:30
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