Susinda
f96389e671
Android agent downloadded from github relese location, Hasuni's fix on initial operations added
8 years ago
Susinda Perera
fb6cfb6699
Merge pull request #1 from susinda/cloud-3.1.0
...
Merging from Cloud 3.1.0
8 years ago
kamidu
d2d56651cc
fix for leaflet tile not loading issues
...
(cherry picked from commit 6604c23257
)
8 years ago
Harshan Liyanage
b82a59c828
Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0
8 years ago
Hasunie
7fcf4e9a3b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
Hasunie
3e50f0b737
adding initial operations
8 years ago
Harshan Liyanage
dc054e6ed5
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
Harshan Liyanage
f2761e9b0a
Removed info operation addition upon page load
8 years ago
ayyoob
a10eb7cb14
removed feature
8 years ago
ayyoob
77ec1c4107
fixed operation bar permission rendering issue
8 years ago
kamidu
6604c23257
fix for leaflet tile not loading issues
8 years ago
susinda
5ad6dc1f1d
Fxing PhoneNumber Serach for android
8 years ago
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
8 years ago
Kamidu Sachith Punchihewa
740bb976fa
adding location operation to device view page
8 years ago
kamidu
afaa75d3a9
adding screen shots
8 years ago
kamidu
463d8a9dff
wording sugessions for cloud
8 years ago
Imesh Chandrasiri
20bd1b399b
Removed conflict markings
8 years ago
Imesh Chandrasiri
a890d9fb89
Device enrollment page revamp
8 years ago
Imesh Chandrasiri
bccc47ebd2
Conflict fix
8 years ago
Imesh Chandrasiri
4b7637a426
Device enrollment page revampl
8 years ago
Imesh Chandrasiri
37b032d710
Merge branch 'cloud-3.1.0' into cloud-3.1.0
8 years ago
Imesh Chandrasiri
67313882ed
Device enrollment page changes for cloud
8 years ago
kamidu
71c93eec29
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
kamidu
305df1c2bd
enhansing the device cloud ui
8 years ago
kamidu
9d733d6cc1
Fixing android location issue
8 years ago
Susinda Perera
8a9affc4b8
Merge pull request #582 from ayyoob/210releasepatch
...
added device management api to be default
8 years ago
lakshani
f5d71d917e
Added change device status feature to mobile plugings
8 years ago
ayyoob
a294c20a2a
added device management api to be default
8 years ago
lakshani
edb8e71ac2
Added change device status feature to mobile plugings
8 years ago
ayyoob
dd3017578a
added artefact deployment support for device types
8 years ago
Kamidu Sachith Punchihewa
68b36babe6
Merge pull request #575 from wso2/master
...
UI fixes for device cloud
8 years ago
kamidu
53840dcc37
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder
d7e4580e77
[WSO2 Release] [Jenkins #2510 ] [Release 3.0.11] prepare for next development iteration
8 years ago
WSO2 Builder
1737eaaa79
[WSO2 Release] [Jenkins #2510 ] [Release 3.0.11] prepare release v3.0.11
8 years ago
Hasunie
3b98e0f754
Merge pull request #572 from charithag/master-update-swagger-docs
...
Update swagger docs
8 years ago
charitha
9bf38af4f7
Fix issues in swagger docs
8 years ago
Milan Perera
99782e6360
Resolved conflicts and merged
8 years ago
Milan Perera
cc8066896b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud
8 years ago
Milan Perera
e1a419425e
Added cloud agent to the download page
8 years ago
ayyoob
73eb590a7c
renamed grant type to default
8 years ago
Kamidu Sachith Punchihewa
64cb8b5223
Update load-map.js
8 years ago
kamidu
55489d5e52
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
kamidu
192e1c3edc
adding missing classes in hbs
8 years ago
WSO2 Builder
7034dae2b5
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
a2224f96ff
[maven-release-plugin] prepare release v3.0.10
8 years ago
WSO2 Builder
4554d8929d
[WSO2 Release] [Jenkins #2500 ] [Release 3.0.9] prepare for next development iteration
8 years ago
WSO2 Builder
da7c040224
[WSO2 Release] [Jenkins #2500 ] [Release 3.0.9] prepare release v3.0.9
8 years ago
ayyoob
3021947f30
updated saml grant type config name
8 years ago
ayyoob
4f1f1a3e7e
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
WSO2 Builder
e64fe695ab
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
5fbd40c579
[maven-release-plugin] prepare release v3.0.8
8 years ago
kamidu
0679aab11d
adding missing classes in hbs
8 years ago
WSO2 Builder
9687362258
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
ee063a1a43
[maven-release-plugin] prepare release v3.0.7
8 years ago
Chatura Dilan
57d6fb12ce
updating android agent
8 years ago
kamidu
c6d0c4ba44
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
kamidu
50a2c3d89a
Enable opasity variation with time on location records
8 years ago
Chatura Dilan
b2ff6c4181
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Chatura Dilan
57cdf8e1a5
updating android agent
8 years ago
kamidu
eb9c789b51
Enable opasity variation with time on location records
8 years ago
Rasika Perera
737d1da07b
Changed webapps title [EMM] into [IoT Server]
8 years ago
Rasika Perera
3b7257c93f
Fixing "process" not found issues
8 years ago
Rasika Perera
fe6c35ebca
Cleaned android-web-agent config.json
8 years ago
Rasika Perera
0bc380c7d0
Merge pull request #538 from Kamidu/release-3.0.x
...
Enable location history
8 years ago
Rasika Perera
1d10dbee88
Now UI configs supports system parameters with eg. %iot.core.host%
8 years ago
kamidu
c522809bd5
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
kamidu
234157b6f5
adding location history to map view
8 years ago
Megala
574a106977
Adding fixes to path
8 years ago
Chatura Dilan
6db0885eb9
remove cosu whitelisting apps
8 years ago
Rasika Perera
bf9d93476c
Updated title [EMM] into [IoT Server]
8 years ago
Rasika Perera
d68f2607f2
Updated android APK
8 years ago
Rasika Perera
1d0753ab8d
Merge pull request #529 from DimalChandrasiri/release-3.0.x
...
Fixed android type view notification pane message inconsistancy issue
8 years ago
Rasika Perera
c74e9de2f5
Merge pull request #527 from dunithd/release-3.0.x
...
Formatting the anchor text after fixing 500 error
8 years ago
Imesh Chandrasiri
62ba568e05
Fixed android type view notification pane message inconsistancy issue
8 years ago
Rasika Perera
05e2cb7bb8
Changed [EMM] title into [IoT Server]
8 years ago
Dunith Dhanushka
54b08f9b7a
Adding the JSON formatted anchor text
8 years ago
Dunith Dhanushka
6634dded55
Building the anchor text
8 years ago
Rasika Perera
0b983855cf
Merge pull request #522 from DimalChandrasiri/release-3.0.x
...
Fix for multiple popup issue
8 years ago
ayyoob
dad3a34a27
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Dunith Dhanushka
b4f876d961
Updating the label text for Geo fencing link
8 years ago
ayyoob
9d64fd0d4b
fixed multi tenant login issue
8 years ago
Imesh Chandrasiri
8eb95c3695
Fix for multiple popup issue
8 years ago
Imesh Chandrasiri
d918e32d59
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Imesh Chandrasiri
e112371d8e
Fix for multiple popup issue
8 years ago
WSO2 Builder
3f1b7a6005
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
91a0edb0a0
[maven-release-plugin] prepare release v3.0.6
8 years ago
Rasika Perera
3ae9fba143
Updating IoTS doc links
8 years ago
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
8 years ago
Dunith Dhanushka
a097482b91
Passing deviceId and deviceType into view
8 years ago
Dunith Dhanushka
33e57efc3d
Replacing JSON object with comma separated values
8 years ago
Chatura Dilan
d55e0f21b7
Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Chatura Dilan
809d292c95
Added Android scopes
8 years ago
Rasika Perera
f84e3526f5
changed [fw-ok] with [fw-success]
8 years ago
ayyoob
09f7fb3a5f
moved the traffic through the gateway
8 years ago
ayyoob
466c2b1151
moved to gateway mode
8 years ago
Imesh Chandrasiri
fc3d15887e
Updating font wso2 to version 1.2.1
8 years ago
Milan Perera
2eb18e304a
Change scope of android configuration
8 years ago
charitha
b812b6af2e
Fixed issue in showing android device location map
8 years ago
WSO2 Builder
b10579950b
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
b7a5454c2f
[maven-release-plugin] prepare release v3.0.5
8 years ago
Rasika Perera
82a1839fe9
Merge pull request #508 from dunithd/release-3.0.x
...
Adding Geo fencing link to Android device
8 years ago
dunithd
8c36f31030
Adding Geo fencing link to Android device
8 years ago
Milan Perera
77d1e684f6
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Rasika Perera
2c9c02dc00
Replaced [EMM] with [IoT Server]
8 years ago
Rasika Perera
81c62b3a13
Merge pull request #501 from ayyoob/release-3.0.x
...
made policy manager to be part of device mgt service
8 years ago
inoshperera
7da5ae239b
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
inoshperera
22a58121d2
changing the Andrid API tag to standerdise
8 years ago
Milan Perera
86aac810ce
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Milan Perera
d2d912fb6d
Refactored scopes strings
8 years ago
ayyoob
f603f58fd1
moved compliance payload generation code to api impl
8 years ago
Maninda
0c7f1adcba
Fixed some issues reported with FindBugs while security plugin is enabled.
8 years ago
ayyoob
54011d2197
removed provider tenant domain and user from the web.xml
8 years ago
ayyoob
55d200514b
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
ayyoob
3fa679a3e9
made policy manager to be part of device type mgt service
8 years ago
Madawa Soysa
1b56ebb831
Improving scope annotations in android plugin
8 years ago
Rasika Perera
f3588c7951
config.json [usernameLength] moved to [userValidationConfig][usernameLength]
8 years ago
Rasika Perera
838223c67a
Removed unneccesary configs
8 years ago
WSO2 Builder
227d4685c9
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
6c38ce6385
[maven-release-plugin] prepare release v3.0.4
8 years ago
Ace
c302d7b25a
Coorecting version import ranges
8 years ago
Ruwan
dd9e04e75d
Merge pull request #493 from charithag/release-3.0.x-email-invites
...
Release 3.0.x email invites
8 years ago
charitha
a4841d87ba
Add custom email template for android
8 years ago
Rasika Perera
5465cea76d
Fixing QR modal unit not found issue
8 years ago
Ace
34c4d00d4f
Bumping identity dependencies
8 years ago
Ace
8ac0971a24
Updating identity dependencies to latest
8 years ago
Geeth
b8472666ad
Merge pull request #488 from Supun94/release-3.0.x
...
Support for Device Management Policy Merging
8 years ago
Rasika Perera
27e066e92a
IOTS-336: Fixing android and windows mobile agents title
8 years ago
charitha
0c2465d03e
Add enrollment invitations API EP for android
8 years ago
charitha
2211ad2a59
Update device type detail pages and moved QR modal to device mgt core
8 years ago
Ace
488c2abafa
removing slf4j from packing in the android devicemgt jaxrs
8 years ago
Imesh Chandrasiri
48461af2c3
Adding email sender changes
8 years ago
Imesh Chandrasiri
6464fcb615
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Supun94
57f0ea7ce4
Changing policy compliance view
8 years ago
Imesh Chandrasiri
da4eb14144
Device view changes for email invite and agent download
8 years ago
Rasika Perera
a08e58a574
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Imesh Chandrasiri
fe195ca8f7
UI Fixes
8 years ago
Megala
0b1acaa990
Updating the agent apk file
8 years ago
Megala
ec5936d013
Updating the apk file to switch between event enabling and disabling
8 years ago
Rasika Perera
b5e220799a
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
WSO2 Builder
a398686ec7
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3bafccc303
[maven-release-plugin] prepare release v3.0.3
8 years ago
Chatura Dilan
49d81766f6
fixed conflicts
8 years ago
Chatura Dilan
e22d4d3530
Fixed UI issues in the policy screen
8 years ago
charitha
5d7fd0d66d
Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Harshan Liyanage
ce5d907801
Added operation bar.json
8 years ago
Harshan Liyanage
26bbb55af5
Resolved conflicts with release-3.0.x
8 years ago
madhawap
6618b919d1
Adding separate tasks to carry out device monitoring for each device type
8 years ago
Harshan Liyanage
559fa3fe38
Resolved conflicts
8 years ago
Madawa Soysa
548213d601
Fixing issue with COSU policy configuration
8 years ago
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.
8 years ago
Rasika Perera
c722dfa779
Adding ui permissions to the operations on android
8 years ago
sinthuja
f23fd9c85f
Merge branch 'android-sense-agent-fixes' into release-3.0.x
8 years ago
Megala
6e23d498b8
Fixing the parent path problem
8 years ago
Charitha Goonetilleke
7fa0a4b11f
Merge pull request #454 from madawas/IOTS-296
...
IOTS-296: Genaralizing policy view UI for windows and android
8 years ago
charitha
5fc3e82d35
Fix agent download issue
8 years ago
Megala
5a3809b493
Fixing the version problem
8 years ago
Megala
4bfd9a72b6
Adding siddhi extension and analytics for android-agent
8 years ago
Ace
3d21f84a76
merging with upstream
8 years ago
Ace
3dd59ed250
Adding changes to descriptor and ui changes
8 years ago
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.
8 years ago
Imesh Chandrasiri
ba0eea6344
Fixing text overlapping and UX issues in device pages
8 years ago
Imesh Chandrasiri
b55c64d551
Layout changes for device enrollment views
8 years ago
Ace
749f680dad
Adding missed configurations
8 years ago
Ace
8a96aa204c
Adding generalizations to android-operations bar
8 years ago
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.
8 years ago
WSO2 Builder
619dab548e
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
4a0aa3be8e
[maven-release-plugin] prepare release v3.0.2
8 years ago
charitha
ee496d93fe
removed unnecessary logs
8 years ago
madhawap
d7c3f5c18a
refactored code
8 years ago
madhawap
d66292f933
refactored code
8 years ago
madhawap
429b52f037
resolve conflicts
8 years ago
madhawap
3249079965
Seperate out task operations
8 years ago
WSO2 Builder
4ae70fe1f1
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
42c2b04c62
[maven-release-plugin] prepare release v2.2.7
8 years ago
WSO2 Builder
ab087bf934
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
072dd089ef
[maven-release-plugin] prepare release v2.2.6
8 years ago
WSO2 Builder
bfa2c5fa61
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
09d434bda9
[maven-release-plugin] prepare release v3.0.1
8 years ago
Megala
6c9c4a15fd
Removing the sender id
8 years ago
Imesh Chandrasiri
bc075dedf0
Changes for IoT build
8 years ago
inoshperera
18c0760ba5
Changing gcm endpoint to fcm
8 years ago
inoshperera
3b867a533d
fixing http status code
8 years ago
inoshperera
d9a449dd26
adding modify enrollment capability to save chnages in enrollment such as GCM token update
8 years ago
GPrathap
3d971d2bb7
removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations
8 years ago
WSO2 Builder
61ca4c4900
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
4746bf0c74
[maven-release-plugin] prepare release v3.0.0
8 years ago
Ace
ae33d236fa
Adding android device-view changes
8 years ago
Ace
7e3df67548
Adding android-base-plugin
8 years ago
charitha
1170263139
Update component versions for IoTS-1.0.0 release
8 years ago
Ace
ea14e32337
Adding android-web-agent
8 years ago
Ace
3d32ad984c
Adding fixes to android qr-gen code
8 years ago
Ace
cea96cc841
Merging with master
8 years ago
Chatura Dilan
9e78b87365
Fixed issue in device operation bar
8 years ago
Chatura Dilan
d6701ee04c
Fixed issue in device view UI
8 years ago
Chatura Dilan
49dd83ed33
Adding CDMF operation bar to Android
8 years ago
Chatura Dilan
b207e5d624
Added missing units
8 years ago
Ace
7d14e23d00
merging with upstream
8 years ago
Ace
daf37338c6
merging changes with upstream
...
partial
8 years ago
Ace
e38941e81e
restructuring iot-plugins
...
removing mobile/iot base plugins and other restructuring
8 years ago
Chatura Dilan
3227f3f650
Chages to device view for Android
8 years ago
Chatura Dilan
269376a135
Changes to Android operation bar
8 years ago
Chatura Dilan
76887c4277
Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0
8 years ago
Chatura Dilan
1e3d8021e9
Adding Android and Windows operation bars
8 years ago
ayyoob
bd05fb721a
merged with origin IoTS-1.0.0
8 years ago
sinthuja
96e0ef92d7
Adding changes related to removing DAS components.
8 years ago
WSO2 Builder
c9861e9636
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3e664dc304
[maven-release-plugin] prepare release v2.2.5
8 years ago
kamidu
a9308c3f22
removing the unnessary ' ' from hbs files
8 years ago
Rasika Perera
a40ce98698
Make analytics and groups view disable for mobile plugins
8 years ago
Harshan Liyanage
242253b8f2
Merge pull request #391 from shavidissa/master
...
Added swagger annotations and refined the messages
8 years ago
Shavindri
f6c0aeecfc
Added swagger annotations and refined the messages
8 years ago
Megala
e23ecc5b64
Fixing EMM-1779
8 years ago
WSO2 Builder
19e0d65db0
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
537a99d05d
[maven-release-plugin] prepare release v2.2.4
8 years ago
WSO2 Builder
b095196e65
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
d455b13e62
[maven-release-plugin] prepare release v2.2.3
8 years ago
kamidu
22ec7aa695
Fixes for the ui isuess in EMM 2.2.0-beta
8 years ago
hasuniea
2ad390b877
removing duplicate event related classes
8 years ago
Chatura Dilan Perera
0b66649841
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
362003c9ab
[maven-release-plugin] prepare release v2.2.2
8 years ago
harshanl
fd82cfcddd
Added new agent with policy fix
8 years ago
Rasika Perera
9d92b71bab
Merge pull request #1 from warunalakshitha/master
...
Upgrade iot product to latest carbon versions
8 years ago
charitha
975fb078b5
(cherry picked from commit d68c4c8)
8 years ago
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)
8 years ago
charitha
ba2acb5e75
Refactor code
...
(cherry picked from commit 01f2a91)
8 years ago
Rasika Perera
17dd96aa10
Returning correct representation of the device to template.
8 years ago
Rasika Perera
52dfcecb62
Updating devicemgt_admin into /api/device-mgt/v1.0.
8 years ago
Ace
0cb99be949
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
harshanl
212dcae8e7
Added scheduled time to App-install operation
8 years ago
dilanua
215093b9a8
Updating android operation failure notification message format
8 years ago
Chatura Dilan Perera
7174945f21
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Chatura Dilan Perera
ae99d189e7
Fixed logcat and events get APIs
8 years ago
dilanua
b99529d9d0
Fixing JIRA: https://wso2.org/jira/browse/EMM-1588
8 years ago
dilanua
ab14f9516c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
dilanua
13d784009c
Updating android operation failure notification message
8 years ago
Ace
6c3ba5e688
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
Chatura Dilan Perera
bf72d212f7
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
18780e5274
[maven-release-plugin] prepare release v2.2.1
8 years ago
dilanua
4a78cd6ece
Updating android permissions
8 years ago
Ace
a05dad6f4d
Merging with master
8 years ago
dilanua
19b6a334ad
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua
8d338a584b
Changing permissions - /devices/owning to /devices/owning-device
8 years ago
Ace
2a0b500935
Updating to latest appm/apim/identity dependencies
8 years ago
charitha
4cdf98b1db
Update agent apk to latest
8 years ago
Chatura Dilan Perera
89621ddfcb
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
28898a85e9
[maven-release-plugin] prepare release v2.2.0
8 years ago
kamidu
05f540abf1
permission modifications
8 years ago
mharindu
cbae4e207d
Implemented permission based authorization
8 years ago
charitha
bfba008218
Removed url from application uninstall
...
(cherry picked from commit 45a582e)
8 years ago
charitha
07c7f2b6ff
Add validation to APK type
...
(cherry picked from commit 9da85ad)
8 years ago
harshanl
479deb8a49
Added logic to switch between GCM & LOCAL notification provider in Android
8 years ago
harshanl
814dcf9c8f
Refactored Android APIs
8 years ago
charitha
2974447362
Add validation to APK download url
8 years ago
inoshperera
532f66ebc5
fixing the operations not getting applied to multiple devices 80, 73
8 years ago
dilanua
fb30118aa2
Adding supported feature: DEVICE_UNLOCK entry to db
8 years ago
hasuniea
3a25572fda
fixing EMM-1509 issue
8 years ago
hasuniea
d5297cf36e
fixing empty device enrollment body exception
8 years ago
Chatura Dilan Perera
ca2e631076
Fix conflicts
8 years ago
Chatura Dilan Perera
7ff9204646
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
5e43c5bef9
[maven-release-plugin] prepare release v2.1.2
8 years ago
harshanl
d0512f93b7
Fixed EMM-1282
8 years ago
hasuniea
5e2a42d798
fixing app-install issue
8 years ago
hasuniea
0504f34e22
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
8 years ago
mharindu
caf73209b9
Removed unrelevant changes
8 years ago
mharindu
695fdc1cad
Fixed confusing error messages issue
8 years ago
mharindu
150f569d05
Fixed json parsing issue in android agent
8 years ago
hasuniea
8a9114dd88
removing vpn validatiion property
8 years ago
hasuniea
72dd424c09
fixing jira issue related blacklisted application
8 years ago
hasuniea
71e64ae672
fixing put configuration
8 years ago
ayyoob
9978452cca
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
8 years ago
hasuniea
33bcfc62c5
removing vpn validatiion property
8 years ago
hasuniea
22ec736841
fixing log throwing issue for internal server error(500)
8 years ago
hasuniea
66813f7d40
fixing jira issue related blacklisted application
8 years ago
ayyoob
2555a91b4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
8 years ago
hasuniea
13e317e201
resolving android get config issue
8 years ago
ayyoob
38b9f017c3
merged with origin
8 years ago
ayyoob
d72297f214
resolved UI issues
8 years ago
Ace
0ee28c91d2
Adding date validations when updating device enrollment
8 years ago
Ruwan
c32d9e3125
Bug fix
...
Adding bug fix
8 years ago
Ace
d997654011
Adding date validations when updating device enrollment
8 years ago
mharindu
352574d2fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
mharindu
9b43f83520
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
mharindu
6e8f3f5db2
Modified scopes
8 years ago
hasuniea
1078b8b686
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
hasuniea
4562b4d318
adding security fixes
8 years ago
mharindu
ece7cb04ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
charitha
8aa4f8b526
Add missing BadRequestException to global exception wrapper
9 years ago
Chatura Dilan Perera
defa494626
changed date format to ISO 8601
9 years ago
mharindu
0cf85c986a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
mharindu
8ddee3b217
Refactored scopes
9 years ago
Chatura Dilan Perera
fedd717561
Added validations to firmware upgrade date
9 years ago
Chatura Dilan Perera
4dfa9ed732
Added validations to firmware upgrade date
9 years ago
ayyoob
d70c576ff0
refactored android configuration
9 years ago
mharindu
5f917e51f1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
kamidu
8d151120df
enabling policy wizard for android
9 years ago
kamidu
1f247e7faf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
inoshperera
a09defebfe
Merge pull request #312 from charithag/master
...
Removed invalid property insertion.
9 years ago
charitha
d186a48ed8
Removed invalid property insertion.
9 years ago
kamidu
bbbaac4d28
Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup
9 years ago
mharindu
a254d9efc4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
mharindu
34ce9108a2
Added configuration modifcation permission
9 years ago
dilanua
42cfd92575
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
dilanua
6fe83cd0ac
Updating path changes to business-controllers
9 years ago
mharindu
57fb75a04b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
hasuniea
a8102b8c42
fixing VERIFONEEMMPROF-26
9 years ago
mharindu
2b3dfa0ce2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
Chatura Dilan
338d804dba
Added validations for invalid device Ids
9 years ago
mharindu
be73e9a659
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
hasuniea
e4bfb6b6ef
fixing deviceIdentifier validation issue
9 years ago
dilanua
01e32c86c8
Updating base ui app config reader
9 years ago
mharindu
965402a7ac
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
mharindu
302f71b6d1
Fixed webapp name resolving issue and changed API context
9 years ago
Milan Perera
c1cc6f08d9
Removed device name regex pattern from bean validation
9 years ago
mharindu
1b006bc155
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
Chatura Dilan
b9bc076036
Fixed issues in android permisson.xml
9 years ago
hasuniea
672d90472b
adding validation
9 years ago
hasuniea
3836d393fa
removing Device type from AndroidDevice bean
9 years ago
mharindu
6b939714d8
Changed context paths
9 years ago
mharindu
2563098948
Fixed conflicts and merged
9 years ago
hasuniea
ad8bbf8863
removing notnull constraint from android device type
9 years ago
hasuniea
e84a868069
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
hasuniea
53063284d0
fixing validation issue
9 years ago
Chatura Dilan
0818ae6860
[maven-release-plugin] prepare for next development iteration
9 years ago
Chatura Dilan
62c16e07ce
[maven-release-plugin] prepare release v2.1.1
9 years ago
madhawap
3851be8742
fix to permissions.xml
9 years ago
hasuniea
b30aadc438
fix code conflicts
9 years ago
hasuniea
4ccf018bb3
adding validations
9 years ago
mharindu
ba4065265d
Refactored permission.xml of android webapp
9 years ago
Kasun Delgolla
79b1d51643
Committing VPN operation fixes + logcat operation
9 years ago
mharindu
48613018ab
Fixed issues in scope based autorization implementation
9 years ago
mharindu
f675468e44
Added scopes to APIS
9 years ago
Chatura Dilan
bedb171eb7
Added OS build date
9 years ago
Chatura Dilan
f58abbe0db
Added is_active field
9 years ago
prabathabey
1205d26463
Merging rest-api-improvements branch with master
9 years ago
Chatura Dilan
6a702adaa3
Change emm_admin to admin
9 years ago
Chatura Dilan
529c828b81
Fixed paths in Android related permissions.xml
9 years ago
inoshperera
bb0ea53909
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
inoshperera
c45400afd0
fixing error messages not thrown properly.
9 years ago
Kasun Delgolla
ef281e1524
Fixing operation response ERROR state exception
9 years ago
inoshperera
90747a5579
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
inoshperera
486e2f48ed
adding validation
9 years ago
dilanua
c9a07df91a
Fixing wrong device id shown for OTA-UPGRADE operation
9 years ago
dilanua
741bb0ac16
Updating Responces in pending-operations api
9 years ago
dilanua
bcba6216c0
Update UpgradeFirmware operation with server properties
9 years ago
dilanua
9ac7ffe828
Update UpgradeFirmware operation with server properties
9 years ago
mharindu
4a8ab39dec
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Ace
6425d6ab1a
Adding null check for operations response
9 years ago
mharindu
9237fed74e
Added notification title
9 years ago
prabathabey
55aa1c8113
Fixing compilation issues
9 years ago
mharindu
62a116ba71
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
mharindu
c5d1eaa21b
Fixed issue in location service
9 years ago
hasuniea
2b89b692a4
adding event configuration refference
9 years ago
hasuniea
c170373ace
fix responce code
9 years ago
hasuniea
ec91b0a539
fixing eventReceiver
9 years ago
hasuniea
198b3c67dc
add entry in permission xml
9 years ago
hasuniea
0bcbab7071
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan
d3a0fc3f12
Added install application permissions
9 years ago
hasuniea
daee6109cc
fixing code issues
9 years ago
Chatura Dilan
7c59e391de
Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan
ba1f3bbbcc
fixed issue in unlock devices permissions
9 years ago
hasuniea
786c6859bd
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
hasuniea
d01e176933
add eventreceiver fix
9 years ago
prabathabey
640cf95528
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
prabathabey
d7b4b83424
Fixing path of license resource
9 years ago
mharindu
56a2ca0aa0
Added missing HTTP method attribute in permissions.xml in android webapp
9 years ago
Chatura Dilan
9086a130c4
Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan
3fd56b56c4
Fix cxf servelt issues
9 years ago
prabathabey
212c11750c
Added http schem supported by the API
9 years ago
inoshperera
763854ef9a
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
ayyoob
61d88f77b6
removed device Id from notification bean
9 years ago
inoshperera
6d14133bab
fixing the mismatch of swagger annotation and implementation
9 years ago
Chatura Dilan
bf1e00f472
Fixed the host name of Android API
9 years ago
prabathabey
18257b8729
Changing the name of the android API webapp
9 years ago
prabathabey
63bb616e9c
Improving swagger annotations
9 years ago
prabathabey
631d57e70d
Improving swagger annotations
9 years ago
Kasun Delgolla
a01fe5e4f9
Adding missing parameters
9 years ago
prabathabey
44aa3a93a9
Adding more improvements to swagger annotations
9 years ago
inoshperera
9f8ca3ea9a
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
inoshperera
4dbf1bdc2f
adding swagger annotation and making APIs standerdize
9 years ago
Kasun Delgolla
bd65e8b2a7
Committing missing android features
9 years ago
Chatura Dilan
b8cfcf4413
Fixed Enrollment issue
9 years ago
Chatura Dilan
91003fdee1
Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan
d25e1b2421
Fixed Android APIs
9 years ago
inoshperera
f346c7c528
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
prabathabey
479acf3b45
Improving swagger annotations of device management admin API
9 years ago
hasuniea
d7527e95f0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
prabathabey
ba9d85b065
Adding swagger related dependencies to android agent webapp
9 years ago
inoshperera
aa4a4889a5
adding API header
9 years ago
prabathabey
9a01df5d55
Renaming android agent webapp
9 years ago
prabathabey
23343eb765
Fixing the name of android agent webapp
9 years ago
prabathabey
8f3a2eec5d
Merging the latest changes introduced to master
9 years ago
prabathabey
98a8a09813
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
prabathabey
6f7f706428
Renaming TenantConfiguration as PlatformCongfiguration
9 years ago
Rasika Perera
07984e4b6e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Rasika Perera
91cc0baaf5
Moved CSS into separate file
9 years ago
prabathabey
fd1d62454a
Improving Android JAX-RS API definitions
9 years ago
prabathabey
03a21752e2
Adding maven-compiler-plugin to the build profile
9 years ago
hasuniea
ab70703da8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
hasuniea
2eb5aebb60
fixed code issues in EventService
9 years ago
geethkokila
57a9834145
Changing apis to return activity when an operation is added
9 years ago
Kasun Delgolla
4f33789d38
Committing MDM android APIs responses standardization
9 years ago
Hasunie
df6f420d6e
Merge pull request #279 from hasuniea/master
...
fixed code issues
9 years ago
hasuniea
4757ac797c
fixed code issues
9 years ago
ayyoob
dc32a8f8d3
Merge branch 'release-2.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into transport
9 years ago
mharindu
f3730c64ae
[maven-release-plugin] prepare for next development iteration
9 years ago
mharindu
7a982093a1
[maven-release-plugin] prepare release v2.1.0
9 years ago
mharindu
be4078cf38
[maven-release-plugin] rollback the release of v2.1.0
9 years ago
mharindu
a2d2f26123
[maven-release-plugin] prepare for next development iteration
9 years ago
mharindu
3af112898d
[maven-release-plugin] prepare release v2.1.0
9 years ago
hasuniea
a48529be59
fix code conflicts
9 years ago
hasuniea
5c29ac8c4f
fix code conflicts
9 years ago
hasuniea
a7665033b4
refactored events
9 years ago
prabathabey
5b0748489d
Improving virtual fire alarm plugin to use newly introduced push notification framework
9 years ago
hasuniea
8eb53927a6
add swagger annotations to windows plugin
9 years ago
inosh-perera
bf7975c5d4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
dilanua
bc1dfb86f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
dilanua
2dabfa02fa
Adding swagger annotations
9 years ago
inosh-perera
0787aa2ac1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
inosh-perera
afc7be590e
adding swagger annotations for Android APIs
9 years ago
Madhawa Perera
f25cb51679
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
...
Adding swagger annotations to beans
9 years ago
Madhawa Perera
0d8010c25a
Adding swagger annotations to beans
9 years ago
dilanua
f66aad9e0e
Adding swagger annotations
9 years ago
Kasun Delgolla
34d4da7e66
Merge pull request #250 from charithag/master
...
Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
hasuniea
3cdb490908
added swagger annotations
9 years ago
charitha
ffcbea8421
Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
ayyoob
6f000cbc64
refactoring version tags
9 years ago
prabathabey
cfbc36ff2d
Making the plug-in implementations compatible with the changes introduced to DeviceManagementService SPI
9 years ago
prabathabey
ac407a6a1a
Removing obsolete dependencies to ApplicationManagert interface from plug-in specific device management service implementations
9 years ago
mharindu
918302475b
Fixed incorrect location coordinate issue (EMM-1313)
9 years ago
ayyoob
c05191dac5
Added IoT plugins feature and refactored IoT base.
9 years ago
inosh-perera
657cf05ef5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag
f74a8ddf0d
Add device type plugins and features related to emm with IoTS base feature.
9 years ago
prabathabey
39d2ce12dc
merging resturctured iot and mobile plugins
9 years ago