Charitha Goonetilleke
186b3e16e4
Merge pull request #653 from ruwany/master
...
Merging cloud-310 branch with master
2017-04-25 11:29:04 +05:30
WSO2 Builder
72fab84bf9
[WSO2 Release] [Jenkins #2650 ] [Release 3.0.25] prepare for next development iteration
2017-04-24 17:57:19 +05:30
WSO2 Builder
5ff67af60a
[WSO2 Release] [Jenkins #2650 ] [Release 3.0.25] prepare release v3.0.25
2017-04-24 17:57:03 +05:30
charitha
de0cb9a5a2
Add agent 3.1.15 for cloud
...
(cherry picked from commit 0d6800b)
2017-04-24 11:35:25 +05:30
charitha
ab91e3a6b0
Fixed https://github.com/wso2/cdmf-agent-android/issues/33
...
(cherry picked from commit fadd2e6)
2017-04-24 11:35:18 +05:30
charitha
d80c25ed2b
Updating UIs of agents to latest
...
(cherry picked from commit 90c0618)
2017-04-24 11:35:07 +05:30
Rasika Perera
a1b0298374
Updating android agent into latest
...
(cherry picked from commit a41436d
2017-04-24 11:34:37 +05:30
Rasika Perera
51a613f167
Resolving #642 : Improve UX on location updates for Android
...
(cherry picked from commit 64b1b33
2017-04-24 11:24:26 +05:30
WSO2 Builder
4c0e505008
[WSO2 Release] [Jenkins #2645 ] [Release 3.0.24] prepare for next development iteration
2017-04-21 16:28:48 +05:30
WSO2 Builder
b653b4871d
[WSO2 Release] [Jenkins #2645 ] [Release 3.0.24] prepare release v3.0.24
2017-04-21 16:28:35 +05:30
amalhub
ec75361c57
Adding latest android-agent.apk ( https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13 )
2017-04-21 14:57:43 +05:30
WSO2 Builder
7a2b64605f
[WSO2 Release] [Jenkins #2640 ] [Release 3.0.23] prepare for next development iteration
2017-04-18 10:33:01 +05:30
WSO2 Builder
908ee841e9
[WSO2 Release] [Jenkins #2640 ] [Release 3.0.23] prepare release v3.0.23
2017-04-18 10:32:45 +05:30
WSO2 Builder
84220e2c25
[WSO2 Release] [Jenkins #2627 ] [Release 3.0.22] prepare for next development iteration
2017-04-07 14:56:29 +05:30
WSO2 Builder
5da8bf98b8
[WSO2 Release] [Jenkins #2627 ] [Release 3.0.22] prepare release v3.0.22
2017-04-07 14:56:13 +05:30
kamidu
bcdd78ae68
Merge branch 'master' into cloud-3.1.0
2017-04-07 14:31:11 +05:30
kamidu
dc0fda3925
fixing location and operation loading ui issues
2017-04-05 17:04:28 +05:30
kamidu
eb7a83bcc8
fixing location and operation loading ui issues
2017-04-05 17:02:38 +05:30
kamidu
9d3949ea37
enabling loading for location refrsh
2017-04-05 16:35:35 +05:30
kamidu
1d663e1b68
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
2017-04-05 11:14:26 +05:30
kamidu
4662db6701
device status fic
2017-04-05 11:14:10 +05:30
charitha
6f3578f797
Adding agent 3.1.7 for cloud
2017-04-05 10:19:31 +05:30
kamidu
9ad8cb21ae
android enrollment ui fixes and operation in progress animation fix
2017-04-04 17:13:02 +05:30
Kamidu Sachith Punchihewa
8f169d0116
Revert "Updated device-mgt version & interface."
2017-04-04 13:10:05 +05:30
kamidu
2abd8823a3
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
2017-04-03 18:28:30 +05:30
Harshan Liyanage
ff5a1c9c5d
Updated device-mgt version & interface.
2017-04-03 17:48:21 +05:30
kamidu
ee24a8baea
merging upstream cloud-3.1.0
2017-04-03 17:35:44 +05:30
kamidu
ace58b6649
policy filtering and location reload for cloud
2017-04-03 17:27:23 +05:30
WSO2 Builder
2cf8496351
[WSO2 Release] [Jenkins #2617 ] [Release 3.0.21] prepare for next development iteration
2017-03-30 10:31:28 +05:30
WSO2 Builder
7d6def8976
[WSO2 Release] [Jenkins #2617 ] [Release 3.0.21] prepare release v3.0.21
2017-03-30 10:31:12 +05:30
charitha
6398d79760
Fix https://github.com/wso2/product-iots/issues/332
...
(cherry picked from commit 0e4df87
2017-03-29 23:16:39 +05:30
charitha
0e4df87dda
Fix https://github.com/wso2/product-iots/issues/332
2017-03-29 23:15:59 +05:30
charitha
110c9405b1
Update device enrollement steps
...
(cherry picked from commit ca8ad9f
2017-03-29 22:28:21 +05:30
charitha
ca8ad9f528
Update device enrollement steps
2017-03-29 22:27:26 +05:30
WSO2 Builder
de5f854367
[WSO2 Release] [Jenkins #2614 ] [Release 3.0.20] prepare for next development iteration
2017-03-29 15:23:01 +05:30
WSO2 Builder
13cbce1e37
[WSO2 Release] [Jenkins #2614 ] [Release 3.0.20] prepare release v3.0.20
2017-03-29 15:22:46 +05:30
charitha
179cc93c1a
Downgraded android OS version to avoid ANR
...
(cherry picked from commit e13aa77
2017-03-29 14:37:08 +05:30
charitha
6ea597233b
Add google play store links to device enrollment page
...
(cherry picked from commit 243a3df
2017-03-29 14:36:38 +05:30
charitha
572d85dbd1
Instruct mac users to restart after installing HAXM
...
(cherry picked from commit b53fe60)
2017-03-29 14:35:59 +05:30
charitha
e13aa77b21
Downgraded android OS version to avoid ANR
2017-03-29 14:30:12 +05:30
charitha
2d67d33eb6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-03-29 14:09:02 +05:30
charitha
243a3df89d
Add google play store links to device enrollment page
2017-03-29 14:06:15 +05:30
WSO2 Builder
0f3318e353
[WSO2 Release] [Jenkins #2612 ] [Release 3.0.19] prepare for next development iteration
2017-03-29 11:13:40 +05:30
WSO2 Builder
41041f3f6d
[WSO2 Release] [Jenkins #2612 ] [Release 3.0.19] prepare release v3.0.19
2017-03-29 11:13:18 +05:30
charitha
d8218ef221
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-03-29 09:46:07 +05:30
charitha
b53fe60807
Instruct mac users to restart after installing HAXM
2017-03-29 09:45:34 +05:30
WSO2 Builder
cf3d543fea
[WSO2 Release] [Jenkins #2605 ] [Release 3.0.18] prepare for next development iteration
2017-03-24 15:45:48 +05:30
WSO2 Builder
59194a1286
[WSO2 Release] [Jenkins #2605 ] [Release 3.0.18] prepare release v3.0.18
2017-03-24 15:45:32 +05:30
charitha
52060c9d40
Fixed unzipping issue in tryit tool
...
(cherry picked from commit 01187db
2017-03-24 14:45:19 +05:30
charitha
33342e0e97
Fix documentation links
2017-03-24 14:44:55 +05:30
charitha
01187db029
Fixed unzipping issue in tryit tool
2017-03-24 14:35:31 +05:30
WSO2 Builder
82ac8417d3
[WSO2 Release] [Jenkins #2602 ] [Release 3.0.17] prepare for next development iteration
2017-03-23 13:14:16 +05:30
WSO2 Builder
d0e9362ee1
[WSO2 Release] [Jenkins #2602 ] [Release 3.0.17] prepare release v3.0.17
2017-03-23 13:14:05 +05:30
charitha
6aee69ef5b
Updated splash screen images
2017-03-23 08:53:28 +05:30
charitha
8ee81f497d
Adding latest Android agent
2017-03-23 01:11:14 +05:30
charitha
3bfa383cea
Adding Android-tryit tool
...
(cherry picked from commit c3e241e
2017-03-23 01:08:33 +05:30
sameera910409
d907f1bc51
fix https://wso2.org/jira/browse/EMM-1880
2017-03-22 19:02:47 +05:30
WSO2 Builder
2049e44319
[WSO2 Release] [Jenkins #2596 ] [Release 3.0.16] prepare for next development iteration
2017-03-22 15:53:43 +05:30
WSO2 Builder
d15dc25c13
[WSO2 Release] [Jenkins #2596 ] [Release 3.0.16] prepare release v3.0.16
2017-03-22 15:53:34 +05:30
Geeth
bc7b77e07a
Merge pull request #622 from charithag/master-androidtryit
...
Adding Android-tryit tool
2017-03-22 15:32:54 +05:30
charitha
c3e241e1d5
Adding Android-tryit tool
2017-03-22 15:29:37 +05:30
WSO2 Builder
8df6e56f40
[WSO2 Release] [Jenkins #2593 ] [Release 3.0.15] prepare for next development iteration
2017-03-21 20:11:47 +05:30
WSO2 Builder
2e8f5a63d2
[WSO2 Release] [Jenkins #2593 ] [Release 3.0.15] prepare release v3.0.15
2017-03-21 20:11:33 +05:30
Harshan Liyanage
893eccd817
Merge pull request #618 from hasuniea/master
...
resolved #616
2017-03-16 15:55:27 +05:30
Harshan Liyanage
bd2ded8563
Removed unnecessary braces.
2017-03-16 15:54:39 +05:30
Susinda
1c13f1b97d
Cloud and general doc links issue fixed
2017-03-16 14:42:09 +05:30
Hasunie
809a30fc7a
fixing code format issue
2017-03-16 14:22:24 +05:30
Hasunie
7de234c164
resolved #616
2017-03-16 14:14:32 +05:30
Hasunie
143569b83b
Fixing null property in AndriodAPIUtils
2017-03-16 12:26:37 +05:30
WSO2 Builder
c49b33bb4a
[WSO2 Release] [Jenkins #2584 ] [Release 3.0.14] prepare for next development iteration
2017-03-15 18:08:34 +05:30
WSO2 Builder
e1064dca07
[WSO2 Release] [Jenkins #2584 ] [Release 3.0.14] prepare release v3.0.14
2017-03-15 18:08:26 +05:30
Kamidu Sachith Punchihewa
95f64b0a15
Merge pull request #615 from wso2/cloud-3.1.0
...
Cloud related fixes
2017-03-15 17:47:31 +05:30
WSO2 Builder
68f329cbda
[WSO2 Release] [Jenkins #2581 ] [Release 3.0.13] prepare for next development iteration
2017-03-14 16:48:21 +05:30
WSO2 Builder
8669d1b44e
[WSO2 Release] [Jenkins #2581 ] [Release 3.0.13] prepare release v3.0.13
2017-03-14 16:48:11 +05:30
Harshan Liyanage
2753deb365
Merge pull request #602 from sameeragunarathne/master
...
refactor code for firebase cloud messaging
2017-03-14 16:41:19 +05:30
Harshan Liyanage
1882171824
Merge pull request #611 from Kamidu/cloud-3.1.0
...
android view related ui fixes
2017-03-13 17:47:10 +05:30
WSO2 Builder
18d3518236
[WSO2 Release] [Jenkins #2576 ] [Release 3.0.12] prepare for next development iteration
2017-03-13 17:43:20 +05:30
WSO2 Builder
867790d3cb
[WSO2 Release] [Jenkins #2576 ] [Release 3.0.12] prepare release v3.0.12
2017-03-13 17:43:10 +05:30
kamidu
c97dfb4080
android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local
2017-03-13 17:40:26 +05:30
sameera910409
078209347a
refactor code for firebase cloud messaging
2017-03-13 14:30:27 +05:30
Susinda
1ebc84450f
revert the implementation 'agent download from github release'
2017-03-13 14:15:03 +05:30
Susinda
286d293ddd
revert the implementation 'agent download from github release'
2017-03-13 13:55:42 +05:30
Susinda
7c3d94cf77
Added README file to avoid git ignoring empty dirs
2017-03-10 12:43:31 +05:30
Susinda
f96389e671
Android agent downloadded from github relese location, Hasuni's fix on initial operations added
2017-03-10 12:00:27 +05:30
Susinda Perera
fb6cfb6699
Merge pull request #1 from susinda/cloud-3.1.0
...
Merging from Cloud 3.1.0
2017-03-09 12:45:44 +05:30
kamidu
d2d56651cc
fix for leaflet tile not loading issues
...
(cherry picked from commit 6604c23257
2017-03-07 15:25:24 +05:30
Harshan Liyanage
b82a59c828
Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0
2017-03-03 17:45:26 +05:30
Hasunie
7fcf4e9a3b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
2017-03-03 17:38:39 +05:30
Hasunie
3e50f0b737
adding initial operations
2017-03-03 17:37:55 +05:30
Harshan Liyanage
dc054e6ed5
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
2017-03-03 17:10:17 +05:30
Harshan Liyanage
f2761e9b0a
Removed info operation addition upon page load
2017-03-03 17:10:02 +05:30
ayyoob
a10eb7cb14
removed feature
2017-03-03 17:03:57 +05:30
ayyoob
77ec1c4107
fixed operation bar permission rendering issue
2017-03-02 20:27:46 +05:30
kamidu
6604c23257
fix for leaflet tile not loading issues
2017-03-02 15:20:27 +05:30
susinda
5ad6dc1f1d
Fxing PhoneNumber Serach for android
2017-02-28 20:28:48 +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
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
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
edb8e71ac2
Added change device status feature to mobile plugings
2017-02-07 10:38:12 +05:30
ayyoob
dd3017578a
added artefact deployment support for device types
2017-02-05 17:52:52 +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
53840dcc37
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-02-03 13:01:21 +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
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
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
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
ayyoob
3021947f30
updated saml grant type config name
2017-01-25 14:03:57 +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
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
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
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
eb9c789b51
Enable opasity variation with time on location records
2017-01-19 21:30:29 +05:30
Rasika Perera
737d1da07b
Changed webapps title [EMM] into [IoT Server]
2017-01-19 17:04:01 +05:30
Rasika Perera
3b7257c93f
Fixing "process" not found issues
2017-01-19 07:41:13 +05:30
Rasika Perera
fe6c35ebca
Cleaned android-web-agent config.json
2017-01-19 01:34:48 +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
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
Chatura Dilan
6db0885eb9
remove cosu whitelisting apps
2017-01-18 15:19:05 +05:30
Rasika Perera
bf9d93476c
Updated title [EMM] into [IoT Server]
2017-01-18 09:02:29 +05:30
Rasika Perera
d68f2607f2
Updated android APK
2017-01-18 09:02:29 +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
Imesh Chandrasiri
62ba568e05
Fixed android type view notification pane message inconsistancy issue
2017-01-17 17:34:51 +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
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
ayyoob
9d64fd0d4b
fixed multi tenant login issue
2017-01-16 16:08:07 +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
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
Rasika Perera
f84e3526f5
changed [fw-ok] with [fw-success]
2017-01-13 17:50:19 +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
Imesh Chandrasiri
fc3d15887e
Updating font wso2 to version 1.2.1
2017-01-11 11:20:21 +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
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
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
dunithd
8c36f31030
Adding Geo fencing link to Android device
2017-01-06 18:36:16 +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
2c9c02dc00
Replaced [EMM] with [IoT Server]
2017-01-06 16:26:59 +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
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
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
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
ayyoob
3fa679a3e9
made policy manager to be part of device type mgt service
2017-01-05 14:37:27 +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
838223c67a
Removed unneccesary configs
2017-01-04 00:18:28 +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
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
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
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
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
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
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
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
Megala
ec5936d013
Updating the apk file to switch between event enabling and disabling
2016-12-13 19:37:42 +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
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
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
26bbb55af5
Resolved conflicts with release-3.0.x
2016-12-08 18:07:14 +05:30
madhawap
6618b919d1
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 17:40:43 +05:30
Harshan Liyanage
559fa3fe38
Resolved conflicts
2016-12-08 16:40:18 +05:30
Madawa Soysa
548213d601
Fixing issue with COSU policy configuration
2016-12-08 14:22:23 +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
sinthuja
f23fd9c85f
Merge branch 'android-sense-agent-fixes' into release-3.0.x
2016-12-07 11:00:49 +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
Megala
5a3809b493
Fixing the version problem
2016-12-06 17:40:27 +05:30
Megala
4bfd9a72b6
Adding siddhi extension and analytics for android-agent
2016-12-06 17:18:20 +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
Imesh Chandrasiri
ba0eea6344
Fixing text overlapping and UX issues in device pages
2016-12-05 16:13:23 +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
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
madhawap
d7c3f5c18a
refactored code
2016-12-01 16:34:49 +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
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
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
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
Megala
6c9c4a15fd
Removing the sender id
2016-11-25 09:44:23 +05:30
Imesh Chandrasiri
bc075dedf0
Changes for IoT build
2016-11-24 18:29:35 +05:30
inoshperera
18c0760ba5
Changing gcm endpoint to fcm
2016-11-24 16:08:48 +05:30
inoshperera
3b867a533d
fixing http status code
2016-11-24 12:46:33 +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
GPrathap
3d971d2bb7
removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations
2016-11-20 19:04:11 +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
Ace
ea14e32337
Adding android-web-agent
2016-11-11 10:05:12 +05:30
Ace
3d32ad984c
Adding fixes to android qr-gen code
2016-11-10 12:08:05 +05:30
Ace
cea96cc841
Merging with master
2016-11-09 12:54:33 +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
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
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
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
ayyoob
bd05fb721a
merged with origin IoTS-1.0.0
2016-11-02 07:47:48 +05:30
sinthuja
96e0ef92d7
Adding changes related to removing DAS components.
2016-11-01 18:35:09 +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
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
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
Megala
e23ecc5b64
Fixing EMM-1779
2016-10-25 17:34:53 +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
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
22ec7aa695
Fixes for the ui isuess in EMM 2.2.0-beta
2016-10-05 12:25:37 +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
harshanl
fd82cfcddd
Added new agent with policy fix
2016-09-29 18:51:31 +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
charitha
975fb078b5
(cherry picked from commit d68c4c8)
2016-09-27 15:24:18 +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
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
Ace
0cb99be949
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
2016-09-22 19:09:26 +05:30
harshanl
212dcae8e7
Added scheduled time to App-install operation
2016-09-22 18:26:13 +05:30
dilanua
215093b9a8
Updating android operation failure notification message format
2016-09-22 13:00:31 +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
dilanua
b99529d9d0
Fixing JIRA: https://wso2.org/jira/browse/EMM-1588
2016-09-21 11:21:35 +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
Ace
6c3ba5e688
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
2016-09-20 18:02:42 +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
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
dilanua
19b6a334ad
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
2016-09-18 07:34:44 +05:30
dilanua
8d338a584b
Changing permissions - /devices/owning to /devices/owning-device
2016-09-17 17:23:21 +05:30
Ace
2a0b500935
Updating to latest appm/apim/identity dependencies
2016-09-14 17:23:33 +05:30
charitha
4cdf98b1db
Update agent apk to latest
2016-09-13 17:24:57 +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
kamidu
05f540abf1
permission modifications
2016-09-09 17:48:26 +05:30
mharindu
cbae4e207d
Implemented permission based authorization
2016-09-09 03:00:11 +05:30
charitha
bfba008218
Removed url from application uninstall
...
(cherry picked from commit 45a582e)
2016-09-08 10:21:44 +05:30
charitha
07c7f2b6ff
Add validation to APK type
...
(cherry picked from commit 9da85ad)
2016-09-07 08:11:50 +05:30
harshanl
479deb8a49
Added logic to switch between GCM & LOCAL notification provider in Android
2016-09-05 17:46:08 +05:30
harshanl
814dcf9c8f
Refactored Android APIs
2016-09-05 11:57:03 +05:30
charitha
2974447362
Add validation to APK download url
2016-08-31 20:35:11 +05:30
inoshperera
532f66ebc5
fixing the operations not getting applied to multiple devices 80, 73
2016-08-25 14:20:44 +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
d0512f93b7
Fixed EMM-1282
2016-08-18 11:06:43 +05:30
hasuniea
5e2a42d798
fixing app-install issue
2016-08-17 15:31:18 +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
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
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
ayyoob
9978452cca
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
2016-08-13 10:50:06 +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
ayyoob
2555a91b4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
2016-08-12 14:01:09 +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
Ace
0ee28c91d2
Adding date validations when updating device enrollment
2016-08-10 14:26:39 +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
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
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
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
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
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
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
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
hasuniea
a8102b8c42
fixing VERIFONEEMMPROF-26
2016-08-01 14:28:52 +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
Chatura Dilan
338d804dba
Added validations for invalid device Ids
2016-07-28 15:25:29 +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
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
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
