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