Commit Graph

1771 Commits

Author SHA1 Message Date
Rasika Perera
0bc380c7d0 Merge pull request #538 from Kamidu/release-3.0.x
Enable location history
2017-01-19 01:23:55 +05:30
Rasika Perera
1d10dbee88 Now UI configs supports system parameters with eg. %iot.core.host% 2017-01-19 00:58:13 +05:30
Menaka Jayawardena
6df9479fea device-mgt user permissions added for android sense. 2017-01-18 22:51:31 +05:30
Menaka Jayawardena
e19802312e Operation bar removed from android-sense device. 2017-01-18 22:51:31 +05:30
kamidu
c522809bd5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-18 22:41:48 +05:30
kamidu
234157b6f5 adding location history to map view 2017-01-18 22:41:11 +05:30
Megala
574a106977 Adding fixes to path 2017-01-18 21:46:37 +05:30
Hasunie
736b09de31 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-18 19:14:02 +05:30
Hasunie
164ae997b1 fixing synapse config issues 2017-01-18 19:09:46 +05:30
Hasunie
1362e2d7fe Fixing windows policy issues 2017-01-18 18:03:28 +05:30
Rasika Perera
357010120a Merge pull request #535 from Jasintha/release-3.0.x
receiving message format has been changed ,so updated the client according to …
2017-01-18 17:27:43 +05:30
Jasintha
55e0cec875 receving message has been chaged ,so updated the client according to that 2017-01-18 16:20:46 +05:30
Chatura Dilan
7e58c17b1e Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-18 15:20:25 +05:30
Chatura Dilan
6db0885eb9 remove cosu whitelisting apps 2017-01-18 15:19:05 +05:30
Menaka Jayawardena
8e33e31704 Giving high priority for call and sms receivers and replacing android sense agent. 2017-01-18 11:59:14 +05:30
Megala
c35727ae0b resolving conflicts 2017-01-18 09:47:00 +05:30
Megala
444119790c Fixing geo dashboard issues 2017-01-18 02:33:04 +05:30
ayyoob
f1e75d9375 apim seperation 2017-01-18 01:48:43 +05:30
Rasika Perera
1d0753ab8d Merge pull request #529 from DimalChandrasiri/release-3.0.x
Fixed android type view notification pane message inconsistancy issue
2017-01-17 19:41:19 +05:30
Rasika Perera
c74e9de2f5 Merge pull request #527 from dunithd/release-3.0.x
Formatting the anchor text after fixing 500 error
2017-01-17 19:40:38 +05:30
Rasika Perera
00ff43bfb4 Merge pull request #530 from hasuniea/windows10
fixing win10, 8.1 conflicting issues
2017-01-17 19:40:22 +05:30
Imesh Chandrasiri
dc840c389a Fix for inconsistant notification message 2017-01-17 17:48:12 +05:30
Imesh Chandrasiri
62ba568e05 Fixed android type view notification pane message inconsistancy issue 2017-01-17 17:34:51 +05:30
Hasunie
95a7ff6aaf fixing windows app-conf issue 2017-01-17 16:48:10 +05:30
Hasunie
e030be3d24 fixed code conflicts 2017-01-17 16:40:06 +05:30
Menaka Jayawardena
88b8901f75 Removed unused Test page from portal dashboard. 2017-01-17 16:15:23 +05:30
Menaka Jayawardena
f699ba54b3 Added Api annotation to AndroidSenseService 2017-01-17 16:14:49 +05:30
Hasunie
38216c4b9d fixing win10,8.1 conflicting issues 2017-01-17 16:04:48 +05:30
Dunith Dhanushka
bbbfff28d9 UI Improvements for Geo Fencing 2017-01-17 15:40:27 +05:30
Dunith Dhanushka
d4107747ab Update device-view.js 2017-01-17 15:35:59 +05:30
Rasika Perera
05e2cb7bb8 Changed [EMM] title into [IoT Server] 2017-01-17 15:34:08 +05:30
Dunith Dhanushka
54b08f9b7a Adding the JSON formatted anchor text 2017-01-17 15:10:46 +05:30
Dunith Dhanushka
6634dded55 Building the anchor text 2017-01-17 15:09:05 +05:30
Rasika Perera
0b983855cf Merge pull request #522 from DimalChandrasiri/release-3.0.x
Fix for multiple popup issue
2017-01-17 11:49:59 +05:30
Dunith Dhanushka
c6437c3065 Formatting the title 2017-01-17 11:14:58 +05:30
Dunith Dhanushka
c1de144bcf Setting device id and type to page title 2017-01-17 11:04:19 +05:30
ayyoob
dad3a34a27 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 22:40:03 +05:30
Dunith Dhanushka
b4f876d961 Updating the label text for Geo fencing link 2017-01-16 18:57:45 +05:30
Dunith Dhanushka
97d4fb1ef9 Removing advanced Geo fencing controls 2017-01-16 18:54:42 +05:30
Dunith Dhanushka
2c696b7222 Displaying the sidebar while page loads 2017-01-16 18:41:10 +05:30
ayyoob
76326b936c Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 18:30:01 +05:30
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
Menaka Jayawardena
ed85f78311 Replacing android-sense agent 2017-01-16 14:14:18 +05:30
Menaka Jayawardena
d8c2d65f05 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 00:13:35 +05:30
Imesh Chandrasiri
8eb95c3695 Fix for multiple popup issue 2017-01-14 23:56:51 +05:30
Imesh Chandrasiri
d918e32d59 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 23:51:43 +05:30
Imesh Chandrasiri
e112371d8e Fix for multiple popup issue 2017-01-14 23:51:07 +05:30
WSO2 Builder
3f1b7a6005 [maven-release-plugin] prepare for next development iteration 2017-01-14 12:22:40 +00:00
WSO2 Builder
91a0edb0a0 [maven-release-plugin] prepare release v3.0.6 2017-01-14 12:17:46 +00:00
Menaka Jayawardena
4eb186140a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 16:37:52 +05:30
Rasika Perera
3ae9fba143 Updating IoTS doc links 2017-01-13 23:14:26 +05:30
Rasika Perera
a3e97b4356 Merge pull request #521 from dunithd/release-3.0.x
Replacing the value of GLOBAL-STATE param with comma separated deviceId,deviceType
2017-01-13 22:42:53 +05:30
Dunith Dhanushka
a097482b91 Passing deviceId and deviceType into view 2017-01-13 20:26:13 +05:30
Dunith Dhanushka
33e57efc3d Replacing JSON object with comma separated values 2017-01-13 20:25:03 +05:30
Chatura Dilan
d55e0f21b7 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-13 20:21:33 +05:30
Chatura Dilan
809d292c95 Added Android scopes 2017-01-13 20:21:14 +05:30
Hasunie
bd0f1f1900 fixing windows requestToken issue 2017-01-13 19:31:35 +05:30
Hasunie
810bbafea3 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-13 18:43:48 +05:30
Hasunie
ed0b40215a fixing synapse config issues 2017-01-13 18:43:03 +05:30
Hasunie
c162f379b4 adding windows operation scope 2017-01-13 18:19:40 +05:30
Rasika Perera
f84e3526f5 changed [fw-ok] with [fw-success] 2017-01-13 17:50:19 +05:30
Hasunie
97705311b9 removing install app tab from the device view 2017-01-13 16:09:45 +05:30
Hasunie
a2ae12f9d1 adding windows 10 updates 1607/1511 changes 2017-01-13 16:08:58 +05:30
Hasunie
4c4fd00593 fixing issue in different type of windows device payloads 2017-01-13 16:06:31 +05:30
Hasunie
8655da595e removing swagger definition from the soap endpoints 2017-01-13 16:05:10 +05:30
Rasika Perera
72d9e2d0d3 Merge pull request #515 from hasuniea/windows10
Fixing gateway issues in windows
2017-01-13 13:01:40 +05:30
Hasunie
e81d2b1c20 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-13 09:08:04 +05:30
Hasunie
429266d9d2 adding windows synaps configs 2017-01-13 09:07:33 +05:30
ayyoob
09f7fb3a5f moved the traffic through the gateway 2017-01-13 04:49:35 +05:30
ayyoob
466c2b1151 moved to gateway mode 2017-01-12 19:29:59 +05:30
Rasika Perera
ebe47ef972 Merge pull request #516 from DimalChandrasiri/release-3.0.x
Updating font wso2 to version 1.2.1
2017-01-11 22:41:29 +05:30
Milan Perera
76f52af4a5 Refactored android sense agent 2017-01-11 15:44:50 +05:30
Hasunie
32d99bcab6 fixing jira IOTS-378 2017-01-11 14:13:08 +05:30
Imesh Chandrasiri
fc3d15887e Updating font wso2 to version 1.2.1 2017-01-11 11:20:21 +05:30
Hasunie
43a61d046b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-11 09:03:35 +05:30
Hasunie
a905f22651 fixing Windows gatway issues 2017-01-11 09:03:03 +05:30
Menaka Jayawardena
672f153551 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-10 14:34:33 +05:30
Milan Perera
2eb18e304a Change scope of android configuration 2017-01-10 11:39:09 +05:30
charitha
b812b6af2e Fixed issue in showing android device location map 2017-01-09 12:36:06 +05:30
Hasunie
9e59993900 fixing issue in admin service tag 2017-01-09 08:25:54 +05:30
ayyoob
1df7d20a81 moved common configuration to global properties for input and output adapters 2017-01-08 21:26:14 +05:30
ayyoob
4cb6aca5b0 merge with upstream 2017-01-08 01:32:16 +05:30
ayyoob
ccaf47112a removed DCR, added global configuration values for input and output adapter 2017-01-08 01:20:04 +05:30
WSO2 Builder
b10579950b [maven-release-plugin] prepare for next development iteration 2017-01-07 11:25:51 +00:00
WSO2 Builder
b7a5454c2f [maven-release-plugin] prepare release v3.0.5 2017-01-07 11:22:33 +00:00
ayyoob
2e8279b61a removed scep impl from virtual fire alarm 2017-01-07 14:54:46 +05:30
Rasika Perera
0790689635 Removing unused package import in virtual_firealarm 2017-01-06 21:43:26 +05:30
Rasika Perera
7d07585cf1 Merge pull request #509 from hasuniea/windows10
Windows10 Location support
2017-01-06 20:36:01 +05:30
Hasunie
de533a0667 merging changes 2017-01-06 19:55:44 +05:30
Rasika Perera
82a1839fe9 Merge pull request #508 from dunithd/release-3.0.x
Adding Geo fencing link to Android device
2017-01-06 19:42:51 +05:30
madhawap
c98bb39fea resolving conflicts 2017-01-06 19:22:03 +05:30
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