susinda
|
5ad6dc1f1d
|
Fxing PhoneNumber Serach for android
|
2017-02-28 20:28:48 +05:30 |
|
lakshani
|
3505cc8abc
|
Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu'
|
2017-02-28 20:28:43 +05:30 |
|
Susinda Perera
|
6f9ea52218
|
Merge pull request #593 from wso2/cloud-3.1.0
Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28
|
2017-02-28 19:25:12 +05:30 |
|
ayyoob
|
384ab40f5b
|
added ssl context
|
2017-02-27 16:44:26 +05:30 |
|
Hasunie
|
17c017379c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-02-21 11:50:12 +05:30 |
|
lakshani
|
ffee269a0e
|
Fixed the issue in server startup- removed error logs
|
2017-02-20 14:01:56 +05:30 |
|
lakshani
|
964e2aade7
|
Fixed the issue in server startup error logs
|
2017-02-20 13:53:18 +05:30 |
|
Kamidu Sachith Punchihewa
|
740bb976fa
|
adding location operation to device view page
|
2017-02-19 19:10:20 +05:30 |
|
kamidu
|
afaa75d3a9
|
adding screen shots
|
2017-02-17 20:46:09 +05:30 |
|
kamidu
|
463d8a9dff
|
wording sugessions for cloud
|
2017-02-16 00:23:58 +05:30 |
|
Imesh Chandrasiri
|
20bd1b399b
|
Removed conflict markings
|
2017-02-15 11:16:41 +05:30 |
|
Imesh Chandrasiri
|
a890d9fb89
|
Device enrollment page revamp
|
2017-02-15 11:14:07 +05:30 |
|
Imesh Chandrasiri
|
bccc47ebd2
|
Conflict fix
|
2017-02-15 10:46:07 +05:30 |
|
Imesh Chandrasiri
|
4b7637a426
|
Device enrollment page revampl
|
2017-02-15 10:43:47 +05:30 |
|
Imesh Chandrasiri
|
37b032d710
|
Merge branch 'cloud-3.1.0' into cloud-3.1.0
|
2017-02-15 10:20:21 +05:30 |
|
Imesh Chandrasiri
|
67313882ed
|
Device enrollment page changes for cloud
|
2017-02-14 22:39:17 +05:30 |
|
kamidu
|
71c93eec29
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
2017-02-14 19:27:11 +05:30 |
|
kamidu
|
305df1c2bd
|
enhansing the device cloud ui
|
2017-02-14 19:27:02 +05:30 |
|
kamidu
|
9d733d6cc1
|
Fixing android location issue
|
2017-02-14 12:58:13 +05:30 |
|
Susinda Perera
|
8a9affc4b8
|
Merge pull request #582 from ayyoob/210releasepatch
added device management api to be default
|
2017-02-14 12:06:48 +05:30 |
|
Imesh Chandrasiri
|
f10e26f0a9
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
2017-02-14 10:27:20 +05:30 |
|
Imesh Chandrasiri
|
2fcd5ca020
|
Model Popup title space issue fix
|
2017-02-14 10:26:56 +05:30 |
|
Hasunie
|
0c87c32094
|
Merging changes
|
2017-02-14 10:18:57 +05:30 |
|
lakshani
|
f5d71d917e
|
Added change device status feature to mobile plugings
|
2017-02-09 14:14:44 +05:30 |
|
ayyoob
|
a294c20a2a
|
added device management api to be default
|
2017-02-09 09:59:24 +05:30 |
|
lakshani
|
3c349a71e6
|
removed unwanted repositories from restconnector
|
2017-02-07 10:42:28 +05:30 |
|
lakshani
|
edb8e71ac2
|
Added change device status feature to mobile plugings
|
2017-02-07 10:38:12 +05:30 |
|
ayyoob
|
e66311b844
|
fixed few multi tenant issues
|
2017-02-06 03:47:54 +05:30 |
|
ayyoob
|
00feadac97
|
fixed validation url property
|
2017-02-05 21:49:37 +05:30 |
|
ayyoob
|
dd3017578a
|
added artefact deployment support for device types
|
2017-02-05 17:52:52 +05:30 |
|
kamidu
|
fe338aa412
|
removing the module vfa plugin
|
2017-02-03 17:20:25 +05:30 |
|
Kamidu Sachith Punchihewa
|
68b36babe6
|
Merge pull request #575 from wso2/master
UI fixes for device cloud
|
2017-02-03 16:53:19 +05:30 |
|
kamidu
|
bd715b7aac
|
resolving branch conflicts
|
2017-02-03 16:51:25 +05:30 |
|
kamidu
|
53840dcc37
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-02-03 13:01:21 +05:30 |
|
ayyoob
|
56de095599
|
resolved app connector build slowness issue
|
2017-02-03 05:00:57 +05:30 |
|
WSO2 Builder
|
d7e4580e77
|
[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration
|
2017-02-02 16:06:06 +05:30 |
|
WSO2 Builder
|
1737eaaa79
|
[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11
|
2017-02-02 16:05:58 +05:30 |
|
Hasunie
|
3b98e0f754
|
Merge pull request #572 from charithag/master-update-swagger-docs
Update swagger docs
|
2017-02-02 14:58:11 +05:30 |
|
ayyoob
|
e0f6e9579d
|
fixed multi tenant issues after testing
|
2017-02-02 03:17:19 +05:30 |
|
ayyoob
|
2cfc4540f4
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
2017-02-02 01:59:53 +05:30 |
|
ayyoob
|
50d8aedade
|
fixed analytics multi tenant issues
|
2017-02-02 01:59:48 +05:30 |
|
charitha
|
9bf38af4f7
|
Fix issues in swagger docs
|
2017-02-01 15:03:10 +05:30 |
|
Milan Perera
|
99782e6360
|
Resolved conflicts and merged
|
2017-02-01 14:13:01 +05:30 |
|
Hasunie
|
1ab1def2b6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-02-01 12:04:18 +05:30 |
|
Hasunie
|
fb28a4042f
|
fixing windows config issues
|
2017-02-01 12:02:50 +05:30 |
|
Milan Perera
|
cc8066896b
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud
|
2017-02-01 11:31:42 +05:30 |
|
Milan Perera
|
e1a419425e
|
Added cloud agent to the download page
|
2017-02-01 11:31:15 +05:30 |
|
ayyoob
|
73eb590a7c
|
renamed grant type to default
|
2017-02-01 00:08:32 +05:30 |
|
Kamidu Sachith Punchihewa
|
64cb8b5223
|
Update load-map.js
|
2017-01-31 14:10:29 +05:30 |
|
kamidu
|
55489d5e52
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-01-31 13:44:12 +05:30 |
|
kamidu
|
192e1c3edc
|
adding missing classes in hbs
|
2017-01-31 13:41:01 +05:30 |
|
WSO2 Builder
|
7034dae2b5
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-31 12:58:56 +05:30 |
|
WSO2 Builder
|
a2224f96ff
|
[maven-release-plugin] prepare release v3.0.10
|
2017-01-31 12:58:45 +05:30 |
|
lakshani
|
67663449d2
|
removed unwanted versions from the pom
|
2017-01-31 11:02:49 +05:30 |
|
Hasunie
|
f9bb3f6e89
|
removing swagger annotation from enrollment
(cherry picked from commit 3dc1418)
|
2017-01-31 10:23:02 +05:30 |
|
Hasunie
|
3dc1418290
|
removing swagger annotation from enrollment
|
2017-01-31 10:16:56 +05:30 |
|
lakshani
|
1319806a6c
|
removed snapshot versions
|
2017-01-30 19:32:26 +05:30 |
|
lakshani
|
f62e7021d6
|
updated the pom to latest version
|
2017-01-30 19:03:30 +05:30 |
|
lakshani
|
8f53a05962
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-01-30 18:44:33 +05:30 |
|
lakshani
|
fff1a3f168
|
fixed the issues in rest connector
|
2017-01-30 18:44:23 +05:30 |
|
WSO2 Builder
|
4554d8929d
|
[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration
|
2017-01-30 18:07:35 +05:30 |
|
WSO2 Builder
|
da7c040224
|
[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9
|
2017-01-30 18:07:24 +05:30 |
|
GPrathap
|
1d488b06a8
|
allowing every internal users to view device analytics dashboard
|
2017-01-30 17:53:02 +05:30 |
|
lakshani
|
ffdcd2b217
|
updated pom based on review comments
|
2017-01-30 11:45:19 +05:30 |
|
lakshani
|
ebc6c6ec11
|
added java doc comments
|
2017-01-30 09:41:39 +05:30 |
|
lakshani
|
d6b6da9c14
|
added rest-connector
|
2017-01-30 09:29:33 +05:30 |
|
ayyoob
|
036d6936a7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-25 14:05:36 +05:30 |
|
ayyoob
|
3021947f30
|
updated saml grant type config name
|
2017-01-25 14:03:57 +05:30 |
|
GPrathap
|
21abaa8270
|
changed websocket token retrieval mechanism
|
2017-01-25 11:24:41 +05:30 |
|
ayyoob
|
8b5dd4d811
|
resolved merge issues
|
2017-01-24 19:57:25 +05:30 |
|
ayyoob
|
4f1f1a3e7e
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-24 19:46:39 +05:30 |
|
WSO2 Builder
|
e64fe695ab
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-20 13:36:50 +00:00 |
|
WSO2 Builder
|
5fbd40c579
|
[maven-release-plugin] prepare release v3.0.8
|
2017-01-20 13:31:44 +00:00 |
|
kamidu
|
0679aab11d
|
adding missing classes in hbs
|
2017-01-20 18:26:15 +05:30 |
|
Rasika Perera
|
1fdaf0dc2f
|
Merge pull request #554 from ayyoob/arduino
arduino fix is added
|
2017-01-20 18:01:23 +05:30 |
|
Rasika Perera
|
10428e7ca2
|
Merge pull request #553 from hasuniea/windows10
fixing synapse configs
|
2017-01-20 18:01:09 +05:30 |
|
ayyoob
|
affbd00796
|
arduino fix is added
|
2017-01-20 17:05:41 +05:30 |
|
Hasunie
|
8eed99c215
|
fixing passcode issue
|
2017-01-20 16:09:18 +05:30 |
|
sinthuja
|
f517975bf0
|
Adding wso2 event receiver to geo capp.
|
2017-01-20 15:33:01 +05:30 |
|
Hasunie
|
9467c52707
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
2017-01-20 15:31:53 +05:30 |
|
Rasika Perera
|
3fc33d9e49
|
Merge pull request #552 from Jasintha/release-3.0.x
MQTT subscription topic patten should changed to this format to get policy updates
|
2017-01-20 14:56:59 +05:30 |
|
Jasintha
|
d515dc6d03
|
Fixing policy topic chanaged issue
|
2017-01-20 14:28:38 +05:30 |
|
Hasunie
|
636eb91a0a
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
2017-01-20 10:21:10 +05:30 |
|
Hasunie
|
b3d096f02c
|
removining app restriction policy from policy edit UI
|
2017-01-20 08:07:46 +05:30 |
|
WSO2 Builder
|
9687362258
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-20 02:04:54 +00:00 |
|
WSO2 Builder
|
ee063a1a43
|
[maven-release-plugin] prepare release v3.0.7
|
2017-01-20 02:03:09 +00:00 |
|
Rasika Perera
|
0d6dd3b96e
|
Merge pull request #548 from hasuniea/windows10
Removing windows app restriction policy from Policy UI
|
2017-01-19 23:34:08 +05:30 |
|
Hasunie
|
68631a2dbd
|
removing windows app restriction policy from Policy UI
|
2017-01-19 23:26:43 +05:30 |
|
Chatura Dilan
|
57d6fb12ce
|
updating android agent
|
2017-01-19 22:54:34 +05:30 |
|
kamidu
|
c6d0c4ba44
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-19 22:39:15 +05:30 |
|
kamidu
|
50a2c3d89a
|
Enable opasity variation with time on location records
|
2017-01-19 22:38:52 +05:30 |
|
Hasunie
|
10cab941ee
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
2017-01-19 22:35:30 +05:30 |
|
Hasunie
|
86d91c3bdf
|
fixing Windows synapse config issues
|
2017-01-19 22:33:58 +05:30 |
|
Chatura Dilan
|
b2ff6c4181
|
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-19 21:33:16 +05:30 |
|
Chatura Dilan
|
57cdf8e1a5
|
updating android agent
|
2017-01-19 21:31:07 +05:30 |
|
kamidu
|
09de477e74
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-19 21:30:39 +05:30 |
|
kamidu
|
eb9c789b51
|
Enable opasity variation with time on location records
|
2017-01-19 21:30:29 +05:30 |
|
Rasika Perera
|
3b5159bed5
|
Merge pull request #542 from hasuniea/windows10
Fixing Windows10 passcode policy issue
|
2017-01-19 19:33:15 +05:30 |
|
kamidu
|
60046823dd
|
Enable location histry for android sense
|
2017-01-19 18:42:58 +05:30 |
|
kamidu
|
156402153d
|
git Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-19 17:41:26 +05:30 |
|
kamidu
|
86a3b18464
|
adding location history to map view
|
2017-01-19 17:41:08 +05:30 |
|
Rasika Perera
|
737d1da07b
|
Changed webapps title [EMM] into [IoT Server]
|
2017-01-19 17:04:01 +05:30 |
|
Hasunie
|
857e971fa6
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
2017-01-19 15:58:01 +05:30 |
|
Hasunie
|
399496ce82
|
fixing windows10 policy issue
|
2017-01-19 15:57:19 +05:30 |
|
Menaka Jayawardena
|
872baf637f
|
Replacing android sense agent apk.
|
2017-01-19 13:00:35 +05:30 |
|
Menaka Jayawardena
|
ed28fb6adb
|
Adding permission updater for other device types.
|
2017-01-19 13:00:35 +05:30 |
|
Menaka Jayawardena
|
a7692b66d4
|
Removing commented code and refactoring.
|
2017-01-19 13:00:35 +05:30 |
|
Rasika Perera
|
3b7257c93f
|
Fixing "process" not found issues
|
2017-01-19 07:41:13 +05:30 |
|
Rasika Perera
|
9a3fc7e446
|
Cleaned windows-web-agent config.json
|
2017-01-19 01:34:48 +05:30 |
|
Rasika Perera
|
fe6c35ebca
|
Cleaned android-web-agent config.json
|
2017-01-19 01:34:48 +05:30 |
|
Rasika Perera
|
c04851d448
|
Removed iOS stuff from windows-web-agent
|
2017-01-19 01:34:48 +05:30 |
|
Rasika Perera
|
8b1a27a181
|
Merge pull request #536 from hasuniea/windows10
Fixing Windows plugin issues
|
2017-01-19 01:26:08 +05:30 |
|
Rasika Perera
|
a521b41352
|
Merge pull request #539 from menakaj/release-3.0.x
Permissions added for android sense
|
2017-01-19 01:24:07 +05:30 |
|
Rasika Perera
|
0bc380c7d0
|
Merge pull request #538 from Kamidu/release-3.0.x
Enable location history
|
2017-01-19 01:23:55 +05:30 |
|
Rasika Perera
|
1d10dbee88
|
Now UI configs supports system parameters with eg. %iot.core.host%
|
2017-01-19 00:58:13 +05:30 |
|
Menaka Jayawardena
|
6df9479fea
|
device-mgt user permissions added for android sense.
|
2017-01-18 22:51:31 +05:30 |
|
Menaka Jayawardena
|
e19802312e
|
Operation bar removed from android-sense device.
|
2017-01-18 22:51:31 +05:30 |
|
kamidu
|
c522809bd5
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-18 22:41:48 +05:30 |
|
kamidu
|
234157b6f5
|
adding location history to map view
|
2017-01-18 22:41:11 +05:30 |
|
Megala
|
574a106977
|
Adding fixes to path
|
2017-01-18 21:46:37 +05:30 |
|
Hasunie
|
736b09de31
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10
|
2017-01-18 19:14:02 +05:30 |
|
Hasunie
|
164ae997b1
|
fixing synapse config issues
|
2017-01-18 19:09:46 +05:30 |
|
Hasunie
|
1362e2d7fe
|
Fixing windows policy issues
|
2017-01-18 18:03:28 +05:30 |
|
Rasika Perera
|
357010120a
|
Merge pull request #535 from Jasintha/release-3.0.x
receiving message format has been changed ,so updated the client according to …
|
2017-01-18 17:27:43 +05:30 |
|
Jasintha
|
55e0cec875
|
receving message has been chaged ,so updated the client according to that
|
2017-01-18 16:20:46 +05:30 |
|
Chatura Dilan
|
7e58c17b1e
|
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-18 15:20:25 +05:30 |
|
Chatura Dilan
|
6db0885eb9
|
remove cosu whitelisting apps
|
2017-01-18 15:19:05 +05:30 |
|
Menaka Jayawardena
|
8e33e31704
|
Giving high priority for call and sms receivers and replacing android sense agent.
|
2017-01-18 11:59:14 +05:30 |
|
Megala
|
c35727ae0b
|
resolving conflicts
|
2017-01-18 09:47:00 +05:30 |
|
Megala
|
444119790c
|
Fixing geo dashboard issues
|
2017-01-18 02:33:04 +05:30 |
|
ayyoob
|
f1e75d9375
|
apim seperation
|
2017-01-18 01:48:43 +05:30 |
|
Rasika Perera
|
1d0753ab8d
|
Merge pull request #529 from DimalChandrasiri/release-3.0.x
Fixed android type view notification pane message inconsistancy issue
|
2017-01-17 19:41:19 +05:30 |
|
Rasika Perera
|
c74e9de2f5
|
Merge pull request #527 from dunithd/release-3.0.x
Formatting the anchor text after fixing 500 error
|
2017-01-17 19:40:38 +05:30 |
|
Rasika Perera
|
00ff43bfb4
|
Merge pull request #530 from hasuniea/windows10
fixing win10, 8.1 conflicting issues
|
2017-01-17 19:40:22 +05:30 |
|
Imesh Chandrasiri
|
dc840c389a
|
Fix for inconsistant notification message
|
2017-01-17 17:48:12 +05:30 |
|
Imesh Chandrasiri
|
62ba568e05
|
Fixed android type view notification pane message inconsistancy issue
|
2017-01-17 17:34:51 +05:30 |
|
Hasunie
|
95a7ff6aaf
|
fixing windows app-conf issue
|
2017-01-17 16:48:10 +05:30 |
|
Hasunie
|
e030be3d24
|
fixed code conflicts
|
2017-01-17 16:40:06 +05:30 |
|
Menaka Jayawardena
|
88b8901f75
|
Removed unused Test page from portal dashboard.
|
2017-01-17 16:15:23 +05:30 |
|
Menaka Jayawardena
|
f699ba54b3
|
Added Api annotation to AndroidSenseService
|
2017-01-17 16:14:49 +05:30 |
|
Hasunie
|
38216c4b9d
|
fixing win10,8.1 conflicting issues
|
2017-01-17 16:04:48 +05:30 |
|
Dunith Dhanushka
|
bbbfff28d9
|
UI Improvements for Geo Fencing
|
2017-01-17 15:40:27 +05:30 |
|
Dunith Dhanushka
|
d4107747ab
|
Update device-view.js
|
2017-01-17 15:35:59 +05:30 |
|
Rasika Perera
|
05e2cb7bb8
|
Changed [EMM] title into [IoT Server]
|
2017-01-17 15:34:08 +05:30 |
|
Dunith Dhanushka
|
54b08f9b7a
|
Adding the JSON formatted anchor text
|
2017-01-17 15:10:46 +05:30 |
|
Dunith Dhanushka
|
6634dded55
|
Building the anchor text
|
2017-01-17 15:09:05 +05:30 |
|
Rasika Perera
|
0b983855cf
|
Merge pull request #522 from DimalChandrasiri/release-3.0.x
Fix for multiple popup issue
|
2017-01-17 11:49:59 +05:30 |
|
Dunith Dhanushka
|
c6437c3065
|
Formatting the title
|
2017-01-17 11:14:58 +05:30 |
|
Dunith Dhanushka
|
c1de144bcf
|
Setting device id and type to page title
|
2017-01-17 11:04:19 +05:30 |
|
ayyoob
|
dad3a34a27
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
2017-01-16 22:40:03 +05:30 |
|