community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,100 Commits 11 Branches 275 Tags 396 MiB
d06b8c52f7
Commit Graph

2915 Commits

Author SHA1 Message Date
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
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
ching
c8315101c3 Corrected spelling mistakes in the UI 2016-11-25 15:23:59 +05:30
WSO2 Builder
bfa2c5fa61 [maven-release-plugin] prepare for next development iteration 2016-11-25 09:14:26 +00:00
WSO2 Builder
09d434bda9 [maven-release-plugin] prepare release v3.0.1 2016-11-25 09:11:13 +00:00
Charitha Goonetilleke
cd30635715 Merge pull request #422 from DimalChandrasiri/IoTS-1.0.0 
Changes for IoT build
 2016-11-25 11:00:44 +05:30
Megala
6c9c4a15fd Removing the sender id 2016-11-25 09:44:23 +05:30
sinthuja
4da1d5ec3a Adding JSON message format support for secure-websocket. 2016-11-25 00:08:09 +05:30
GPrathap
dca34e7fb3 added cron expression 2016-11-24 18:46:16 +05:30
Imesh Chandrasiri
bc075dedf0 Changes for IoT build 2016-11-24 18:29:35 +05:30
inoshperera
78232cd34c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-11-24 16:09:04 +05:30
inoshperera
18c0760ba5 Changing gcm endpoint to fcm 2016-11-24 16:08:48 +05:30
Harshan Liyanage
e1afb5bcdc Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-11-24 13:40:06 +05:30
inoshperera
3b867a533d fixing http status code 2016-11-24 12:46:33 +05:30
Harshan Liyanage
6cc3f39dd3 Added security filters to emm-web-agent app 2016-11-24 12:36:36 +05:30
GPrathap
dd86f91de6 moved from org.wso2.carbon.device.mgt.iot.androidsense.analytics2 2016-11-23 23:49:51 +05:30
inoshperera
d9a449dd26 adding modify enrollment capability to save chnages in enrollment such as GCM token update 2016-11-23 12:36:05 +05:30
ayyoob
cf5525dc3f removed device type and feature annotation 2016-11-21 20:55:12 +05:30
ayyoob
d6bfce396d Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-21 19:18:32 +05:30
ayyoob
c7a29f0637 few changes in coding issues 2016-11-21 19:14:21 +05:30
sinthuja
cf1782391f Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-21 17:10:28 +05:30
sinthuja
d3d176ebdc fixing some issues in the andriod analytics carbon apps. 2016-11-21 17:10:10 +05:30
inoshperera
b027f5dbe9 adding a button and connection to ios factory reset backend API 2016-11-21 11:53:33 +05:30
Ace
f3de1cf85e Adding windows-web-agent 2016-11-21 11:15:30 +05:30
dilanua
1cce94cef9 Fixing operation button stuck issue 2016-11-20 22:31:27 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
dilanua
861c5f861e Updating device statistics menu item url 2016-11-20 12:09:59 +05:30
dilanua
dbeedf246b Adding deviceStatisticsEnabled property to check visibility of device-statistics menu item 2016-11-20 10:55:56 +05:30
ayyoob
bfb9c62968 changed device access verification approach 2016-11-20 02:37:42 +05:30
dilanua
edd400bde4 Changing menu item names 2016-11-18 19:54:59 +05:30
Ruwan
93ed31c584 Merge pull request #413 from ayyoob/IoTS-1.0.0 
changes in operation bar and deployer files
 2016-11-18 16:52:08 +05:30
ayyoob
68f1fb34fe changes in operation bar and deployer.xml 2016-11-17 23:33:26 +05:30
sinthuja
f3fc531a53 Adding the new version of android analytics carbon apps. 2016-11-17 22:51:54 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00
WSO2 Builder
4746bf0c74 [maven-release-plugin] prepare release v3.0.0 2016-11-16 13:55:17 +00:00
Ace
ae33d236fa Adding android device-view changes 2016-11-16 15:43:23 +05:30
Ace
7e3df67548 Adding android-base-plugin 2016-11-16 15:07:44 +05:30
charitha
1170263139 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:45 +05:30
Dilan U. Ariyaratne
9c69e914e0 Merge pull request #409 from Megala21/master 
Adding additional configurations to SSO
 2016-11-16 11:04:25 +05:30
inoshperera
e25e9fd4a1 adding support for webclip uninstallation for ios 2016-11-16 09:33:43 +05:30
Megala
3ff394902e Removing unnecessary require statements 2016-11-15 23:04:51 +05:30
Megala
6d3fbc422f Adding link for the dashboard in tenant mode 2016-11-15 22:59:12 +05:30
Megala
57e46525f8 Changing the dashboard menu to be only visible for super-tenant users 2016-11-15 10:25:33 +05:30
Megala
dec2950f6e Adding additional configurations for app-conf 2016-11-13 19:21:15 +05:30
Malintha Fernando
5722a9fbe6 Fixing javax.xml.parsers.import.pkg.version issue 2016-11-11 14:04:23 +05:30
Ace
ea14e32337 Adding android-web-agent 2016-11-11 10:05:12 +05:30
Malintha Fernando
09f004bfd8 importing javax.xml package for javax.xml.XMLConstants 2016-11-11 06:38:36 +05:30
sinthuja
0ef0d871fb fixing the issues when reading the mqtt receiver configurations. 2016-11-10 21:23:14 +05:30
Kamidu Sachith Punchihewa
218e7aa58f Merge pull request #406 from Malintha/master 
Adding secured documentBuilder factory
 2016-11-10 15:08:25 +05:30
Malintha Fernando
13cb358153 Adding secured documentBuilder factory 2016-11-10 15:04:03 +05:30
Ace
3d32ad984c Adding fixes to android qr-gen code 2016-11-10 12:08:05 +05:30
kamidu
f5c3a55aa8 add dashboard link to emm webapp 2016-11-10 11:06:35 +05:30
sinthuja
6bb0387dac Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-09 16:07:42 +05:30
sinthuja
3001a31a33 updating the secure-ui publisher name. 2016-11-09 16:07:29 +05:30
Madawa Soysa
40907a954a Adding cache prevention filter to emm-web-agent app 2016-11-09 15:06:02 +05:30
Ace
cea96cc841 Merging with master 2016-11-09 12:54:33 +05:30
Chatura Dilan
47ba440fbb fixed extends 2016-11-09 12:36:37 +05:30
Chatura Dilan
ca2d837ecc Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-08 18:05:02 +05:30
Chatura Dilan
9e78b87365 Fixed issue in device operation bar 2016-11-08 18:04:42 +05:30
Chatura Dilan
d6701ee04c Fixed issue in device view UI 2016-11-08 18:02:47 +05:30
Chatura Dilan
1f4cda26e9 Merge pull request #403 from GPrathap/IoTS-1.0.0 
adding mb mqtt authorization extension
 2016-11-08 16:05:30 +05:30
GPrathap
136f2f34b1 changing MQTT message broker port to 1886 2016-11-08 15:59:04 +05:30
GPrathap
c96f2a8162 adding mb mqtt authorization extension 2016-11-08 15:53:09 +05:30
Chatura Dilan
49dd83ed33 Adding CDMF operation bar to Android 2016-11-08 15:16:10 +05:30
Chatura Dilan
b207e5d624 Added missing units 2016-11-08 15:08:57 +05:30
ayyoob
ecdbf6d272 few changes in sample device types to load cdmc specific units 2016-11-07 00:51:47 +05:30
Ace
7d14e23d00 merging with upstream 2016-11-04 20:09:13 +05:30
Ace
daf37338c6 merging changes with upstream 
partial
 2016-11-04 19:41:33 +05:30
Ace
46ad530735 adding missing files 
continuation from restructuring effort.
 2016-11-04 19:17:21 +05:30
Ace
e38941e81e restructuring iot-plugins 
removing mobile/iot base plugins and other restructuring
 2016-11-04 19:16:44 +05:30
Chatura Dilan
3227f3f650 Chages to device view for Android 2016-11-04 11:17:41 +05:30
Chatura Dilan
269376a135 Changes to Android operation bar 2016-11-03 15:22:17 +05:30
Chatura Dilan
76887c4277 Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-03 14:50:55 +05:30
Chatura Dilan
1e3d8021e9 Adding Android and Windows operation bars 2016-11-03 14:48:14 +05:30
Megala
411d006f5e Updating apk 2016-11-02 11:15:52 +05:30
ayyoob
685d57b452 merged with origin 2016-11-02 09:44:42 +05:30
ayyoob
bd05fb721a merged with origin IoTS-1.0.0 2016-11-02 07:47:48 +05:30
sinthuja
d5a68fb5a9 Removing the mistakenly added getAllDevices permission from the andriod sense API 2016-11-01 18:38:34 +05:30
sinthuja
aa423787e8 Removing the mistakenly added getAllDevices from the andriod sense API 2016-11-01 18:37:09 +05:30
sinthuja
96e0ef92d7 Adding changes related to removing DAS components. 2016-11-01 18:35:09 +05:30
charitha
b5e8df5ddb Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 15:05:26 +05:30
charitha
6d10f5c9fb Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 15:02:41 +05:30
WSO2 Builder
c9861e9636 [maven-release-plugin] prepare for next development iteration 2016-10-31 11:57:15 +00:00
WSO2 Builder
3e664dc304 [maven-release-plugin] prepare release v2.2.5 2016-10-31 11:55:04 +00:00
kamidu
4acc2b6925 Fix for ios device details view 2016-10-31 16:30:06 +05:30
kamidu
cab7a8c2d6 Fiz ios related numeric view 2016-10-31 14:40:15 +05:30
kamidu
af9c525594 Fixing styling issues and adding new apk 2016-10-31 14:33:36 +05:30
kamidu
a9308c3f22 removing the unnessary ' ' from hbs files 2016-10-31 11:59:29 +05:30
Rasika Perera
a40ce98698 Make analytics and groups view disable for mobile plugins 2016-10-29 23:47:36 +05:30
Kamidu Sachith Punchihewa
4cd74f0a5c Merge pull request #393 from Megala21/master 
Fixing EMM-1792
 2016-10-28 08:39:42 +05:30
Harshan Liyanage
e7d79044d6 Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-10-28 01:59:54 +05:30
Harshan Liyanage
d92c89048a EMM-1783:Fix for enterprise and public ios app installation & uninstallation 2016-10-28 01:59:34 +05:30
Megala
53efe7d0d6 changing the android-agent according to new change 2016-10-27 23:51:59 +05:30
Megala
55efa84834 Fixing EMM-1792 2016-10-27 23:21:20 +05:30
Harshan Liyanage
494b545c4b Merge pull request #392 from Megala21/master 
Fixing EMM-1787
 2016-10-27 17:18:16 +05:30
Megala
287d27a332 Fixing EMM-1787 2016-10-27 16:35:45 +05:30
hasuniea
78e9d74031 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-27 13:33:26 +05:30
hasuniea
afd8e16c4c fixing ios LDAP issue 2016-10-27 13:32:50 +05:30
Harshan Liyanage
242253b8f2 Merge pull request #391 from shavidissa/master 
Added swagger annotations and refined the messages
 2016-10-27 12:21:26 +05:30
Shavindri
f6c0aeecfc Added swagger annotations and refined the messages 2016-10-27 12:05:17 +05:30
kamidu
3f39ebf757 Fix for EMM-1766 2016-10-27 09:23:40 +05:30
kamidu
5b6289326b Fixing ui issues in policy management 2016-10-26 18:37:54 +05:30
kamidu
de60fa325e Fix the ios- manage domain policy issue 2016-10-26 17:41:35 +05:30
Kamidu Sachith Punchihewa
5396a4ca9e Merge pull request #380 from madawas/modal-refactor 
Refactoring pages to use new modal unit
 2016-10-26 17:26:14 +05:30
inoshperera
b0ccf2d27d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-26 15:18:02 +05:30
inoshperera
87fc819364 fixing EMM-1788 calDAV policy validation issue 2016-10-26 15:17:52 +05:30
Harshan Liyanage
4fdc358786 Merge pull request #387 from Megala21/master 
Fixing EMM-1779
 2016-10-26 12:26:40 +05:30
Megala
fcdce211b7 Changing the required fields use css to add astriek 2016-10-26 11:57:56 +05:30
Saad Sahibjan
91f0722b1d Fix for variable declaration with single var 2016-10-26 10:24:55 +05:30
Megala
b752dc4d90 Merge remote-tracking branch 'upstream/master' 2016-10-26 09:16:45 +05:30
Megala
e23ecc5b64 Fixing EMM-1779 2016-10-25 17:34:53 +05:30
ayyoob
391cdbb435 avoided lazy initialization 2016-10-25 14:01:51 +05:30
ayyoob
ed708852dc fixed formatting issues 2016-10-25 13:58:01 +05:30
ayyoob
968fa4f837 added message directly to log 2016-10-25 13:57:36 +05:30
kamidu
51dac16206 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-25 12:06:17 +05:30
kamidu
8af596702b Fix payload issues in manage payload policy 2016-10-25 12:05:08 +05:30
Saad Sahibjan
eff6c9d367 Fix spacing issue 2016-10-25 12:00:54 +05:30
Saad Sahibjan
2d020f611e Merge conflicts 2016-10-25 11:32:21 +05:30
Geeth
00be80eb2a Merge pull request #382 from inoshperera/master 
fixing EMM-1714 by removing the supervised mode only operations from …
 2016-10-25 09:53:04 +05:30
inoshperera
b554ff76e8 fixing EMM-1714 by removing the supervised mode only operations from the UI 2016-10-25 09:44:17 +05:30
kamidu
0251ba2a4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-24 16:49:26 +05:30
kamidu
7f4e1e3da0 Fix the ui issues in policy view,edit and create and device view sections 2016-10-24 16:48:49 +05:30
Megala
465ea0154d Fixing EMM-1778 2016-10-24 14:51:12 +05:30
ayyoob
8cbd68bcc6 few changes after testing the configs 2016-10-24 11:41:15 +05:30
Saad Sahibjan
5f50059d49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-24 10:49:57 +05:30
Madawa Soysa
a31940e9d9 Refactoring pages to use new modal unit 2016-10-24 10:36:46 +05:30
ayyoob
b195759dcf refactored device type after changes done for the deployer 2016-10-24 09:41:31 +05:30
ayyoob
8906d964b0 refactored device type after changes done for the deployer 2016-10-24 09:40:53 +05:30
dilanua
a2d9d4302c Fixing feature configured icon malfunctioning issue on switch double-click 2016-10-23 20:41:59 +05:30
ayyoob
59baa97926 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into st2 2016-10-23 14:36:05 +05:30
ayyoob
aa518e6b6c few changes to support the deployer 2016-10-23 14:24:15 +05:30
ayyoob
23138855a7 added changes in feature extraction for device types 2016-10-23 01:24:58 +05:30
hasuniea
2bc0d31af9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-21 22:21:42 +05:30
hasuniea
e63c2dd321 fixing ios email config policy issue 2016-10-21 22:21:31 +05:30
WSO2 Builder
19e0d65db0 [maven-release-plugin] prepare for next development iteration 2016-10-21 11:27:51 +00:00
WSO2 Builder
537a99d05d [maven-release-plugin] prepare release v2.2.4 2016-10-21 11:25:53 +00:00
kamidu
d460cf1370 Fixing wifi payload issue in ios policies 2016-10-21 16:33:44 +05:30
kamidu
79a25f15b7 Fix for ui issues in policy creation 2016-10-21 16:21:36 +05:30
Saad Sahibjan
3d90487466 Fix incorrect spacing - AFW COSU 2016-10-21 15:02:29 +05:30
Saad Sahibjan
ccdc64152c Fix incorrect spacing - AFW COSU 2016-10-21 14:56:38 +05:30
Saad Sahibjan
10e0ddd8b3 Fix incorrect spacing - AFW COSU 2016-10-21 14:31:32 +05:30
Saad Sahibjan
af4fdb0fdc Fix incorrect spacing - AFW COSU 2016-10-21 14:12:17 +05:30
dilanua
76827640f0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1767 2016-10-20 15:13:03 +05:30
dilanua
67d660ef1f Fixing JIRA: EMM-1765 2016-10-19 19:08:34 +05:30
Vishanth
b3d89e38eb fixing the ios wifi payload 2016-10-19 17:28:23 +05:30
Saad Sahibjan
6f0b7cb5b7 Remove blank line space - AFW COSU 2016-10-19 15:37:27 +05:30
WSO2 Builder
b095196e65 [maven-release-plugin] prepare for next development iteration 2016-10-18 15:36:09 +00:00
WSO2 Builder
d455b13e62 [maven-release-plugin] prepare release v2.2.3 2016-10-18 15:33:59 +00:00
Kamidu Sachith Punchihewa
932d43f272 Merge pull request #371 from wso2/release-2.2.3 
Release 2.2.3
 2016-10-18 20:31:38 +05:30
kamidu
86174cc1cc Version uodate and ui fixes 2016-10-18 20:28:57 +05:30
Kamidu Sachith Punchihewa
d23af95cdd Merge pull request #369 from Megala21/master 
Fixing count of roles
 2016-10-18 20:26:10 +05:30
kamidu
73489f3194 UI fixes in ios related uis 2016-10-18 18:48:36 +05:30
Hasitha Amal De Silva
0e6b19d737 Revert fix on EMM1328 for revisiting later. 2016-10-17 18:39:11 +05:30
kamidu
50e9da2d11 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-17 18:00:41 +05:30
Hasitha Amal De Silva
29f91fbee2 EMM-1328 - Hide the COPE radio button and mandate the value of BYOD radio button to be true. 2016-10-17 15:40:09 +05:30
kamidu
f6cd675a1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-17 10:21:21 +05:30
Megala
9a8a146d16 Merge remote-tracking branch 'upstream/master' 2016-10-17 08:54:59 +05:30
Milan Perera
ea4d7bc823 Merge branch 'master' of https://github.com/wso22/carbon-device-mgt-plugins 2016-10-17 07:56:57 +05:30
Milan Perera
63c40e8696 Fixed notification sending issue in iOS 2016-10-17 07:56:36 +05:30
Megala
65647fafad Merge remote-tracking branch 'upstream/master' 2016-10-15 21:49:48 +05:30
kamidu
b50979a697 Enable ios enrollment without agent installation 2016-10-14 20:50:12 +05:30
kamidu
f6b8847e69 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-14 20:01:45 +05:30
kamidu
ec138be594 Fixing the ui issue is ios policy modification and policy view 2016-10-14 20:01:32 +05:30
Kamidu Sachith Punchihewa
43117a2b75 Merge pull request #364 from DimalChandrasiri/master 
Fix for the bug EMM-1719
 2016-10-14 17:57:52 +05:30
thusithakalugamage
89336bb80f skip download agent link added 2016-10-14 17:32:35 +05:30
Megala
9aa84e7b55 Merge remote-tracking branch 'upstream/master' 2016-10-14 16:04:08 +05:30
Imesh Chandrasiri
cce96f26fc Fix for the bug EMM-1719 2016-10-14 14:48:45 +05:30
Imesh Chandrasiri
2dd86c80b4 Fix for the bug EMM-1719 2016-10-13 20:11:38 +05:30
thusithakalugamage
c3ea6e0853 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-13 18:54:09 +05:30
thusithakalugamage
70728a3e17 Fixing device detail view pannel height defect 2016-10-13 18:52:42 +05:30
Megala
7bd78f0558 Merge remote-tracking branch 'upstream/master' 2016-10-13 17:02:08 +05:30
Megala
9f0f3a8560 Fixing issues related with the roles of secondary user store 2016-10-13 16:58:50 +05:30
harshanl
d3902a861c updated agent to check the communication protocol before downloading apps 2016-10-13 12:15:52 +05:30
kamidu
b16730f70d Fix for EMM-1723 and Device view related ui fixes 2016-10-12 17:46:11 +05:30
harshanl
4e5f373c9c Updated agent.apk for alert size fix 2016-10-12 17:28:50 +05:30
thusithakalugamage
47f6147857 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-11 18:37:00 +05:30
thusithakalugamage
f3dec07a47 [EMM-1618] - related improvements on remaining occurences 2016-10-11 18:36:09 +05:30
harshanl
5de9e1a57f EMM-1731:Removed duplicate alert box 2016-10-11 16:48:16 +05:30
harshanl
5db518e5a8 EMM-1725:Added validation for system app 2016-10-10 16:50:46 +05:30
kamidu
1f0e39fddf Fix for EMM-1601 ad EMM-1708 2016-10-10 14:16:29 +05:30
ayyoob
6de419519e removed certificate configuration for device types 2016-10-09 22:14:11 +05:30
Megala
9f75c3a9a9 Merge remote-tracking branch 'upstream/master' 2016-10-07 16:46:26 +05:30
Megala
588f75cef5 Changing android apk with the changes for GCM 2016-10-07 16:39:24 +05:30
Kamidu Sachith Punchihewa
cc0ae4444d Merge pull request #359 from thusithak/master 
EMM 2.2.0-Alpha2 theme migration and issue fixes
 2016-10-07 14:38:22 +05:30
kamidu
058c96e87c Fix for EMM-1468 2016-10-07 13:08:29 +05:30
thusithakalugamage
b2134d34d3 [EMM-1685] - fix and few other related improvements 2016-10-07 12:31:05 +05:30
kamidu
7635db3167 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-07 10:04:31 +05:30
kamidu
85e1241feb Fixing type check in device view 2016-10-07 10:04:25 +05:30
Kamidu Sachith Punchihewa
bd2197d489 Merge pull request #357 from thusithak/master 
EMM 2.2.0-Alpha2 theme migration and issue fixes
 2016-10-06 22:47:21 +05:30
kamidu
68840eae94 Fix for EMM-1680 2016-10-06 22:38:47 +05:30
harshanl
f43ba554d5 EMM-1678:Updated the oauth component versions 2016-10-06 19:44:47 +05:30
thusithakalugamage
324952defc policy edit button group clear fix 2016-10-06 18:57:49 +05:30
Milan Perera
2bda72a5ce Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-10-06 17:39:42 +05:30
Milan Perera
75f4e91004 Fixed conflicts and merged 2016-10-06 17:39:37 +05:30
Milan Perera
72329d93f0 Added pulse secure payload to UI 2016-10-06 17:36:13 +05:30
thusithakalugamage
06b2c44644 Header nav menu responsiveness improvements 2016-10-06 16:41:52 +05:30
kamidu
9f558ffd0f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-06 15:08:43 +05:30
kamidu
b3b429b664 Fixing EMM-1697 2016-10-06 15:00:01 +05:30
kamidu
db581a9575 removing redundence loggings 2016-10-06 12:20:52 +05:30
Kamidu Sachith Punchihewa
ffd5597828 Merge pull request #356 from Megala21/master 
Fixing EMM-1688
 2016-10-06 12:07:20 +05:30
Megala
10372a7f4e Changing the equality check 2016-10-06 11:50:57 +05:30
Megala
51d6baf1d2 Reformatting code 2016-10-06 11:48:23 +05:30
Megala
4c54ba434a Fixing EMM-1688 2016-10-06 11:31:45 +05:30
thusithakalugamage
97f3dcf4c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-05 19:18:16 +05:30
thusithakalugamage
9d9e8a8195 [EMM-1694] - Header responsive issues fix 2016-10-05 19:18:06 +05:30
kamidu
7431654f25 Fix for device view consistancy problems 2016-10-05 18:15:11 +05:30
thusithakalugamage
3acaf47209 Device details view tablist container height defect fix 2016-10-05 12:50:47 +05:30
kamidu
22ec7aa695 Fixes for the ui isuess in EMM 2.2.0-beta 2016-10-05 12:25:37 +05:30
kamidu
5936884c16 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-05 12:23:04 +05:30
harshanl
529ed17f82 New android agent with complaince monitoring issue fix 2016-10-04 20:03:03 +05:30
thusithakalugamage
c37ad8f56d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-04 15:15:47 +05:30
thusithakalugamage
73a600713c resolving conflicts 2016-10-04 15:13:04 +05:30
kamidu
faf0f36683 Fix for EMM-1665 2016-10-04 13:27:21 +05:30
Rasika Perera
119a3e16c5 Fixes to android sense download 2016-10-03 21:22:39 +05:30
Rasika Perera
214e56770b Upgrading carbon-analytics version from 1.0.6-ALPHA to 1.2.8 2016-10-03 21:22:39 +05:30
Rasika Perera
20f0720a72 Styling improvements to the virtual firealarm agent download 2016-10-03 16:18:54 +05:30
Rasika Perera
6cbbb75c45 Fixing android sense download issue 2016-10-03 16:05:22 +05:30
Rasika Perera
d58b8f1f53 Fixing realtime analytics websocket authentication 2016-10-03 16:05:22 +05:30
thusithakalugamage
0cbf647854 resolving conflicts 2016-10-03 11:56:57 +05:30
kamidu
19a2c1d1bd Fix for Jira issue : EMM-1639 2016-10-03 11:50:57 +05:30
hasuniea
2ad390b877 removing duplicate event related classes 2016-09-30 13:40:17 +05:30
Chatura Dilan Perera
0b66649841 [maven-release-plugin] prepare for next development iteration 2016-09-29 21:47:43 +05:30
Chatura Dilan Perera
362003c9ab [maven-release-plugin] prepare release v2.2.2 2016-09-29 21:47:34 +05:30
Chatura Dilan Perera
97b52b3645 changes to pom.xml 2016-09-29 21:44:15 +05:30
harshanl
821142b78d windows ui fix 2016-09-29 21:29:51 +05:30
harshanl
5062a8dfae Windows issue 2016-09-29 20:08:25 +05:30
harshanl
fd82cfcddd Added new agent with policy fix 2016-09-29 18:51:31 +05:30
Rasika Perera
2517b7b385 Merge pull request #354 from rasika/iots-ga 
Merge iot-ga branch
 2016-09-29 15:20:18 +05:30
Rasika Perera
ca952e2e6c Merge branch 'master' of https://github.com/rasika/carbon-device-mgt-plugins into iots-ga 2016-09-29 12:21:59 +05:30
Rasika Perera
9d92b71bab Merge pull request #1 from warunalakshitha/master 
Upgrade iot product to latest carbon versions
 2016-09-29 11:24:25 +05:30
Megala
90f509c065 Merge remote-tracking branch 'upstream/master' 2016-09-29 09:09:47 +05:30
Megala
c6b12f799f Adding the check on the existence of the database before creating one 2016-09-29 01:42:11 +05:30
warunalakshitha
799aba9dfd Fix osgi issue with package version conflicts of org.wso2.carbon.device.mgt.iot bundle 2016-09-29 00:45:27 +05:30
warunalakshitha
f258f0992d Fix compilation issue after migrating iot components to carbon 4.4.9 2016-09-29 00:44:23 +05:30
dilanua
0ffce8b177 Improving device view UI - adding ios specific device details support 2016-09-28 21:28:04 +05:30
dilanua
0a9ba54bb7 Improving policy listing UI 2016-09-28 20:58:07 +05:30
dilanua
9dfd06f95e Fix for JIRA: https://wso2.org/jira/browse/EMM-1650 2016-09-28 15:44:32 +05:30
hasuniea
54ca0cacc5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-28 14:27:49 +05:30
hasuniea
2cc9a50b92 adding permission for windows enrollment 2016-09-28 14:27:16 +05:30
dilanua
8bb1428df8 Improving device view info.retrieval - UI 2016-09-28 14:11:25 +05:30
Rasika Perera
6ee958bbe7 Fixing JWT token issue for realtime analytics 2016-09-28 11:03:46 +05:30
charitha
a719c11d75 Update the agent application 2016-09-27 23:56:43 +05:30
Rasika Perera
85a382e16a Removed error log 2016-09-27 22:56:56 +05:30
Rasika Perera
177f77bde4 Fixing invalid device object returned 2016-09-27 21:57:53 +05:30
Rasika Perera
0d07295623 Fixing invalid invoker util URLs 2016-09-27 21:47:20 +05:30
Harshan Liyanage
f8bc1ff3bf Merge pull request #352 from Megala21/master 
EMM-1626 : Unable to retrieve device location for an enrolled android device
 2016-09-27 17:59:01 +05:30
Megala
c55b62fdf4 Fixing EMM-1626 2016-09-27 17:40:29 +05:30
charitha
ea999bc98b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-27 15:24:36 +05:30
charitha
975fb078b5 (cherry picked from commit d68c4c8) 2016-09-27 15:24:18 +05:30
Megala
e51231fd66 Merge remote-tracking branch 'upstream/master' 2016-09-27 13:37:40 +05:30
Megala
135019f987 Fixing EMM-1626 2016-09-27 13:33:12 +05:30
dilanua
074abf3053 Fix for JIRA: https://wso2.org/jira/browse/EMM-1640 2016-09-27 12:46:50 +05:30
charitha
c0feb96590 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-27 11:22:19 +05:30
Chatura Dilan Perera
0cdde82c1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-26 22:10:20 +05:30
Chatura Dilan Perera
f6de82bb77 Fixed android agent 2016-09-26 22:10:00 +05:30
Kamidu Sachith Punchihewa
47e6909f8d Merge pull request #349 from saadsahibjan/master 
Fix for https://wso2.org/jira/browse/EMM-1584
 2016-09-26 22:02:41 +05:30
Saad Sahibjan
d05280cdf5 Fix for https://wso2.org/jira/browse/EMM-1584 2016-09-26 21:59:38 +05:30
Ace
2a2f749523 Adding appm extension component & feature 2016-09-26 21:34:13 +05:30
Kamidu Sachith Punchihewa
f6c77e9b9e Merge pull request #348 from saadsahibjan/master 
Fix for https://wso2.org/jira/browse/EMM-1634
 2016-09-26 20:24:23 +05:30
Saad Sahibjan
41865d07eb Fix for https://wso2.org/jira/browse/EMM-1634 2016-09-26 20:19:20 +05:30
Kamidu Sachith Punchihewa
3944c5489e Merge pull request #347 from saadsahibjan/master 
Update the description of system update policy and whitelist applications - Android UI
 2016-09-26 20:10:23 +05:30
dilanua
77836d80d9 Updating bulk operations info message 2016-09-26 20:07:16 +05:30
dilanua
17e7b92b23 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633 2016-09-26 19:52:54 +05:30
Rasika Perera
3f9bcd50ea Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username 2016-09-26 19:17:05 +05:30
Saad Sahibjan
e4741c0b73 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-26 19:14:12 +05:30
Saad Sahibjan
891d9601ba Update the description of system update policy and whitelist applications - Android UI 2016-09-26 19:03:23 +05:30
Rasika Perera
d8d69f3092 Updating modal name element 2016-09-26 18:52:52 +05:30
kamidu
e3a08d824a Resolve conflicts with master 2016-09-26 18:12:53 +05:30
kamidu
e4cc0f0c0c Fix for EMM-1329, EMM-1479 2016-09-26 18:06:45 +05:30
charitha
9886e2e75f Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3 
# Conflicts:
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java
(cherry picked from commit 257d6cd)
 2016-09-26 18:01:46 +05:30
charitha
ba2acb5e75 Refactor code 
(cherry picked from commit 01f2a91)
 2016-09-26 18:01:12 +05:30
dilanua
9d35017744 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585 2016-09-26 17:28:22 +05:30
Rasika Perera
17dd96aa10 Returning correct representation of the device to template. 2016-09-26 17:15:12 +05:30
Rasika Perera
52dfcecb62 Updating devicemgt_admin into /api/device-mgt/v1.0. 2016-09-26 15:58:00 +05:30
Rasika Perera
9cef6f0d8c Few Fixes to the virtual firealarm analytics view. 2016-09-26 11:18:22 +05:30
hasuniea
fb6eded30c fixed device lock issue 2016-09-23 22:27:34 +05:30
hasuniea
fc61128b8b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-23 22:06:49 +05:30
hasuniea
ece43f53bd fixing windows issues 2016-09-23 22:06:14 +05:30
dilanua
bdd7703465 Fix for JIRA: https://wso2.org/jira/browse/EMM-1602 2016-09-23 20:33:02 +05:30
dilanua
7697c3ca39 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-23 19:47:12 +05:30
dilanua
ddea023fc2 Fixing the alignment issue of policy compliance listing of device view page 2016-09-23 19:46:48 +05:30
Ruwan
3d7dfa741b Merge pull request #346 from ruwany/carbon-kernel-4.4.7 
Migrating kernel/apim/appm/identity to latest versions
 2016-09-23 17:04:26 +05:30
dilanua
0d8da5f63f Fix for jira: https://wso2.org/jira/browse/EMM-1621 2016-09-23 16:02:53 +05:30
dilanua
f85e28c902 Fix for jira: https://wso2.org/jira/browse/EMM-1622 2016-09-23 15:57:04 +05:30
dilanua
8bd20911fe Refactoring application list view for improper text placement issues 2016-09-23 12:28:15 +05:30
dilanua
a92070f16e Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:45:13 +05:30
dilanua
4947664b4b Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:15:45 +05:30
dilanua
3a7dbb81ea Fix for JIRA: https://wso2.org/jira/browse/EMM-1616 2016-09-23 06:59:12 +05:30
dilanua
36eb2e2b16 Fix for JIRA: https://wso2.org/jira/browse/EMM-1615 2016-09-23 06:37:24 +05:30
dilanua
f47a1cdc55 Fix for JIRA: https://wso2.org/jira/browse/EMM-1614 2016-09-22 22:59:42 +05:30
dilanua
f5d95f0695 Fix for JIRA: https://wso2.org/jira/browse/EMM-1613 2016-09-22 22:45:28 +05:30
dilanua
2a4757539a Fix for JIRA: https://wso2.org/jira/browse/EMM-1593 2016-09-22 22:12:46 +05:30
dilanua
bff3b3ee12 Fix for JIRA: https://wso2.org/jira/browse/EMM-1610 2016-09-22 19:45:29 +05:30
Ace
0cb99be949 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-22 19:09:26 +05:30
dilanua
1cca664e96 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-22 18:35:30 +05:30
dilanua
36d4c7dfcb Updating emm device listing - UI 2016-09-22 18:35:13 +05:30
harshanl
212dcae8e7 Added scheduled time to App-install operation 2016-09-22 18:26:13 +05:30
dilanua
13aedbc6c6 Updating notifications side bar - UI 2016-09-22 18:19:28 +05:30
Rasika Perera
fd9c491637 Fixing virtual firealarm device download modal issue 2016-09-22 18:10:27 +05:30
dilanua
1efbc15cdb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-22 15:58:31 +05:30
dilanua
d7872782cc https://wso2.org/jira/browse/EMM-1608 2016-09-22 15:58:13 +05:30
Rasika Perera
71784e6609 Fixing modal popups 2016-09-22 15:24:59 +05:30
Rasika Perera
b99bd42a91 Fixing download modal issue on virtual firealarm 2016-09-22 14:36:56 +05:30
Chatura Dilan
e0499a5d86 Merge pull request #345 from saadsahibjan/master 
Remove unused COSU tab-Android EMM UI
 2016-09-22 14:05:36 +05:30
Saad Sahibjan
9ac367cf8a Remove unused COSU tab-Android EMM UI 2016-09-22 14:04:06 +05:30
dilanua
b6a150da23 Fixing JIRA: https://wso2.org/jira/browse/EMM-1603 2016-09-22 13:59:06 +05:30
dilanua
6665ac2642 Improvements to notifications side bar - UI 2016-09-22 13:14:45 +05:30
dilanua
215093b9a8 Updating android operation failure notification message format 2016-09-22 13:00:31 +05:30
Chatura Dilan
6bd25a4aad Merge pull request #343 from saadsahibjan/master 
Added validations for COSU create and edit configurations - Android E…
 2016-09-21 16:00:18 +05:30
Chatura Dilan Perera
7174945f21 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-21 13:51:44 +05:30
Chatura Dilan Perera
ae99d189e7 Fixed logcat and events get APIs 2016-09-21 13:51:29 +05:30
Ace
282fe25b47 Fixing dependency related issues 2016-09-21 12:57:03 +05:30
dilanua
b99529d9d0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1588 2016-09-21 11:21:35 +05:30
thusithakalugamage
706894cd89 resolving conflicts 2016-09-21 10:59:36 +05:30
dilanua
c4c2df3723 Updating device listing UI - EMM 2016-09-20 22:21:45 +05:30
dilanua
d25779e335 Updating notification side-bar message format 2016-09-20 20:21:37 +05:30
dilanua
87d8c75682 Updating notification side-bar message format 2016-09-20 19:15:24 +05:30
dilanua
ab14f9516c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 19:04:36 +05:30
dilanua
13d784009c Updating android operation failure notification message 2016-09-20 19:04:15 +05:30
Chatura Dilan Perera
eaaadfae32 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 18:02:56 +05:30
Ace
6c3ba5e688 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-20 18:02:42 +05:30
Saad Sahibjan
f5009d8406 Added validations for COSU create and edit configurations - Android EMM UI 2016-09-20 16:29:36 +05:30
kamidu
3bb8bcb79e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 14:46:52 +05:30
kamidu
6144d9eea2 Fic for EMM-1581 2016-09-20 14:46:08 +05:30
dilanua
cd7f63502a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 14:21:58 +05:30
dilanua
afea5fcfc6 Refactoring notifications side-pane - EMM UI 2016-09-20 14:21:40 +05:30
Chatura Dilan
a8319c6770 Merge pull request #342 from saadsahibjan/master 
Adding COSU policy view configurations - Android EMM UI
 2016-09-20 13:53:37 +05:30
Saad Sahibjan
31b9c0c3dd Adding COSU policy view configurations - Android EMM UI 2016-09-20 12:57:49 +05:30
dilanua
712f62aa43 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 12:50:44 +05:30
dilanua
00448814e8 Refactoring notifications side-pane - EMM UI 2016-09-20 12:50:18 +05:30
Saad Sahibjan
d18b9a4082 Adding COSU policy edit configurations - Android EMM UI 2016-09-20 12:39:10 +05:30
Ace
03c0108db5 Removing unwanted dependencies from windows api 2016-09-20 10:39:34 +05:30
Chatura Dilan Perera
bf72d212f7 [maven-release-plugin] prepare for next development iteration 2016-09-19 19:53:27 +05:30
Chatura Dilan Perera
18780e5274 [maven-release-plugin] prepare release v2.2.1 2016-09-19 19:52:58 +05:30
Chatura Dilan Perera
93cecb0ded Merge branch 'master' into release-2.2.1 2016-09-19 18:37:57 +05:30
dilanua
b65e99a4a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 18:36:31 +05:30
dilanua
9add795fe4 Adding date picker to oper.bar - EMM 2016-09-19 18:35:34 +05:30
Chatura Dilan Perera
42b50b642a Merge branch 'master' into release-2.2.1 2016-09-19 18:01:54 +05:30
hasuniea
8c877b3071 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 17:57:27 +05:30
hasuniea
9ecbd4e1b4 fixing windows operation issue 2016-09-19 17:54:58 +05:30
Chatura Dilan Perera
4088c736eb Changes to android agent 2016-09-19 17:17:42 +05:30
dilanua
ed5af90c46 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 17:13:26 +05:30
dilanua
4c8094be4f Adding date-picker unit - EMM 2016-09-19 17:13:02 +05:30
hasuniea
29c1b055d9 fixing code conflicts 2016-09-19 16:29:04 +05:30
hasuniea
18e577a84a adding windowsplugin changes 2016-09-19 15:49:16 +05:30
Rasika Perera
245ea2b0d6 Fixing incorrect text formatting 2016-09-19 14:35:43 +05:30
dilanua
4e9b19f3a5 Updating android permissions - operation-bar 2016-09-19 14:20:49 +05:30
dilanua
4a78cd6ece Updating android permissions 2016-09-19 14:09:39 +05:30
Ace
a05dad6f4d Merging with master 2016-09-19 12:22:11 +05:30
Rasika Perera
35d9678075 Updating permissions on operation bar for windows and iOS 2016-09-19 10:19:58 +05:30
dilanua
42a5493a89 Fixing JIRA: https://wso2.org/jira/browse/EMM-1577 2016-09-18 17:02:12 +05:30
dilanua
9925a20964 Fixing JIRA: https://wso2.org/jira/browse/EMM-1576 2016-09-18 16:31:17 +05:30
dilanua
69efc7ada7 Updating operation-mod with windows operation apis 2016-09-18 16:07:10 +05:30
dilanua
d8ce43fe04 Updating windows api path lockreset-devices to lock-reset-devices 2016-09-18 15:57:07 +05:30
dilanua
9d486a5a0a Updating Device Listing - EMM UI 2016-09-18 10:27:17 +05:30
dilanua
a4ef821dc1 Updating Add Device Modal - UI 2016-09-18 10:05:24 +05:30
dilanua
2c22feec20 Updating Add Device Modal - UI 2016-09-18 09:59:43 +05:30
dilanua
7911e0cce6 Updating EMM dashboard - UI 2016-09-18 08:51:05 +05:30
dilanua
19b6a334ad Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:44 +05:30
dilanua
08c6ba0617 Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI 2016-09-17 20:06:18 +05:30
dilanua
8d338a584b Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:23:21 +05:30
dilanua
ac6d0eda84 Adding COSU Policy Configs - Android EMM UI 2016-09-17 16:02:27 +05:30
Rasika Perera
a717c7effb Adding deviceName into notifications 2016-09-16 09:39:58 +05:30
Chatura Dilan
ac9f95f885 Merge pull request #338 from saadsahibjan/master 
Added edit COSU policy configurations
 2016-09-15 19:56:35 +05:30
Saad Sahibjan
d2cdb388b0 Added edit COSU policy configurations 2016-09-15 19:49:25 +05:30
kamidu
61a4d417c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-15 19:44:52 +05:30
kamidu
0160bf5fee Fix for EMM-1546 2016-09-15 19:26:48 +05:30
Dilan U. Ariyaratne
72d2466f30 Merge pull request #336 from DimalChandrasiri/master 
Adding supportive classes
 2016-09-15 16:50:13 +05:30
thusithakalugamage
d33fbc99b1 [EMM-1571] Add policies page wizard styling and layout defects - edit pages 2016-09-15 15:07:14 +05:30
thusithakalugamage
9840310f02 [EMM-1571] Add policies page wizard styling and layout defects 2016-09-15 13:47:24 +05:30
Imesh Chandrasiri
abf6317d19 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-15 11:21:08 +05:30
Imesh Chandrasiri
9887016f04 Adding modal changes 2016-09-15 11:19:35 +05:30
Rasika Perera
6ad54b5f01 Fixing EMM-1351: Issue in components refresh function in device detail page 2016-09-15 09:18:21 +05:30
Rasika Perera
c9ec2bea01 Fixing EMM-1552: Policy Create view Allingment issue in final step 2016-09-15 08:53:16 +05:30
Rasika Perera
b576e23d97 Improvements to notifications side pane 2016-09-15 08:34:18 +05:30
Rasika Perera
9f258df1d2 Fixing EMM-1551: Notifications are flooded on side pane. 2016-09-15 08:34:00 +05:30
Rasika Perera
9b2f73acfb Fixing EMM-1557: Notifications anchor points to a wrong URL of the device. 2016-09-15 08:04:58 +05:30
Rasika Perera
5438a421de Fixing Permissions are not published for Windows through WebApp Lifecycle Listener 2016-09-15 07:33:00 +05:30
Ace
2a0b500935 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:33 +05:30
Rasika Perera
4d4b9fa8ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-14 14:13:14 +05:30
Saad Sahibjan
b0ec89938e Added COSU policy configurations 2016-09-14 13:24:31 +05:30
charitha
4cdf98b1db Update agent apk to latest 2016-09-13 17:24:57 +05:30
kamidu
58fe478b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-13 15:47:41 +05:30
kamidu
a8c97563ee Fix for the rendering issue in dashboard 2016-09-13 15:46:45 +05:30
Rasika Perera
625dd1a887 itMerge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-13 15:27:02 +05:30
Imesh Chandrasiri
489a7d57ae Adding popup modal content 2016-09-13 13:46:53 +05:30
thusithakalugamage
550e2a472e [EMM-1549] - Heading defect fix 2016-09-12 18:10:31 +05:30
thusithakalugamage
e9e4133ed3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:54:27 +05:30
dilanua
326dd9f50e Fixing JIRA: https://wso2.org/jira/browse/EMM-1544 2016-09-12 14:49:07 +05:30
thusithakalugamage
dc7bc22aa0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:39:34 +05:30
thusithakalugamage
606ee9a5a4 [EMM-1543] styling defect related markup fix 2016-09-12 14:39:23 +05:30
dilanua
0456c741e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:21:18 +05:30
dilanua
6ee9a61ed1 Fixing json parser issue in operation-bar - UI 2016-09-12 14:20:01 +05:30
kamidu
388b1a5e76 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:13:14 +05:30
thusithakalugamage
a994779bd8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 12:28:18 +05:30
dilanua
0c77266640 Fixing operation-bar not showing issue on device listing page 2016-09-12 11:17:30 +05:30
thusithakalugamage
0bda2c88bd responsive tab panel component - markup rewrite for uuf - fix 2016-09-11 12:21:15 +05:30
Rasika Perera
b9f9783e9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-11 07:52:06 +05:30
dilanua
4799fcca5f Adding permissions to operation-bar UI 2016-09-10 06:30:06 +05:30
Chatura Dilan Perera
89621ddfcb [maven-release-plugin] prepare for next development iteration 2016-09-09 21:48:18 +05:30
Chatura Dilan Perera
28898a85e9 [maven-release-plugin] prepare release v2.2.0 2016-09-09 21:48:05 +05:30
Rasika Perera
0790c0ed7f Fixing dashboard user count issue 2016-09-09 19:26:02 +05:30
Rasika Perera
3a7a74a001 Merge pull request #331 from thusithak/master 
wizard component - layout defect fixes
 2016-09-09 19:14:40 +05:30
Rasika Perera
6a44414a60 Merge pull request #330 from DimalChandrasiri/master 
Modal Changes
 2016-09-09 19:14:31 +05:30
thusithakalugamage
0b8fc5e99d wizard component - layout defect fixes 2016-09-09 18:52:20 +05:30
thusithakalugamage
4dc863b3fc wizard component - layout defect fixes 2016-09-09 18:44:42 +05:30
kamidu
2b2db7be39 permission modifications 2016-09-09 18:43:03 +05:30
Imesh Chandrasiri
224061e2d2 Modal Changes 2016-09-09 18:25:23 +05:30
kamidu
958d8004a2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 17:48:41 +05:30
kamidu
05f540abf1 permission modifications 2016-09-09 17:48:26 +05:30
Imesh Chandrasiri
33b4f90e00 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 17:13:35 +05:30
Imesh Chandrasiri
35bd87ade4 Popup Layout changes 2016-09-09 17:11:57 +05:30
Rasika Perera
751deed3e2 Adding permission annotations for windows operations 2016-09-09 17:01:23 +05:30
dilanua
febcfd57be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 16:47:40 +05:30
dilanua
d97c67804b Adding ios operation endpoint changes - UI 2016-09-09 16:47:11 +05:30
Rasika Perera
3c845dc3bd Merge pull request #328 from thusithak/master 
responsive tab panel component - markup rewrite for uuf
 2016-09-09 16:40:44 +05:30
Chatura Dilan Perera
f57f7c5c1e changes to android agent 2016-09-09 16:29:42 +05:30
thusithakalugamage
1fb8781f75 resolving conflicts 2016-09-09 16:17:39 +05:30
thusithakalugamage
30c846ef95 responsive tab panel component - markup rewrite for uuf 2016-09-09 16:08:21 +05:30
dilanua
a9d00964d2 Updating emm device view with permissions 2016-09-09 15:32:05 +05:30
Imesh Chandrasiri
7d173ef763 QR Code Modal changes 2016-09-09 12:27:21 +05:30
Imesh Chandrasiri
32953a8411 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 11:44:32 +05:30
Imesh Chandrasiri
c92fbc6b0f modal code changes 2016-09-09 11:44:06 +05:30
Rasika Perera
acc3875b51 Adding pulse secure configurations 2016-09-09 11:12:45 +05:30
Rasika Perera
49a23f0518 Merge pull request #327 from DimalChandrasiri/master 
adding modal changes
 2016-09-09 10:46:56 +05:30
Imesh Chandrasiri
bbe9dfecd2 adding modal changes 2016-09-09 10:44:04 +05:30
mharindu
3d432707b2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 03:00:35 +05:30
mharindu
cbae4e207d Implemented permission based authorization 2016-09-09 03:00:11 +05:30
dilanua
ea7f62a980 Adding permissions to device listing and bug fixes 2016-09-08 23:21:57 +05:30
kamidu
082e708e8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-08 18:43:32 +05:30
kamidu
41d2856e39 Enable permission check according to the new permissions 2016-09-08 18:43:25 +05:30
charitha
44ae50cc95 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-08 10:22:12 +05:30
charitha
bfba008218 Removed url from application uninstall 
(cherry picked from commit 45a582e)
 2016-09-08 10:21:44 +05:30
dilanua
617849c053 Updating policy UIs with API method updates 2016-09-07 16:24:17 +05:30
dilanua
eea91960b7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-07 14:58:09 +05:30
dilanua
435759f961 Updating policy listing - UI 2016-09-07 14:57:32 +05:30
Rasika Perera
71d7baf04f Fixing iOS enrollement check polling url 2016-09-07 14:33:16 +05:30
dilanua
6cf9dc1c67 Updating emm policy create UI 2016-09-07 14:15:43 +05:30
charitha
07c7f2b6ff Add validation to APK type 
(cherry picked from commit 9da85ad)
 2016-09-07 08:11:50 +05:30
Rasika Perera
b66da8c7cb Fixing android agent download url 2016-09-07 01:43:20 +05:30
harshanl
c8d9f7b4ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-06 11:11:58 +05:30
Rasika Perera
f97bedf208 Merge pull request #322 from thusithak/master 
web agent layout defects, scrolling issues fixed
 2016-09-06 10:49:03 +05:30
thusithakalugamage
b1e973dc06 web agent layout defects, scrolling issues fixed 2016-09-06 10:34:37 +05:30
Rasika Perera
94ff1ea3ef Fixing android agent download issue 2016-09-06 10:33:10 +05:30
Rasika Perera
86a48bd455 Making "host" HTTPS -> HTTP to fix android agent download issue 2016-09-06 10:33:10 +05:30
harshanl
479deb8a49 Added logic to switch between GCM & LOCAL notification provider in Android 2016-09-05 17:46:08 +05:30
mharindu
2b3967fd71 Partial commit of migration 2016-09-05 16:39:13 +05:30
harshanl
814dcf9c8f Refactored Android APIs 2016-09-05 11:57:03 +05:30
dilanua
af8905069d Adding missing stepper headers for policy-create UI 2016-09-02 12:18:26 +05:30
dilanua
16163a8edb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-01 16:54:33 +05:30
dilanua
2472a12939 Updating emm dashboard role links 2016-09-01 16:52:50 +05:30
Rasika Perera
03a8c73014 Caching enabled on emm-web-agent 2016-09-01 16:28:11 +05:30
Rasika Perera
078c29ab9d Now EMM mobile-base-plugin feature contains both devicemgt and emm-web-agent apps 2016-09-01 16:28:11 +05:30
Rasika Perera
38b65daeda Adding emm-web-agent app with new UUFv0.2 version. 2016-09-01 16:28:11 +05:30
charitha
2974447362 Add validation to APK download url 2016-08-31 20:35:11 +05:30
kamidu
e135764f30 Improving the ux of devic listing page 2016-08-30 16:37:22 +05:30
Rasika Perera
3da7ac2916 Merge pull request #318 from thusithak/master 
Theme migration for 2.2.0
 2016-08-26 16:58:20 +05:30
thusithakalugamage
910803703c mdm notification bar status msg and button markup update 2016-08-26 15:48:23 +05:30
hasuniea
0235e4a0da fixing ClassNotFoundException 2016-08-26 13:23:48 +05:30
thusithakalugamage
97325fab85 mdm navbar hamburger menu and menu open state icons correction 2016-08-26 11:52:11 +05:30
harshanl
e42bf394d9 Changed windows API package name 2016-08-25 17:11:36 +05:30
harshanl
16d9338dce Refactored windows APIs 2016-08-25 16:28:03 +05:30
inoshperera
532f66ebc5 fixing the operations not getting applied to multiple devices 80, 73 2016-08-25 14:20:44 +05:30
mharindu
0d3cd0c9e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.7 2016-08-24 14:56:23 +05:30
kamidu
dcc062faad Device management theam changed to follow the patten introdused in policy management 2016-08-23 17:19:41 +05:30
dilanua
fb30118aa2 Adding supported feature: DEVICE_UNLOCK entry to db 2016-08-22 16:30:32 +05:30
hasuniea
3a25572fda fixing EMM-1509 issue 2016-08-22 10:51:35 +05:30
hasuniea
d5297cf36e fixing empty device enrollment body exception 2016-08-19 19:40:23 +05:30
Chatura Dilan Perera
ca2e631076 Fix conflicts 2016-08-19 15:25:51 +05:30
Chatura Dilan Perera
7ff9204646 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:52:56 +05:30
Chatura Dilan Perera
5e43c5bef9 [maven-release-plugin] prepare release v2.1.2 2016-08-18 22:52:47 +05:30
harshanl
a844573773 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-18 19:45:52 +05:30
dilanua
21eacedf8b Suppressing checked warnings 2016-08-18 16:04:46 +05:30
harshanl
d0512f93b7 Fixed EMM-1282 2016-08-18 11:06:43 +05:30
Chatura Dilan
76f14c13ab Merge pull request #317 from charithag/carbon-kernel-4.4.3 
Fix for possible NPE that could happen due to null device or null pro…
 2016-08-17 16:00:12 +05:30
charitha
2f2af6c46b Change indentations to tab as this file use tab indentations 2016-08-17 15:58:32 +05:30
charitha
8ba69c8b36 Change indentations to tab as this file use tab indentations 2016-08-17 15:58:02 +05:30
charitha
76a442e864 Fix for possible NPE that could happen due to null device or null property list. 2016-08-17 15:54:56 +05:30
hasuniea
97ff014b1b fixing log info message issue 2016-08-17 15:53:38 +05:30
hasuniea
5e2a42d798 fixing app-install issue 2016-08-17 15:31:18 +05:30
kamidu
33c490e229 adding missing units 2016-08-16 17:13:29 +05:30
kamidu
2486c3ff5d remove tables headers when there is no enroll devices in the system 2016-08-16 14:55:15 +05:30
Rasika Perera
c8e7ba4f54 Placeholders added to send notification form input elements 2016-08-16 12:23:29 +05:30
Rasika Perera
de786ee8c0 License updated for qr modal unit 2016-08-16 12:23:03 +05:30
Rasika Perera
a55e9a53ae Removed hardcoded app context on href links 2016-08-16 12:15:52 +05:30
Rasika Perera
784c2260e4 qr modal added to devices listing page 2016-08-16 12:15:52 +05:30
Rasika Perera
75b67a02bc qr modal added 2016-08-16 12:15:52 +05:30
Rasika Perera
e1071ef8f3 Reusable qr modal unit created 2016-08-16 12:15:52 +05:30
Ruwan
9c512a2ad6 Merge pull request #316 from ayyoob/com 
fixing commit issues
 2016-08-16 08:27:21 +05:30
Rasika Perera
fe01c59ed4 Fixing notification send operation not sending notifications 2016-08-15 23:03:58 +05:30
hasuniea
0504f34e22 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3 2016-08-15 21:03:26 +05:30
dilanua
fcd68eab59 Fixing owner undefined issue in device view 2016-08-15 18:37:51 +05:30
kamidu
3262a7d926 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-15 18:17:14 +05:30
kamidu
7cb4f51dd2 Fix the device location view isssues 2016-08-15 18:07:52 +05:30
kamidu
b8d91478d5 Device view and detail related ui fixes 2016-08-15 18:06:19 +05:30
mharindu
caf73209b9 Removed unrelevant changes 2016-08-15 15:58:58 +05:30
mharindu
695fdc1cad Fixed confusing error messages issue 2016-08-15 15:54:04 +05:30
mharindu
150f569d05 Fixed json parsing issue in android agent 2016-08-15 15:48:31 +05:30
ayyoob
55107aaae5 fixing commit issues 2016-08-15 15:04:26 +05:30
hasuniea
8a9114dd88 removing vpn validatiion property 2016-08-15 12:36:32 +05:30
hasuniea
72dd424c09 fixing jira issue related blacklisted application 2016-08-15 12:33:04 +05:30
hasuniea
71e64ae672 fixing put configuration 2016-08-15 12:32:19 +05:30
dilanua
3cc2a8ca12 Fixing role retrieval issue in policy-mgt 2016-08-15 12:01:42 +05:30
ayyoob
9978452cca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com 2016-08-13 10:50:06 +05:30
ayyoob
255e6b5566 few changes to resolve after scope validation issue 2016-08-13 10:38:30 +05:30
kamidu
c5bb85e772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 17:40:49 +05:30
kamidu
ad5b871a30 Fix the device view zone conflict 2016-08-12 17:40:42 +05:30
hasuniea
68f64c3ae1 adding windows devicemgt interface and impl 2016-08-12 16:31:47 +05:30
hasuniea
33bcfc62c5 removing vpn validatiion property 2016-08-12 16:30:34 +05:30
hasuniea
22ec736841 fixing log throwing issue for internal server error(500) 2016-08-12 16:14:40 +05:30
hasuniea
66813f7d40 fixing jira issue related blacklisted application 2016-08-12 16:01:49 +05:30
kamidu
f17261423f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 14:32:28 +05:30
kamidu
96503f8166 Fix the notification related issues in mdm.nav bar 2016-08-12 14:09:08 +05:30
ayyoob
2555a91b4d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com 2016-08-12 14:01:09 +05:30
ayyoob
65ca57c6d5 added scope annotation 2016-08-12 12:27:03 +05:30
hasuniea
13e317e201 resolving android get config issue 2016-08-12 12:24:38 +05:30
ayyoob
38b9f017c3 merged with origin 2016-08-12 10:55:25 +05:30
ayyoob
d72297f214 resolved UI issues 2016-08-11 23:41:19 +05:30
kamidu
04d1a3912a Fix the device view related issues 2016-08-11 19:05:42 +05:30
dilanua
fe2b861932 Fixing incorrect link - policy create UI 2016-08-11 16:57:24 +05:30
dilanua
6b0aaf42f1 Adding updates to emm policy listing page 2016-08-11 15:08:32 +05:30
harshanl
b207554bba Refacotered IOT plugins to use own keystore. 2016-08-11 12:38:11 +05:30
mharindu
b9289e801f Addin carbon 4.4.7 migration changes 2016-08-11 12:21:28 +05:30
dilanua
ca4cb37d58 Adding emm policy listing UI 2016-08-11 11:05:25 +05:30
dilanua
bd5ef4158b Adding emm policy edit UI 2016-08-10 18:52:39 +05:30
dilanua
935b429198 Adding emm policy view UI 2016-08-10 18:34:35 +05:30
dilanua
aada09de10 Adding policy create UI updates 2016-08-10 18:06:26 +05:30
Ace
0ee28c91d2 Adding date validations when updating device enrollment 2016-08-10 14:26:39 +05:30
harshanl
e1e7bccd57 Temporary removed VirtualFireAlarm module to fix the build issue 2016-08-10 14:19:37 +05:30
Ruwan
c32d9e3125 Bug fix 
Adding bug fix
 2016-08-10 12:59:29 +05:30
Ace
d997654011 Adding date validations when updating device enrollment 2016-08-10 12:47:02 +05:30
hasuniea
9cde2d815a refactoring windowsapi 2016-08-10 10:51:42 +05:30
hasuniea
8a4b97ebf9 refactoring windowsapi 2016-08-10 10:39:30 +05:30
Rasika Perera
5ea262947b Added emm specific policy creation unit extending cdmf.unit.policy.create 2016-08-10 08:43:00 +05:30
Rasika Perera
4c11157d4e Enrollment url by default same VM 2016-08-10 08:33:43 +05:30
mharindu
d253dd4552 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-09 19:16:20 +05:30
mharindu
141a7d0959 Added scopes to the config.json 2016-08-09 19:09:22 +05:30
hasuniea
a62544c68b refactoring windowsapi 2016-08-09 18:00:49 +05:30
Ace
a37d5dbfd9 Fixing user,device,role listing pages 2016-08-09 07:57:30 +05:30
mharindu
352574d2fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 19:29:36 +05:30
mharindu
9b43f83520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 18:49:49 +05:30
mharindu
6e8f3f5db2 Modified scopes 2016-08-08 18:25:00 +05:30
hasuniea
1078b8b686 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-08 18:06:22 +05:30
hasuniea
4562b4d318 adding security fixes 2016-08-08 18:06:14 +05:30
inoshperera
0197ea964f Merge pull request #313 from charithag/master 
Add missing BadRequestException to global exception wrapper
 2016-08-08 10:42:36 +05:30
mharindu
ece7cb04ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 10:40:45 +05:30
dilanua
a71537b7bb Updating emm app name 2016-08-06 17:17:24 +05:30
charitha
8aa4f8b526 Add missing BadRequestException to global exception wrapper 2016-08-05 21:48:28 +05:30
Chatura Dilan Perera
defa494626 changed date format to ISO 8601 2016-08-05 09:06:13 +05:30
mharindu
0cf85c986a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-04 17:50:13 +05:30
mharindu
8ddee3b217 Refactored scopes 2016-08-04 17:47:26 +05:30
Chatura Dilan Perera
fedd717561 Added validations to firmware upgrade date 2016-08-04 16:53:17 +05:30
Chatura Dilan Perera
4dfa9ed732 Added validations to firmware upgrade date 2016-08-04 16:51:59 +05:30
hasuniea
16e306268f fixing javax cache issue 2016-08-04 16:35:31 +05:30
hasuniea
86056df434 fixing windows plugin relalted slf4j issue 2016-08-04 15:29:25 +05:30
ayyoob
d70c576ff0 refactored android configuration 2016-08-03 17:23:09 +05:30
mharindu
5f917e51f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-03 12:53:36 +05:30
Rasika Perera
97eac5064e Fixed Requested resource /app/conf/reader/main.js not found 2016-08-02 23:11:42 +05:30
Rasika Perera
7b62aa3361 Fixing: Requested resource /app/conf/reader/main.js cannot be found 2016-08-02 22:23:23 +05:30
kamidu
8d151120df enabling policy wizard for android 2016-08-02 18:50:23 +05:30
kamidu
1f247e7faf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 18:26:51 +05:30
inoshperera
a09defebfe Merge pull request #312 from charithag/master 
Removed invalid property insertion.
 2016-08-02 15:52:37 +05:30
Rasika Perera
3d25102d30 Adding enrollment url into view model 2016-08-02 15:49:46 +05:30
charitha
d186a48ed8 Removed invalid property insertion. 2016-08-02 15:47:46 +05:30
kamidu
bbbaac4d28 Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup 2016-08-02 15:43:44 +05:30
mharindu
a254d9efc4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:57:29 +05:30
mharindu
34ce9108a2 Added configuration modifcation permission 2016-08-02 14:57:00 +05:30
kamidu
e0d9e1659c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:14:54 +05:30
dilanua
42cfd92575 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:04:13 +05:30
dilanua
6fe83cd0ac Updating path changes to business-controllers 2016-08-02 14:03:50 +05:30
mharindu
57fb75a04b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-02 11:03:33 +05:30
kamidu
ea89c6685e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 10:32:44 +05:30
kamidu
6db9fc426e Fix the addd buttton 404 issue 2016-08-01 14:34:48 +05:30
hasuniea
a8102b8c42 fixing VERIFONEEMMPROF-26 2016-08-01 14:28:52 +05:30
mharindu
576bfb8236 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-01 12:27:30 +05:30
Chatura Dilan Perera
fb4d8ae990 refactor files 2016-08-01 11:52:03 +05:30
dilanua
18a9ad4b8a Updating EMM UI conf.json 2016-07-29 18:02:44 +05:30
kamidu
a38d38a86e Addting new nav bar without group management ui 2016-07-29 15:31:20 +05:30
mharindu
2b3dfa0ce2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-29 12:40:50 +05:30
Dilan U. Ariyaratne
cd7ca448a0 Merge pull request #311 from ayyoob/com 
Added missing license headers
 2016-07-28 17:54:10 +05:30
ayyoob
04b1a22a00 Added missing license headers 2016-07-28 17:52:06 +05:30
ayyoob
618230e121 remove new line 2016-07-28 17:48:28 +05:30
Dilan U. Ariyaratne
4f07a42a95 Merge pull request #310 from ayyoob/com 
removed error message variable
 2016-07-28 17:39:26 +05:30
ayyoob
b60487304f removed error message variable 2016-07-28 17:37:18 +05:30
Milan Perera
2998c1e4ac Merge pull request #309 from ayyoob/com 
Fix issues raised in the comments
 2016-07-28 16:58:17 +05:30
ayyoob
20cf418394 Fixed Issues raised in the comments 2016-07-28 16:16:06 +05:30
ayyoob
95ca419d17 avoided null check when comparing 2016-07-28 15:46:23 +05:30
ayyoob
9eec100535 fixed formatting issues 2016-07-28 15:46:06 +05:30
ayyoob
4ffa47f0b4 removed redundant brackets 2016-07-28 15:42:47 +05:30
Chatura Dilan
1fa5bdba44 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-07-28 15:26:04 +05:30
Chatura Dilan
338d804dba Added validations for invalid device Ids 2016-07-28 15:25:29 +05:30
Ruwan
5356ee920c Merge pull request #308 from ayyoob/transport 
changes in realtime analytics
 2016-07-28 12:38:42 +05:30
ayyoob
d650e86e00 few changes in real time analytics 2016-07-27 14:45:31 +05:30
Ace
77bdbb5a57 Fixing QR code issue 2016-07-26 20:58:21 +05:30
mharindu
be73e9a659 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-26 14:16:09 +05:30
hasuniea
e4bfb6b6ef fixing deviceIdentifier validation issue 2016-07-26 09:47:37 +05:30
dilanua
01e32c86c8 Updating base ui app config reader 2016-07-25 05:54:32 +05:30
dilanua
0ef0a06d10 Updating emm config.json 2016-07-22 16:58:55 +05:30
mharindu
d2f02d128c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-22 16:50:37 +05:30
dilanua
f85dcc3f25 Updating emm config.json 2016-07-22 16:43:12 +05:30
ayyoob
22f4a9e2af added mqtt and web socket authorisation 2016-07-21 20:40:32 +05:30
Ace
c004824b81 removing console.log 2016-07-21 15:02:15 +05:30
mharindu
98d291fcd0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-21 14:32:43 +05:30
Ace
24624131a7 Adding EMM dashboard to mobile base UI 2016-07-21 07:43:41 +05:30
mharindu
965402a7ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-18 20:18:55 +05:30
mharindu
302f71b6d1 Fixed webapp name resolving issue and changed API context 2016-07-18 20:17:31 +05:30
Milan Perera
c1cc6f08d9 Removed device name regex pattern from bean validation 2016-07-15 19:55:40 +05:30
Ace
bff34e5030 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-15 12:01:42 +05:30
Ace
d802570be9 Adding app.conf for mobile base plugin 2016-07-15 12:01:31 +05:30
mharindu
1b006bc155 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-13 11:05:56 +05:30
Chatura Dilan
b9bc076036 Fixed issues in android permisson.xml 2016-07-12 15:14:18 +05:30
hasuniea
672d90472b adding validation 2016-07-12 12:48:09 +05:30
hasuniea
3836d393fa removing Device type from AndroidDevice bean 2016-07-12 11:58:23 +05:30
mharindu
6b939714d8 Changed context paths 2016-07-12 01:32:15 +05:30
mharindu
2563098948 Fixed conflicts and merged 2016-07-11 22:12:54 +05:30
hasuniea
ad8bbf8863 removing notnull constraint from android device type 2016-07-11 19:07:13 +05:30
hasuniea
e84a868069 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-11 17:52:55 +05:30
hasuniea
53063284d0 fixing validation issue 2016-07-11 17:50:56 +05:30
Chatura Dilan
0818ae6860 [maven-release-plugin] prepare for next development iteration 2016-07-08 20:18:00 +05:30
Chatura Dilan
62c16e07ce [maven-release-plugin] prepare release v2.1.1 2016-07-08 20:17:52 +05:30
madhawap
3851be8742 fix to permissions.xml 2016-07-08 16:10:49 +05:30
hasuniea
b30aadc438 fix code conflicts 2016-07-08 15:28:01 +05:30
hasuniea
4ccf018bb3 adding validations 2016-07-08 15:26:20 +05:30
mharindu
ba4065265d Refactored permission.xml of android webapp 2016-07-08 13:57:50 +05:30
Kasun Delgolla
79b1d51643 Committing VPN operation fixes + logcat operation 2016-07-07 17:46:33 +05:30
mharindu
48613018ab Fixed issues in scope based autorization implementation 2016-07-04 19:27:46 +05:30
mharindu
f675468e44 Added scopes to APIS 2016-07-04 18:03:20 +05:30
Chatura Dilan
bedb171eb7 Added OS build date 2016-07-01 15:47:26 +05:30
Chatura Dilan
971185decf fixes for android sense client 2016-06-30 15:59:40 +05:30
Chatura Dilan
e05906fed5 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-06-30 07:34:31 +05:30
Ruwan
1d12d8771d Merge pull request #306 from WarunaS/rapid_accelarations 
Rapid accelarations
 2016-06-29 20:22:25 +05:30
Waruna Samarsinghe
bc08e31c4c Android Sense iBeacon 2016-06-29 17:50:22 +05:30
Chatura Dilan
f58abbe0db Added is_active field 2016-06-29 17:41:09 +05:30
Waruna Samarsinghe
a8371e046e Scanning Beacon 2016-06-28 16:18:13 +05:30
Waruna Samarsinghe
cd1cf2bf44 Beacon Scaning 2016-06-28 16:04:59 +05:30
Ruwan
8b6fe27cab Merge pull request #304 from ayyoob/transport 
few changes added to transport adapters after testing with the cluster
 2016-06-27 05:51:31 +05:30
ayyoob
8a9ad21e74 few changes added to transport adapters after testing with the cluster 2016-06-27 00:13:15 +05:30
Waruna Samarsinghe
32c4a34283 Ranged iBeacons 2016-06-26 14:36:06 +05:30
prabathabey
1205d26463 Merging rest-api-improvements branch with master 2016-06-21 16:05:27 +05:30
Chatura Dilan
6a702adaa3 Change emm_admin to admin 2016-06-21 15:51:35 +05:30
Chatura Dilan
529c828b81 Fixed paths in Android related permissions.xml 2016-06-21 11:32:01 +05:30
ayyoob
6c24f44abc Added push notification support for device types 2016-06-20 02:34:44 +05:30
ayyoob
562ac197af added configurations for device types 2016-06-17 17:21:13 +05:30
inoshperera
bb0ea53909 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-16 07:57:46 +05:30
inoshperera
c45400afd0 fixing error messages not thrown properly. 2016-06-16 07:57:40 +05:30
Kasun Delgolla
ef281e1524 Fixing operation response ERROR state exception 2016-06-15 13:51:08 -07:00
Ruwan
208bf6a7ab Merge pull request #298 from WarunaS/rapid_accelarations 
Fix Orientation Issue
 2016-06-13 16:47:38 +05:30
Waruna Samarsinghe
f3f28c544f Fix Orientation Issue 2016-06-13 16:30:39 +05:30
inoshperera
90747a5579 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-08 16:56:14 +05:30
inoshperera
486e2f48ed adding validation 2016-06-08 16:55:42 +05:30
Shabirmean
38c087ebc1 Added necessary changes to store CA_CERT and handle expired refresh-token scenario 2016-06-08 12:00:32 +05:30
Shabirmean
f0206d7ed4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-06 19:14:24 +05:30
ayyoob
28254e0da8 updated android sense 2016-06-06 16:52:48 +05:30
ayyoob
96638f88e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-06 13:20:00 +05:30
Ruwan
a2c54eb91c Merge pull request #293 from WarunaS/rapid_accelarations 
rapid acceleration and turns- android sense
 2016-06-06 13:18:14 +05:30
ayyoob
d4b319c42a added weburl for https 2016-06-06 13:14:04 +05:30
GPrathap
a3ff9fbdc5 adding sso configuration 2016-06-05 23:36:38 +05:30
Waruna Samarsinghe
d44170e52e rapid acceleration and turns- android sense 2016-06-05 22:58:38 +05:30
Waruna Samarsinghe
fec14a8509 rapid acceleration and turns- resolved 2016-06-05 00:06:50 +05:30
dilanua
c9a07df91a Fixing wrong device id shown for OTA-UPGRADE operation 2016-06-04 00:27:19 +05:30
dilanua
741bb0ac16 Updating Responces in pending-operations api 2016-06-03 23:49:19 +05:30
dilanua
bcba6216c0 Update UpgradeFirmware operation with server properties 2016-06-03 20:51:54 +05:30
dilanua
9ac7ffe828 Update UpgradeFirmware operation with server properties 2016-06-03 20:47:44 +05:30
mharindu
4a8ab39dec Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-03 19:49:00 +05:30
Ace
6425d6ab1a Adding null check for operations response 2016-06-03 19:27:20 +05:30
mharindu
9237fed74e Added notification title 2016-06-03 19:22:44 +05:30
prabathabey
55aa1c8113 Fixing compilation issues 2016-06-02 21:07:33 +05:30
mharindu
62a116ba71 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-02 17:12:09 +05:30
Shabirmean
dca55d692c Changes following the hashCode of the deviceId being used as the certificate alias 2016-06-02 17:12:06 +05:30
mharindu
c5d1eaa21b Fixed issue in location service 2016-06-02 17:11:05 +05:30
hasuniea
2b89b692a4 adding event configuration refference 2016-06-02 16:37:50 +05:30
hasuniea
c170373ace fix responce code 2016-06-02 15:57:00 +05:30
hasuniea
ec91b0a539 fixing eventReceiver 2016-06-02 15:30:09 +05:30
Shabirmean
fa454388ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-02 14:20:05 +05:30
Shabirmean
a117ae37c7 Modifications to the Token Refresh Flow & the Enrolment flow in the VFAlarm 2016-06-02 14:19:48 +05:30
Anushka Samaranayake
1265a1dd34 Alert generation 2016-06-01 20:22:29 +05:30
hasuniea
198b3c67dc add entry in permission xml 2016-05-31 19:16:52 +05:30
hasuniea
0bcbab7071 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:54:27 +05:30
Chatura Dilan
d3a0fc3f12 Added install application permissions 2016-05-31 18:50:26 +05:30
hasuniea
daee6109cc fixing code issues 2016-05-31 18:48:49 +05:30
Chatura Dilan
7c59e391de Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:42:54 +05:30
Chatura Dilan
ba1f3bbbcc fixed issue in unlock devices permissions 2016-05-31 18:42:37 +05:30
hasuniea
786c6859bd Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:15:11 +05:30
hasuniea
d01e176933 add eventreceiver fix 2016-05-31 18:08:16 +05:30
prabathabey
640cf95528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:02:15 +05:30
prabathabey
d7b4b83424 Fixing path of license resource 2016-05-31 18:02:04 +05:30
mharindu
56a2ca0aa0 Added missing HTTP method attribute in permissions.xml in android webapp 2016-05-31 17:21:31 +05:30
Chatura Dilan
9086a130c4 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 16:21:54 +05:30
Chatura Dilan
3fd56b56c4 Fix cxf servelt issues 2016-05-31 16:21:42 +05:30
prabathabey
212c11750c Added http schem supported by the API 2016-05-31 16:13:20 +05:30
inoshperera
763854ef9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 14:51:07 +05:30
ayyoob
61d88f77b6 removed device Id from notification bean 2016-05-31 14:48:23 +05:30
inoshperera
6d14133bab fixing the mismatch of swagger annotation and implementation 2016-05-31 14:45:05 +05:30
Chatura Dilan
bf1e00f472 Fixed the host name of Android API 2016-05-30 17:07:04 +05:30
prabathabey
eb025c42f7 Fixing issues encountered while deploying the agent webapp of windows 2016-05-30 12:30:12 +05:30
prabathabey
18257b8729 Changing the name of the android API webapp 2016-05-30 12:08:44 +05:30
prabathabey
4dbf699b66 Fixing issues in android sense plugin which were caused by refactoring done in cdm-f 2016-05-30 08:33:55 +05:30
prabathabey
63bb616e9c Improving swagger annotations 2016-05-28 08:12:10 +05:30
prabathabey
631d57e70d Improving swagger annotations 2016-05-28 06:03:06 +05:30
Kasun Delgolla
a01fe5e4f9 Adding missing parameters 2016-05-28 02:14:56 +05:30
prabathabey
44aa3a93a9 Adding more improvements to swagger annotations 2016-05-28 02:07:17 +05:30
inoshperera
9f8ca3ea9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-28 01:50:20 +05:30
inoshperera
4dbf1bdc2f adding swagger annotation and making APIs standerdize 2016-05-28 01:50:14 +05:30
Kasun Delgolla
bd65e8b2a7 Committing missing android features 2016-05-28 01:38:03 +05:30
Chatura Dilan
b8cfcf4413 Fixed Enrollment issue 2016-05-27 23:18:11 +05:30
Chatura Dilan
91003fdee1 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-27 22:44:22 +05:30
Chatura Dilan
d25e1b2421 Fixed Android APIs 2016-05-27 22:43:03 +05:30
hasuniea
cc8190b541 add windows feature 2016-05-27 20:03:25 +05:30
inoshperera
f346c7c528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-27 19:38:41 +05:30
prabathabey
479acf3b45 Improving swagger annotations of device management admin API 2016-05-27 19:38:12 +05:30
hasuniea
d7527e95f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 18:45:49 +05:30
hasuniea
d4bce21f75 windows plugin 2016-05-27 18:45:20 +05:30
prabathabey
ba9d85b065 Adding swagger related dependencies to android agent webapp 2016-05-27 18:26:34 +05:30
inoshperera
aa4a4889a5 adding API header 2016-05-27 15:36:22 +05:30
prabathabey
9a01df5d55 Renaming android agent webapp 2016-05-27 14:58:19 +05:30
prabathabey
23343eb765 Fixing the name of android agent webapp 2016-05-27 12:50:29 +05:30
prabathabey
8620eb912f Removing redundant implementations of android and windows plugins 2016-05-27 11:59:28 +05:30
prabathabey
8f3a2eec5d Merging the latest changes introduced to master 2016-05-27 11:47:28 +05:30
prabathabey
98a8a09813 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 11:23:34 +05:30
prabathabey
6f7f706428 Renaming TenantConfiguration as PlatformCongfiguration 2016-05-27 11:23:19 +05:30
Milan Perera
23c404260e Merge pull request #283 from ayyoob/transport 
fixed db related jiras
 2016-05-26 21:23:05 +05:30
Rasika Perera
07984e4b6e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-26 18:34:58 +05:30
Rasika Perera
91cc0baaf5 Moved CSS into separate file 2016-05-26 18:34:07 +05:30
Rasika Perera
0862e95f4c Moved CSS into separate file 2016-05-26 18:22:32 +05:30
prabathabey
fd1d62454a Improving Android JAX-RS API definitions 2016-05-26 18:01:14 +05:30
ayyoob
6f6b5104d5 fixed https://wso2.org/jira/browse/IOTS-172 2016-05-26 16:23:42 +05:30
Kasun Delgolla
86327ab870 Committing android service improvements + integration 2016-05-26 15:35:26 +05:30
prabathabey
03a21752e2 Adding maven-compiler-plugin to the build profile 2016-05-26 11:14:31 +05:30
hasuniea
9f33110e6f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 18:16:11 +05:30
GPrathap
2e10d2ba2b added some bundles which required for this feature 2016-05-25 14:42:54 +05:30
hasuniea
ab70703da8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 13:54:12 +05:30
hasuniea
2eb5aebb60 fixed code issues in EventService 2016-05-25 13:53:39 +05:30
Ruwan
9e8e479d63 Merge pull request #281 from rasika90/master 
Adding licence headers for server-side handlebar templates
 2016-05-25 11:45:16 +05:30
geethkokila
57a9834145 Changing apis to return activity when an operation is added 2016-05-25 11:43:19 +05:30
Rasika Perera
f0b5ad32c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 11:35:27 +05:30
Rasika Perera
c49e19a3c6 Adding licence headers for handlebar templates 2016-05-25 11:34:22 +05:30
Milan Perera
028a9b106a Merge pull request #280 from ayyoob/transport 
added UI output adapter
 2016-05-24 19:35:24 +05:30
ayyoob
b7748b0001 added UI output adapter 2016-05-24 19:28:47 +05:30
Kasun Delgolla
4f33789d38 Committing MDM android APIs responses standardization 2016-05-24 15:34:43 +05:30
Hasunie
df6f420d6e Merge pull request #279 from hasuniea/master 
fixed code issues
 2016-05-23 15:11:15 +05:30
hasuniea
4757ac797c fixed code issues 2016-05-23 15:09:33 +05:30
ayyoob
dc32a8f8d3 Merge branch 'release-2.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-23 10:18:46 +05:30
Shabirmean
75914aee4e Changes to the VirtualFirealarm Agent + the API to enable token refresh upon expiration 2016-05-21 01:46:34 +05:30
mharindu
f3730c64ae [maven-release-plugin] prepare for next development iteration 2016-05-20 17:49:18 +05:30
mharindu
7a982093a1 [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:49:08 +05:30
mharindu
862075bd2f Removed maven clean plugin 2016-05-20 17:45:40 +05:30
mharindu
be4078cf38 [maven-release-plugin] rollback the release of v2.1.0 2016-05-20 17:35:17 +05:30
mharindu
a2d2f26123 [maven-release-plugin] prepare for next development iteration 2016-05-20 17:26:28 +05:30
mharindu
3af112898d [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:26:19 +05:30
hasuniea
a48529be59 fix code conflicts 2016-05-20 16:38:33 +05:30
hasuniea
5c29ac8c4f fix code conflicts 2016-05-20 16:29:24 +05:30
hasuniea
a7665033b4 refactored events 2016-05-20 16:18:24 +05:30
Rasika Perera
6696603ec5 Showing error when device name is less than 4 letters 2016-05-19 15:55:05 +05:30
Rasika Perera
a46863b4ad Fixing incorrect deviceIdentifier 2016-05-19 11:22:42 +05:30
Shabirmean
e656f383fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 01:35:01 +05:30
Shabirmean
10c49cfb4c Fixes to small bugs in the virtual firealarm 2016-05-19 01:34:49 +05:30
mharindu
6da020e5d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:42:44 +05:30
sumedharubasinghe
b8b0eda0bb Merge pull request #269 from ayyoob/transport 
fixed exponential backup logic
 2016-05-19 00:40:07 +05:30
mharindu
cbb1f44138 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:33:31 +05:30
ayyoob
d7b423d694 fixed exponential backup logic 2016-05-19 00:28:08 +05:30
prabathabey
f563f95c41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 00:22:18 +05:30
prabathabey
5b0748489d Improving virtual fire alarm plugin to use newly introduced push notification framework 2016-05-19 00:22:01 +05:30
sumedharubasinghe
fe89e8cac7 Merge pull request #268 from ayyoob/transport 
fixed exponential backup logic
 2016-05-18 23:18:11 +05:30
mharindu
0fee083c4b Added a null check to virtualfire-alarm 2016-05-18 22:03:16 +05:30
ayyoob
4001dbf887 fixed exponential backup logic 2016-05-18 19:32:39 +05:30
mharindu
cf9daf083d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-18 11:49:59 +05:30
Rasika Perera
c51cdaacdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into IOTS-159 2016-05-18 10:52:17 +05:30
Rasika Perera
32a9ff18ac Fixing IOTS-159: Adding meaningfull messages 2016-05-18 10:48:52 +05:30
sumedharubasinghe
7fa598e646 Merge pull request #266 from ayyoob/transport 
updated android sense apk
 2016-05-18 02:19:12 +05:30
ayyoob
2d6caafa0c updated android sense apk 2016-05-18 02:09:27 +05:30
charitha
b081f02594 Bug fixes 2016-05-17 23:33:55 +05:30
mharindu
29a1241ee9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-17 20:34:00 +05:30
Shabirmean
7f2fc73146 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-17 17:40:14 +05:30
Shabirmean
eec796732e Correction to the RaspberryPi table from which the batch data to be pulled 2016-05-17 17:40:03 +05:30
mharindu
3db3e52657 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-17 12:26:39 +05:30
hasuniea
8eb53927a6 add swagger annotations to windows plugin 2016-05-17 10:20:31 +05:30
Shabirmean
b4665f36bf Fixes to the RaspberryPi DeviceTypes to generate real-tome stats and send operations 2016-05-17 00:39:26 +05:30
charitha
eb57d38507 Fix for https://wso2.org/jira/browse/IOTS-152 2016-05-16 17:51:19 +05:30
charitha
a954de26f9 Moved api from device-mgt 2016-05-16 17:04:47 +05:30
mharindu
d7b84cf9e4 Fixed conflicts 2016-05-16 14:14:39 +05:30
mharindu
36c88aee3c Fixed conflicts 2016-05-16 12:24:14 +05:30
mharindu
24e353698f Added permission annotations to virtual fire alarm API 2016-05-16 12:12:47 +05:30
Ruwan
7f9b7c4914 Merge pull request #258 from ayyoob/transport 
refactored apis and resolved xmpp issues
 2016-05-15 20:07:28 +05:30
ayyoob
67831883fb refactored apis 2016-05-15 17:45:53 +05:30
Sumedha Rubasinghe
a1db2f1d08 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-15 13:20:15 +05:30
Sumedha Rubasinghe
6348ca31a3 removed unwanted text 2016-05-15 13:19:38 +05:30
charitha
f3d7608cdc Add support to grouping and bug fixes 2016-05-15 13:12:50 +05:30
ayyoob
b2a8b1b7c3 resolved xmpp stream conflict error 2016-05-15 12:39:34 +05:30
ayyoob
bb0b10f14c resolved xmpp issues in virtual fire alarm 2016-05-15 11:59:10 +05:30
Ruwan
f5442384d1 Merge pull request #256 from ayyoob/transport 
few fixes after testing the device types with the refactoring
 2016-05-14 21:01:31 +05:30
ayyoob
64cdb33d67 few fixes after testing the device types with the refactoring 2016-05-14 20:43:15 +05:30
GPrathap
b5fd68a6b4 fix typos 2016-05-14 18:31:22 +05:30
ayyoob
bd1c0554a8 updated android sense agent 2016-05-14 01:02:03 +05:30
ayyoob
bfbe790aa1 updated android sense topic 2016-05-14 00:43:50 +05:30
ayyoob
aa9fe6006a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-14 00:35:54 +05:30
ayyoob
12ace9efe1 refactored analytics scripts 2016-05-14 00:35:20 +05:30
ayyoob
3974ec7753 refactored analytics scripts 2016-05-14 00:34:36 +05:30
ayyoob
3d583cd39b refactored analytic scripts 2016-05-14 00:33:27 +05:30
Waruna Samarsinghe
1fdb6fd54c fix bugs location and accelerometer 2016-05-13 14:15:39 +05:30
ayyoob
e7ba11f709 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-13 05:27:41 +05:30
inosh-perera
bf7975c5d4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:59:27 +05:30
dilanua
bc1dfb86f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:56:34 +05:30
dilanua
2dabfa02fa Adding swagger annotations 2016-05-13 02:56:15 +05:30
ayyoob
da24c3fc1b removed method and type from feature 2016-05-13 02:53:30 +05:30
inosh-perera
0787aa2ac1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:51:54 +05:30
inosh-perera
afc7be590e adding swagger annotations for Android APIs 2016-05-13 02:50:17 +05:30
Madhawa Perera
f25cb51679 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 
Adding swagger annotations to beans
 2016-05-13 02:43:43 +05:30
Madhawa Perera
0d8010c25a Adding swagger annotations to beans 2016-05-13 02:43:23 +05:30
dilanua
f66aad9e0e Adding swagger annotations 2016-05-13 02:39:30 +05:30
ayyoob
04566ec250 updated event receivers 2016-05-12 21:59:35 +05:30
Kasun Delgolla
34d4da7e66 Merge pull request #250 from charithag/master 
Fixed https://wso2.org/jira/browse/IOTS-104
 2016-05-12 21:49:51 +05:30
Hasunie
cb73e24036 Merge pull request #181 from hasuniea/master 
Refactored code issues
 2016-05-12 21:49:45 +05:30
hasuniea
3cdb490908 added swagger annotations 2016-05-12 21:41:49 +05:30
ayyoob
a0c228f538 updated properties 2016-05-12 19:17:54 +05:30
ayyoob
303f6ad962 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-12 13:43:40 +05:30
ayyoob
f880bda706 refactored device type after adapter changes 2016-05-12 13:39:57 +05:30
ayyoob
10f75d5f73 refactored topic structure 2016-05-12 09:06:11 +05:30
ayyoob
d53942eeaa updated android sense and raspberry pi code 2016-05-12 03:09:51 +05:30
ayyoob
44fa7aa486 added input and output adapters as transport 2016-05-12 02:44:43 +05:30
charitha
70d47f96c1 Fix header title 2016-05-11 19:59:01 +05:30
charitha
ffcbea8421 Fixed https://wso2.org/jira/browse/IOTS-104 2016-05-11 16:00:05 +05:30
hasuniea
a47654e1f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-11 11:36:31 +05:30
charitha
4aa376b98e Enable group analytics 2016-05-10 21:32:09 +05:30
ayyoob
edaacd4989 device adapters updated 2016-05-09 01:05:34 +05:30
ayyoob
2b6816d7ed added xmpp, mqtt input/output adapters 2016-05-08 02:45:07 +05:30
hasuniea
5846f693e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-06 12:54:49 +05:30
ayyoob
6f000cbc64 refactoring version tags 2016-05-05 14:34:49 +05:30
hasuniea
feadc7d3ae Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-05 10:27:53 +05:30
sumedharubasinghe
671a70d161 Merge pull request #245 from ayyoob/das-ext 
added template for host
 2016-05-04 03:15:20 +05:30
sumedharubasinghe
7420ed4df6 Merge pull request #243 from rasika90/master 
Adding permissions checking for isAuthorized
 2016-05-04 03:01:40 +05:30
ayyoob
514c207495 changes on temperate event receiver 2016-05-04 03:01:06 +05:30
ayyoob
9e0fdca3ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-05-04 01:36:02 +05:30
Milan Perera
eaa933bff3 Merge pull request #244 from Shabirmean/master 
Changes in include RPi to use MQTT Communication
 2016-05-04 01:31:36 +05:30
ayyoob
441815afb9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-05-04 01:20:36 +05:30
ayyoob
cb939d6416 added template for host 2016-05-04 01:18:38 +05:30
mharindu
b03105f50b Fixed issues in arduino temperature sensor 2016-05-04 01:15:31 +05:30
Rasika Perera
7a5acb6f58 Adding group permission checking 2016-05-04 00:49:07 +05:30
Shabirmean
259405995a Modifications to the RPi Agent to publish to the DAS MQTT Receiver for temperature 2016-05-04 00:47:52 +05:30
Shabirmean
07bc52e86c Changes to enable MQTT Support for RPi DeviceType 2016-05-03 23:24:19 +05:30
Rasika Perera
0914b94dfc Adding policy update 2016-05-03 20:56:59 +05:30
Rasika Perera
b82fd2562d Adding permissions checking for isAuthorized 2016-05-03 19:28:42 +05:30
Shabirmean
4e51ca9ac4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-03 17:55:07 +05:30
Shabirmean
39a1020ef4 Fixes on the RPi API and modifications for MQTT Communication for RPi 2016-05-03 17:54:56 +05:30
hasuniea
81471f3a49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-03 16:03:23 +05:30
ayyoob
dbf82a3aa0 added recivers for temperature and few code changes after testing 2016-05-03 13:37:09 +05:30
gayank
893c535fb3 Android feature for Updating an application 2016-04-29 20:01:19 +05:30
hasuniea
b33023a770 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-29 19:31:07 +05:30
ayyoob
bbc2850509 few changes after testing 2016-04-29 17:41:22 +05:30
ayyoob
308ac40277 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-29 17:04:54 +05:30
ayyoob
2d57f252f0 few changes added to permissions IoT device type plugins 2016-04-29 17:04:19 +05:30
Shabirmean
c436a555bc Changes to use keystones provided by default and subsequent modifications to the agent enrolment code 2016-04-29 16:41:19 +05:30
ayyoob
14aac9f4f6 few changes after testing raspberry, arduino and refactored the jot plugins implementation 2016-04-29 16:41:18 +05:30
ayyoob
3b75a2e9a4 fixed issues in android sense 2016-04-29 00:35:52 +05:30
ayyoob
e775c8ebe0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-28 22:21:22 +05:30
ayyoob
315177b787 Few changes to support multi tenancy for virtual fire alarm and android sense 2016-04-28 22:21:08 +05:30
hasuniea
8d039551fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 17:50:57 +05:30
mharindu
7e4aaed2ee Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 12:04:18 +05:30
hasuniea
0e8c8c7eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 10:55:42 +05:30
ayyoob
012fc028cf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-28 03:10:01 +05:30
ayyoob
06bb551842 added android sense batch graphs 2016-04-28 03:05:27 +05:30
ayyoob
32958b2076 few changes in android agent and added android sense realtime graphs 2016-04-28 01:52:12 +05:30
charithag
4ef3f8d461 Fix timing issue 2016-04-27 17:45:29 +05:30
charithag
fb71f5743c Remove obsolete units and update analytics components 2016-04-27 15:41:27 +05:30
charithag
03c4768e7d Update new analytics components. 2016-04-27 13:44:38 +05:30
mharindu
e63afcec48 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-27 12:28:51 +05:30
mharindu
f6d75bb880 Added permissions to firealarm API 2016-04-27 12:28:43 +05:30
prabathabey
cfbc36ff2d Making the plug-in implementations compatible with the changes introduced to DeviceManagementService SPI 2016-04-26 17:17:37 +05:30
ayyoob
313b48f01d added virtual firealarm graphs 2016-04-26 15:58:54 +05:30
Rasika Perera
0e3ed08de4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-26 11:36:32 +05:30
Rasika Perera
cb7f7a6cd9 Autocompleting API params for Operations Implemented 2016-04-26 11:35:35 +05:30
prabathabey
ac407a6a1a Removing obsolete dependencies to ApplicationManagert interface from plug-in specific device management service implementations 2016-04-25 20:30:10 +05:30
ayyoob
f0c17184f8 few changes on while creating a role for android sense and virtual firelaarm 2016-04-23 23:39:11 +05:30
Ruwan
525fc5f5e9 Merge pull request #233 from ayyoob/das-ext 
Few changes in android sense and virtual firealarm
 2016-04-23 21:42:03 +05:30
ayyoob
d128804b04 added real time analytics for virtual fire alarm 2016-04-23 20:30:37 +05:30
ayyoob
e3f117e8fe few changes in virtual firealarm stats api 2016-04-23 00:07:54 +05:30
ayyoob
16fb54d463 Changes after testing with virtual firealarm and android sense 2016-04-22 20:58:13 +05:30
NuwanSameera
eb0069381d Remove digital display and drone analyzer from plugins 2016-04-22 15:51:32 +05:30
NuwanSameera
59ea70e761 Remove digital display and drone analyzer from plugins 2016-04-22 15:35:12 +05:30
NuwanSameera
fda0e9fb5d Add uninstall feature to mobile application features 2016-04-22 14:33:47 +05:30
hasuniea
05d252e61d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-22 09:33:38 +05:30
ayyoob
5f43cc47e8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-20 17:39:44 +05:30
Rasika Perera
8e8b2a69c1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-20 15:09:58 +05:30
ayyoob
a3c7208cea Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt-plugins into das-ext 2016-04-20 15:03:20 +05:30
ayyoob
6101d2dc09 few changes on android sense 2016-04-20 14:59:14 +05:30
Rasika Perera
0a060d9a73 Fixing android-sense to support auto-generated operations 2016-04-20 14:04:06 +05:30
Rasika Perera
506a48569b Now operations are auto generated and supports query params, path params and form params. 2016-04-20 13:38:37 +05:30
ayyoob
d2f59f50bb few changes to resolve start up issues 2016-04-20 00:11:59 +05:30
ayyoob
087be385c4 merged with upstream 2016-04-19 23:58:38 +05:30
ayyoob
f5fc978b5b refactored analytics scripts 2016-04-19 23:43:27 +05:30
Ruwan
c609ef1c9b Merge pull request #229 from NuwanSameera/master 
Remove monitor operations from controller APIs.
 2016-04-19 18:35:40 +05:30
NuwanSameera
4ad62b1dc1 Remove monitor operations from controller api. 2016-04-19 17:16:58 +05:30
Kasun Delgolla
a6a0fc2a57 Adding VPN feature for android 2016-04-19 16:25:19 +05:30
NuwanSameera
1606c365e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 15:13:04 +05:30
charithag
4a2b28cd9f Fix UI issues occured after merge with emm ui 2016-04-19 14:57:16 +05:30
NuwanSameera
f3cbe67cad \Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 13:38:25 +05:30
Prabath Abeysekara
ec983337a9 Merge pull request #226 from charithag/master 
Moved devicemgt_admin jax-rs to carbon-device-mgt
 2016-04-19 13:36:46 +05:30
NuwanSameera
f8c4b6413c Resolve conflicts 2016-04-19 11:46:27 +05:30
NuwanSameera
2d4f07fc55 Add REST Api annotations to Api implementations. 2016-04-19 11:33:31 +05:30
hasuniea
61353730ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:02:34 +05:30
charithag
c8b55ea2c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:00:27 +05:30
ayyoob
2567c812f2 removed das extension feature 2016-04-18 17:13:51 +05:30
charithag
7fb167b7fa Moved devicemgt_admin jax-rs to carbon-device-mgt 2016-04-18 16:41:04 +05:30
ayyoob
30578a9161 added android sense code after testing 2016-04-18 02:59:43 +05:30
ayyoob
0b67c0f74a added android sense agent code 2016-04-17 12:18:25 +05:30
ayyoob
3e1b0c54e9 made content validator to process batch events 2016-04-16 01:10:58 +05:30
ayyoob
cdb1f62ba9 Made device plugins to connect securely with the MQTT broker 2016-04-15 23:10:48 +05:30
ayyoob
d3a769776b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-14 20:04:41 +05:30
ayyoob
6709360249 adding das receivers and publisher with OAUTH 2016-04-14 19:56:33 +05:30
NuwanSameera
50f8716527 Resolve conflicts. 2016-04-11 16:09:23 +05:30
hasuniea
34cf1abf80 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-11 09:42:38 +05:30
charithag
73d3321154 Fix issues in virtual fire alarm jax-rs api 2016-04-08 16:13:37 +05:30
hasuniea
339deef5c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-08 11:03:34 +05:30
charithag
6daa5c43c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-07 20:47:37 +05:30
charithag
29486fedd5 Refactoring admin jax-rs to comply with restructured cdm 2016-04-07 20:42:56 +05:30
mharindu
918302475b Fixed incorrect location coordinate issue (EMM-1313) 2016-04-07 17:28:27 +05:30
hasuniea
b41cac80db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-04 14:50:46 +05:30
mharindu
2548a1dd18 Fix for EMM-1297 2016-04-04 14:21:11 +05:30
charithag
d09aa13497 Refactor group management service 2016-04-01 13:31:07 +05:30