Commit Graph

1934 Commits

Author SHA1 Message Date
Megala
e51231fd66 Merge remote-tracking branch 'upstream/master' 2016-09-27 13:37:40 +05:30
Megala
135019f987 Fixing EMM-1626 2016-09-27 13:33:12 +05:30
dilanua
074abf3053 Fix for JIRA: https://wso2.org/jira/browse/EMM-1640 2016-09-27 12:46:50 +05:30
charitha
c0feb96590 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-27 11:22:19 +05:30
Chatura Dilan Perera
0cdde82c1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-26 22:10:20 +05:30
Chatura Dilan Perera
f6de82bb77 Fixed android agent 2016-09-26 22:10:00 +05:30
Kamidu Sachith Punchihewa
47e6909f8d Merge pull request #349 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1584
2016-09-26 22:02:41 +05:30
Saad Sahibjan
d05280cdf5 Fix for https://wso2.org/jira/browse/EMM-1584 2016-09-26 21:59:38 +05:30
Ace
2a2f749523 Adding appm extension component & feature 2016-09-26 21:34:13 +05:30
Kamidu Sachith Punchihewa
f6c77e9b9e Merge pull request #348 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1634
2016-09-26 20:24:23 +05:30
Saad Sahibjan
41865d07eb Fix for https://wso2.org/jira/browse/EMM-1634 2016-09-26 20:19:20 +05:30
Kamidu Sachith Punchihewa
3944c5489e Merge pull request #347 from saadsahibjan/master
Update the description of system update policy and whitelist applications - Android UI
2016-09-26 20:10:23 +05:30
dilanua
77836d80d9 Updating bulk operations info message 2016-09-26 20:07:16 +05:30
dilanua
17e7b92b23 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633 2016-09-26 19:52:54 +05:30
Rasika Perera
3f9bcd50ea Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username 2016-09-26 19:17:05 +05:30
Saad Sahibjan
e4741c0b73 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-26 19:14:12 +05:30
Saad Sahibjan
891d9601ba Update the description of system update policy and whitelist applications - Android UI 2016-09-26 19:03:23 +05:30
Rasika Perera
d8d69f3092 Updating modal name element 2016-09-26 18:52:52 +05:30
kamidu
e3a08d824a Resolve conflicts with master 2016-09-26 18:12:53 +05:30
kamidu
e4cc0f0c0c Fix for EMM-1329, EMM-1479 2016-09-26 18:06:45 +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
dilanua
9d35017744 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585 2016-09-26 17:28:22 +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
Rasika Perera
9cef6f0d8c Few Fixes to the virtual firealarm analytics view. 2016-09-26 11:18:22 +05:30
hasuniea
fb6eded30c fixed device lock issue 2016-09-23 22:27:34 +05:30
hasuniea
fc61128b8b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-23 22:06:49 +05:30
hasuniea
ece43f53bd fixing windows issues 2016-09-23 22:06:14 +05:30
dilanua
bdd7703465 Fix for JIRA: https://wso2.org/jira/browse/EMM-1602 2016-09-23 20:33:02 +05:30
dilanua
7697c3ca39 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-23 19:47:12 +05:30
dilanua
ddea023fc2 Fixing the alignment issue of policy compliance listing of device view page 2016-09-23 19:46:48 +05:30
Ruwan
3d7dfa741b Merge pull request #346 from ruwany/carbon-kernel-4.4.7
Migrating kernel/apim/appm/identity to latest versions
2016-09-23 17:04:26 +05:30
dilanua
0d8da5f63f Fix for jira: https://wso2.org/jira/browse/EMM-1621 2016-09-23 16:02:53 +05:30
dilanua
f85e28c902 Fix for jira: https://wso2.org/jira/browse/EMM-1622 2016-09-23 15:57:04 +05:30
dilanua
8bd20911fe Refactoring application list view for improper text placement issues 2016-09-23 12:28:15 +05:30
dilanua
a92070f16e Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:45:13 +05:30
dilanua
4947664b4b Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:15:45 +05:30
dilanua
3a7dbb81ea Fix for JIRA: https://wso2.org/jira/browse/EMM-1616 2016-09-23 06:59:12 +05:30
dilanua
36eb2e2b16 Fix for JIRA: https://wso2.org/jira/browse/EMM-1615 2016-09-23 06:37:24 +05:30
dilanua
f47a1cdc55 Fix for JIRA: https://wso2.org/jira/browse/EMM-1614 2016-09-22 22:59:42 +05:30
dilanua
f5d95f0695 Fix for JIRA: https://wso2.org/jira/browse/EMM-1613 2016-09-22 22:45:28 +05:30
dilanua
2a4757539a Fix for JIRA: https://wso2.org/jira/browse/EMM-1593 2016-09-22 22:12:46 +05:30
dilanua
bff3b3ee12 Fix for JIRA: https://wso2.org/jira/browse/EMM-1610 2016-09-22 19:45:29 +05:30
Ace
0cb99be949 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-22 19:09:26 +05:30
dilanua
1cca664e96 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-22 18:35:30 +05:30
dilanua
36d4c7dfcb Updating emm device listing - UI 2016-09-22 18:35:13 +05:30
harshanl
212dcae8e7 Added scheduled time to App-install operation 2016-09-22 18:26:13 +05:30
dilanua
13aedbc6c6 Updating notifications side bar - UI 2016-09-22 18:19:28 +05:30
Rasika Perera
fd9c491637 Fixing virtual firealarm device download modal issue 2016-09-22 18:10:27 +05:30
dilanua
1efbc15cdb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-22 15:58:31 +05:30
dilanua
d7872782cc https://wso2.org/jira/browse/EMM-1608 2016-09-22 15:58:13 +05:30
Rasika Perera
71784e6609 Fixing modal popups 2016-09-22 15:24:59 +05:30
Rasika Perera
b99bd42a91 Fixing download modal issue on virtual firealarm 2016-09-22 14:36:56 +05:30
Chatura Dilan
e0499a5d86 Merge pull request #345 from saadsahibjan/master
Remove unused COSU tab-Android EMM UI
2016-09-22 14:05:36 +05:30
Saad Sahibjan
9ac367cf8a Remove unused COSU tab-Android EMM UI 2016-09-22 14:04:06 +05:30
dilanua
b6a150da23 Fixing JIRA: https://wso2.org/jira/browse/EMM-1603 2016-09-22 13:59:06 +05:30
dilanua
6665ac2642 Improvements to notifications side bar - UI 2016-09-22 13:14:45 +05:30
dilanua
215093b9a8 Updating android operation failure notification message format 2016-09-22 13:00:31 +05:30
Chatura Dilan
6bd25a4aad Merge pull request #343 from saadsahibjan/master
Added validations for COSU create and edit configurations - Android E…
2016-09-21 16:00:18 +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
Ace
282fe25b47 Fixing dependency related issues 2016-09-21 12:57:03 +05:30
dilanua
b99529d9d0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1588 2016-09-21 11:21:35 +05:30
thusithakalugamage
706894cd89 resolving conflicts 2016-09-21 10:59:36 +05:30
dilanua
c4c2df3723 Updating device listing UI - EMM 2016-09-20 22:21:45 +05:30
dilanua
d25779e335 Updating notification side-bar message format 2016-09-20 20:21:37 +05:30
dilanua
87d8c75682 Updating notification side-bar message format 2016-09-20 19:15:24 +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
Chatura Dilan Perera
eaaadfae32 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 18:02:56 +05:30
Ace
6c3ba5e688 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-20 18:02:42 +05:30
Saad Sahibjan
f5009d8406 Added validations for COSU create and edit configurations - Android EMM UI 2016-09-20 16:29:36 +05:30
kamidu
3bb8bcb79e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 14:46:52 +05:30
kamidu
6144d9eea2 Fic for EMM-1581 2016-09-20 14:46:08 +05:30
dilanua
cd7f63502a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 14:21:58 +05:30
dilanua
afea5fcfc6 Refactoring notifications side-pane - EMM UI 2016-09-20 14:21:40 +05:30
Chatura Dilan
a8319c6770 Merge pull request #342 from saadsahibjan/master
Adding COSU policy view configurations - Android EMM UI
2016-09-20 13:53:37 +05:30
Saad Sahibjan
31b9c0c3dd Adding COSU policy view configurations - Android EMM UI 2016-09-20 12:57:49 +05:30
dilanua
712f62aa43 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 12:50:44 +05:30
dilanua
00448814e8 Refactoring notifications side-pane - EMM UI 2016-09-20 12:50:18 +05:30
Saad Sahibjan
d18b9a4082 Adding COSU policy edit configurations - Android EMM UI 2016-09-20 12:39:10 +05:30
Ace
03c0108db5 Removing unwanted dependencies from windows api 2016-09-20 10:39:34 +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
Chatura Dilan Perera
93cecb0ded Merge branch 'master' into release-2.2.1 2016-09-19 18:37:57 +05:30
dilanua
b65e99a4a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 18:36:31 +05:30
dilanua
9add795fe4 Adding date picker to oper.bar - EMM 2016-09-19 18:35:34 +05:30
Chatura Dilan Perera
42b50b642a Merge branch 'master' into release-2.2.1 2016-09-19 18:01:54 +05:30
hasuniea
8c877b3071 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 17:57:27 +05:30
hasuniea
9ecbd4e1b4 fixing windows operation issue 2016-09-19 17:54:58 +05:30
Chatura Dilan Perera
4088c736eb Changes to android agent 2016-09-19 17:17:42 +05:30
dilanua
ed5af90c46 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 17:13:26 +05:30
dilanua
4c8094be4f Adding date-picker unit - EMM 2016-09-19 17:13:02 +05:30
hasuniea
29c1b055d9 fixing code conflicts 2016-09-19 16:29:04 +05:30
hasuniea
18e577a84a adding windowsplugin changes 2016-09-19 15:49:16 +05:30
Rasika Perera
245ea2b0d6 Fixing incorrect text formatting 2016-09-19 14:35:43 +05:30
dilanua
4e9b19f3a5 Updating android permissions - operation-bar 2016-09-19 14:20:49 +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
Rasika Perera
35d9678075 Updating permissions on operation bar for windows and iOS 2016-09-19 10:19:58 +05:30
dilanua
42a5493a89 Fixing JIRA: https://wso2.org/jira/browse/EMM-1577 2016-09-18 17:02:12 +05:30
dilanua
9925a20964 Fixing JIRA: https://wso2.org/jira/browse/EMM-1576 2016-09-18 16:31:17 +05:30
dilanua
69efc7ada7 Updating operation-mod with windows operation apis 2016-09-18 16:07:10 +05:30
dilanua
d8ce43fe04 Updating windows api path lockreset-devices to lock-reset-devices 2016-09-18 15:57:07 +05:30
dilanua
9d486a5a0a Updating Device Listing - EMM UI 2016-09-18 10:27:17 +05:30
dilanua
a4ef821dc1 Updating Add Device Modal - UI 2016-09-18 10:05:24 +05:30
dilanua
2c22feec20 Updating Add Device Modal - UI 2016-09-18 09:59:43 +05:30
dilanua
7911e0cce6 Updating EMM dashboard - UI 2016-09-18 08:51:05 +05:30
dilanua
19b6a334ad Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:44 +05:30
dilanua
08c6ba0617 Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI 2016-09-17 20:06:18 +05:30
dilanua
8d338a584b Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:23:21 +05:30
dilanua
ac6d0eda84 Adding COSU Policy Configs - Android EMM UI 2016-09-17 16:02:27 +05:30
Rasika Perera
a717c7effb Adding deviceName into notifications 2016-09-16 09:39:58 +05:30
Chatura Dilan
ac9f95f885 Merge pull request #338 from saadsahibjan/master
Added edit COSU policy configurations
2016-09-15 19:56:35 +05:30
Saad Sahibjan
d2cdb388b0 Added edit COSU policy configurations 2016-09-15 19:49:25 +05:30
kamidu
61a4d417c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-15 19:44:52 +05:30
kamidu
0160bf5fee Fix for EMM-1546 2016-09-15 19:26:48 +05:30
Dilan U. Ariyaratne
72d2466f30 Merge pull request #336 from DimalChandrasiri/master
Adding supportive classes
2016-09-15 16:50:13 +05:30
thusithakalugamage
d33fbc99b1 [EMM-1571] Add policies page wizard styling and layout defects - edit pages 2016-09-15 15:07:14 +05:30
thusithakalugamage
9840310f02 [EMM-1571] Add policies page wizard styling and layout defects 2016-09-15 13:47:24 +05:30
Imesh Chandrasiri
abf6317d19 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-15 11:21:08 +05:30
Imesh Chandrasiri
9887016f04 Adding modal changes 2016-09-15 11:19:35 +05:30
Rasika Perera
6ad54b5f01 Fixing EMM-1351: Issue in components refresh function in device detail page 2016-09-15 09:18:21 +05:30
Rasika Perera
c9ec2bea01 Fixing EMM-1552: Policy Create view Allingment issue in final step 2016-09-15 08:53:16 +05:30
Rasika Perera
b576e23d97 Improvements to notifications side pane 2016-09-15 08:34:18 +05:30
Rasika Perera
9f258df1d2 Fixing EMM-1551: Notifications are flooded on side pane. 2016-09-15 08:34:00 +05:30
Rasika Perera
9b2f73acfb Fixing EMM-1557: Notifications anchor points to a wrong URL of the device. 2016-09-15 08:04:58 +05:30
Rasika Perera
5438a421de Fixing Permissions are not published for Windows through WebApp Lifecycle Listener 2016-09-15 07:33:00 +05:30
Ace
2a0b500935 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:33 +05:30
Rasika Perera
4d4b9fa8ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-14 14:13:14 +05:30
Saad Sahibjan
b0ec89938e Added COSU policy configurations 2016-09-14 13:24:31 +05:30
charitha
4cdf98b1db Update agent apk to latest 2016-09-13 17:24:57 +05:30
kamidu
58fe478b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-13 15:47:41 +05:30
kamidu
a8c97563ee Fix for the rendering issue in dashboard 2016-09-13 15:46:45 +05:30
Rasika Perera
625dd1a887 itMerge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-13 15:27:02 +05:30
Imesh Chandrasiri
489a7d57ae Adding popup modal content 2016-09-13 13:46:53 +05:30
thusithakalugamage
550e2a472e [EMM-1549] - Heading defect fix 2016-09-12 18:10:31 +05:30
thusithakalugamage
e9e4133ed3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:54:27 +05:30
dilanua
326dd9f50e Fixing JIRA: https://wso2.org/jira/browse/EMM-1544 2016-09-12 14:49:07 +05:30
thusithakalugamage
dc7bc22aa0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:39:34 +05:30
thusithakalugamage
606ee9a5a4 [EMM-1543] styling defect related markup fix 2016-09-12 14:39:23 +05:30
dilanua
0456c741e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:21:18 +05:30
dilanua
6ee9a61ed1 Fixing json parser issue in operation-bar - UI 2016-09-12 14:20:01 +05:30
kamidu
388b1a5e76 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:13:14 +05:30
thusithakalugamage
a994779bd8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 12:28:18 +05:30
dilanua
0c77266640 Fixing operation-bar not showing issue on device listing page 2016-09-12 11:17:30 +05:30
thusithakalugamage
0bda2c88bd responsive tab panel component - markup rewrite for uuf - fix 2016-09-11 12:21:15 +05:30
Rasika Perera
b9f9783e9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-11 07:52:06 +05:30
dilanua
4799fcca5f Adding permissions to operation-bar UI 2016-09-10 06:30:06 +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
Rasika Perera
0790c0ed7f Fixing dashboard user count issue 2016-09-09 19:26:02 +05:30
Rasika Perera
3a7a74a001 Merge pull request #331 from thusithak/master
wizard component - layout defect fixes
2016-09-09 19:14:40 +05:30
Rasika Perera
6a44414a60 Merge pull request #330 from DimalChandrasiri/master
Modal Changes
2016-09-09 19:14:31 +05:30
thusithakalugamage
0b8fc5e99d wizard component - layout defect fixes 2016-09-09 18:52:20 +05:30
thusithakalugamage
4dc863b3fc wizard component - layout defect fixes 2016-09-09 18:44:42 +05:30
kamidu
2b2db7be39 permission modifications 2016-09-09 18:43:03 +05:30
Imesh Chandrasiri
224061e2d2 Modal Changes 2016-09-09 18:25:23 +05:30
kamidu
958d8004a2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 17:48:41 +05:30
kamidu
05f540abf1 permission modifications 2016-09-09 17:48:26 +05:30
Imesh Chandrasiri
33b4f90e00 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 17:13:35 +05:30
Imesh Chandrasiri
35bd87ade4 Popup Layout changes 2016-09-09 17:11:57 +05:30
Rasika Perera
751deed3e2 Adding permission annotations for windows operations 2016-09-09 17:01:23 +05:30
dilanua
febcfd57be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 16:47:40 +05:30
dilanua
d97c67804b Adding ios operation endpoint changes - UI 2016-09-09 16:47:11 +05:30
Rasika Perera
3c845dc3bd Merge pull request #328 from thusithak/master
responsive tab panel component - markup rewrite for uuf
2016-09-09 16:40:44 +05:30
Chatura Dilan Perera
f57f7c5c1e changes to android agent 2016-09-09 16:29:42 +05:30
thusithakalugamage
1fb8781f75 resolving conflicts 2016-09-09 16:17:39 +05:30
thusithakalugamage
30c846ef95 responsive tab panel component - markup rewrite for uuf 2016-09-09 16:08:21 +05:30
dilanua
a9d00964d2 Updating emm device view with permissions 2016-09-09 15:32:05 +05:30
Imesh Chandrasiri
7d173ef763 QR Code Modal changes 2016-09-09 12:27:21 +05:30
Imesh Chandrasiri
32953a8411 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 11:44:32 +05:30
Imesh Chandrasiri
c92fbc6b0f modal code changes 2016-09-09 11:44:06 +05:30
Rasika Perera
acc3875b51 Adding pulse secure configurations 2016-09-09 11:12:45 +05:30
Rasika Perera
49a23f0518 Merge pull request #327 from DimalChandrasiri/master
adding modal changes
2016-09-09 10:46:56 +05:30
Imesh Chandrasiri
bbe9dfecd2 adding modal changes 2016-09-09 10:44:04 +05:30
mharindu
3d432707b2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 03:00:35 +05:30
mharindu
cbae4e207d Implemented permission based authorization 2016-09-09 03:00:11 +05:30
dilanua
ea7f62a980 Adding permissions to device listing and bug fixes 2016-09-08 23:21:57 +05:30
kamidu
082e708e8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-08 18:43:32 +05:30
kamidu
41d2856e39 Enable permission check according to the new permissions 2016-09-08 18:43:25 +05:30
charitha
44ae50cc95 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-08 10:22:12 +05:30
charitha
bfba008218 Removed url from application uninstall
(cherry picked from commit 45a582e)
2016-09-08 10:21:44 +05:30
dilanua
617849c053 Updating policy UIs with API method updates 2016-09-07 16:24:17 +05:30
dilanua
eea91960b7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-07 14:58:09 +05:30
dilanua
435759f961 Updating policy listing - UI 2016-09-07 14:57:32 +05:30
Rasika Perera
71d7baf04f Fixing iOS enrollement check polling url 2016-09-07 14:33:16 +05:30
dilanua
6cf9dc1c67 Updating emm policy create UI 2016-09-07 14:15:43 +05:30
charitha
07c7f2b6ff Add validation to APK type
(cherry picked from commit 9da85ad)
2016-09-07 08:11:50 +05:30
Rasika Perera
b66da8c7cb Fixing android agent download url 2016-09-07 01:43:20 +05:30
harshanl
c8d9f7b4ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-06 11:11:58 +05:30
Rasika Perera
f97bedf208 Merge pull request #322 from thusithak/master
web agent layout defects, scrolling issues fixed
2016-09-06 10:49:03 +05:30
thusithakalugamage
b1e973dc06 web agent layout defects, scrolling issues fixed 2016-09-06 10:34:37 +05:30
Rasika Perera
94ff1ea3ef Fixing android agent download issue 2016-09-06 10:33:10 +05:30
Rasika Perera
86a48bd455 Making "host" HTTPS -> HTTP to fix android agent download issue 2016-09-06 10:33:10 +05:30
harshanl
479deb8a49 Added logic to switch between GCM & LOCAL notification provider in Android 2016-09-05 17:46:08 +05:30
mharindu
2b3967fd71 Partial commit of migration 2016-09-05 16:39:13 +05:30
harshanl
814dcf9c8f Refactored Android APIs 2016-09-05 11:57:03 +05:30
dilanua
af8905069d Adding missing stepper headers for policy-create UI 2016-09-02 12:18:26 +05:30
dilanua
16163a8edb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-01 16:54:33 +05:30
dilanua
2472a12939 Updating emm dashboard role links 2016-09-01 16:52:50 +05:30
Rasika Perera
03a8c73014 Caching enabled on emm-web-agent 2016-09-01 16:28:11 +05:30
Rasika Perera
078c29ab9d Now EMM mobile-base-plugin feature contains both devicemgt and emm-web-agent apps 2016-09-01 16:28:11 +05:30
Rasika Perera
38b65daeda Adding emm-web-agent app with new UUFv0.2 version. 2016-09-01 16:28:11 +05:30
charitha
2974447362 Add validation to APK download url 2016-08-31 20:35:11 +05:30
kamidu
e135764f30 Improving the ux of devic listing page 2016-08-30 16:37:22 +05:30
Rasika Perera
3da7ac2916 Merge pull request #318 from thusithak/master
Theme migration for 2.2.0
2016-08-26 16:58:20 +05:30
thusithakalugamage
910803703c mdm notification bar status msg and button markup update 2016-08-26 15:48:23 +05:30
hasuniea
0235e4a0da fixing ClassNotFoundException 2016-08-26 13:23:48 +05:30
thusithakalugamage
97325fab85 mdm navbar hamburger menu and menu open state icons correction 2016-08-26 11:52:11 +05:30
harshanl
e42bf394d9 Changed windows API package name 2016-08-25 17:11:36 +05:30
harshanl
16d9338dce Refactored windows APIs 2016-08-25 16:28:03 +05:30
inoshperera
532f66ebc5 fixing the operations not getting applied to multiple devices 80, 73 2016-08-25 14:20:44 +05:30
mharindu
0d3cd0c9e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.7 2016-08-24 14:56:23 +05:30
kamidu
dcc062faad Device management theam changed to follow the patten introdused in policy management 2016-08-23 17:19:41 +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
a844573773 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-18 19:45:52 +05:30
dilanua
21eacedf8b Suppressing checked warnings 2016-08-18 16:04:46 +05:30
harshanl
d0512f93b7 Fixed EMM-1282 2016-08-18 11:06:43 +05:30
Chatura Dilan
76f14c13ab Merge pull request #317 from charithag/carbon-kernel-4.4.3
Fix for possible NPE that could happen due to null device or null pro…
2016-08-17 16:00:12 +05:30
charitha
2f2af6c46b Change indentations to tab as this file use tab indentations 2016-08-17 15:58:32 +05:30
charitha
8ba69c8b36 Change indentations to tab as this file use tab indentations 2016-08-17 15:58:02 +05:30
charitha
76a442e864 Fix for possible NPE that could happen due to null device or null property list. 2016-08-17 15:54:56 +05:30
hasuniea
97ff014b1b fixing log info message issue 2016-08-17 15:53:38 +05:30
hasuniea
5e2a42d798 fixing app-install issue 2016-08-17 15:31:18 +05:30
kamidu
33c490e229 adding missing units 2016-08-16 17:13:29 +05:30
kamidu
2486c3ff5d remove tables headers when there is no enroll devices in the system 2016-08-16 14:55:15 +05:30
Rasika Perera
c8e7ba4f54 Placeholders added to send notification form input elements 2016-08-16 12:23:29 +05:30
Rasika Perera
de786ee8c0 License updated for qr modal unit 2016-08-16 12:23:03 +05:30
Rasika Perera
a55e9a53ae Removed hardcoded app context on href links 2016-08-16 12:15:52 +05:30
Rasika Perera
784c2260e4 qr modal added to devices listing page 2016-08-16 12:15:52 +05:30
Rasika Perera
75b67a02bc qr modal added 2016-08-16 12:15:52 +05:30
Rasika Perera
e1071ef8f3 Reusable qr modal unit created 2016-08-16 12:15:52 +05:30
Ruwan
9c512a2ad6 Merge pull request #316 from ayyoob/com
fixing commit issues
2016-08-16 08:27:21 +05:30
Rasika Perera
fe01c59ed4 Fixing notification send operation not sending notifications 2016-08-15 23:03:58 +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
dilanua
fcd68eab59 Fixing owner undefined issue in device view 2016-08-15 18:37:51 +05:30
kamidu
3262a7d926 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-15 18:17:14 +05:30
kamidu
7cb4f51dd2 Fix the device location view isssues 2016-08-15 18:07:52 +05:30
kamidu
b8d91478d5 Device view and detail related ui fixes 2016-08-15 18:06:19 +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
ayyoob
55107aaae5 fixing commit issues 2016-08-15 15:04:26 +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
dilanua
3cc2a8ca12 Fixing role retrieval issue in policy-mgt 2016-08-15 12:01:42 +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
ayyoob
255e6b5566 few changes to resolve after scope validation issue 2016-08-13 10:38:30 +05:30
kamidu
c5bb85e772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 17:40:49 +05:30
kamidu
ad5b871a30 Fix the device view zone conflict 2016-08-12 17:40:42 +05:30
hasuniea
68f64c3ae1 adding windows devicemgt interface and impl 2016-08-12 16:31:47 +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
kamidu
f17261423f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 14:32:28 +05:30
kamidu
96503f8166 Fix the notification related issues in mdm.nav bar 2016-08-12 14:09:08 +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
ayyoob
65ca57c6d5 added scope annotation 2016-08-12 12:27:03 +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
kamidu
04d1a3912a Fix the device view related issues 2016-08-11 19:05:42 +05:30
dilanua
fe2b861932 Fixing incorrect link - policy create UI 2016-08-11 16:57:24 +05:30
dilanua
6b0aaf42f1 Adding updates to emm policy listing page 2016-08-11 15:08:32 +05:30
harshanl
b207554bba Refacotered IOT plugins to use own keystore. 2016-08-11 12:38:11 +05:30
mharindu
b9289e801f Addin carbon 4.4.7 migration changes 2016-08-11 12:21:28 +05:30
dilanua
ca4cb37d58 Adding emm policy listing UI 2016-08-11 11:05:25 +05:30
dilanua
bd5ef4158b Adding emm policy edit UI 2016-08-10 18:52:39 +05:30
dilanua
935b429198 Adding emm policy view UI 2016-08-10 18:34:35 +05:30
dilanua
aada09de10 Adding policy create UI updates 2016-08-10 18:06:26 +05:30
Ace
0ee28c91d2 Adding date validations when updating device enrollment 2016-08-10 14:26:39 +05:30
harshanl
e1e7bccd57 Temporary removed VirtualFireAlarm module to fix the build issue 2016-08-10 14:19:37 +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
hasuniea
9cde2d815a refactoring windowsapi 2016-08-10 10:51:42 +05:30
hasuniea
8a4b97ebf9 refactoring windowsapi 2016-08-10 10:39:30 +05:30
Rasika Perera
5ea262947b Added emm specific policy creation unit extending cdmf.unit.policy.create 2016-08-10 08:43:00 +05:30
Rasika Perera
4c11157d4e Enrollment url by default same VM 2016-08-10 08:33:43 +05:30
mharindu
d253dd4552 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-09 19:16:20 +05:30
mharindu
141a7d0959 Added scopes to the config.json 2016-08-09 19:09:22 +05:30
hasuniea
a62544c68b refactoring windowsapi 2016-08-09 18:00:49 +05:30
Ace
a37d5dbfd9 Fixing user,device,role listing pages 2016-08-09 07:57:30 +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
inoshperera
0197ea964f Merge pull request #313 from charithag/master
Add missing BadRequestException to global exception wrapper
2016-08-08 10:42:36 +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
dilanua
a71537b7bb Updating emm app name 2016-08-06 17:17:24 +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
hasuniea
16e306268f fixing javax cache issue 2016-08-04 16:35:31 +05:30
hasuniea
86056df434 fixing windows plugin relalted slf4j issue 2016-08-04 15:29:25 +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
Rasika Perera
97eac5064e Fixed Requested resource /app/conf/reader/main.js not found 2016-08-02 23:11:42 +05:30
Rasika Perera
7b62aa3361 Fixing: Requested resource /app/conf/reader/main.js cannot be found 2016-08-02 22:23:23 +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
Rasika Perera
3d25102d30 Adding enrollment url into view model 2016-08-02 15:49:46 +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
kamidu
e0d9e1659c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:14:54 +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
kamidu
ea89c6685e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 10:32:44 +05:30
kamidu
6db9fc426e Fix the addd buttton 404 issue 2016-08-01 14:34:48 +05:30
hasuniea
a8102b8c42 fixing VERIFONEEMMPROF-26 2016-08-01 14:28:52 +05:30
mharindu
576bfb8236 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-01 12:27:30 +05:30
Chatura Dilan Perera
fb4d8ae990 refactor files 2016-08-01 11:52:03 +05:30
dilanua
18a9ad4b8a Updating EMM UI conf.json 2016-07-29 18:02:44 +05:30
kamidu
a38d38a86e Addting new nav bar without group management ui 2016-07-29 15:31:20 +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
Dilan U. Ariyaratne
cd7ca448a0 Merge pull request #311 from ayyoob/com
Added missing license headers
2016-07-28 17:54:10 +05:30
ayyoob
04b1a22a00 Added missing license headers 2016-07-28 17:52:06 +05:30
ayyoob
618230e121 remove new line 2016-07-28 17:48:28 +05:30
Dilan U. Ariyaratne
4f07a42a95 Merge pull request #310 from ayyoob/com
removed error message variable
2016-07-28 17:39:26 +05:30
ayyoob
b60487304f removed error message variable 2016-07-28 17:37:18 +05:30
Milan Perera
2998c1e4ac Merge pull request #309 from ayyoob/com
Fix issues raised in the comments
2016-07-28 16:58:17 +05:30
ayyoob
20cf418394 Fixed Issues raised in the comments 2016-07-28 16:16:06 +05:30
ayyoob
95ca419d17 avoided null check when comparing 2016-07-28 15:46:23 +05:30
ayyoob
9eec100535 fixed formatting issues 2016-07-28 15:46:06 +05:30
ayyoob
4ffa47f0b4 removed redundant brackets 2016-07-28 15:42:47 +05:30
Chatura Dilan
1fa5bdba44 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-07-28 15:26:04 +05:30
Chatura Dilan
338d804dba Added validations for invalid device Ids 2016-07-28 15:25:29 +05:30
Ruwan
5356ee920c Merge pull request #308 from ayyoob/transport
changes in realtime analytics
2016-07-28 12:38:42 +05:30
ayyoob
d650e86e00 few changes in real time analytics 2016-07-27 14:45:31 +05:30
Ace
77bdbb5a57 Fixing QR code issue 2016-07-26 20:58:21 +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
dilanua
0ef0a06d10 Updating emm config.json 2016-07-22 16:58:55 +05:30
mharindu
d2f02d128c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-22 16:50:37 +05:30
dilanua
f85dcc3f25 Updating emm config.json 2016-07-22 16:43:12 +05:30
ayyoob
22f4a9e2af added mqtt and web socket authorisation 2016-07-21 20:40:32 +05:30
Ace
c004824b81 removing console.log 2016-07-21 15:02:15 +05:30
mharindu
98d291fcd0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-21 14:32:43 +05:30
Ace
24624131a7 Adding EMM dashboard to mobile base UI 2016-07-21 07:43:41 +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
Ace
bff34e5030 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-15 12:01:42 +05:30
Ace
d802570be9 Adding app.conf for mobile base plugin 2016-07-15 12:01:31 +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
mharindu
6b939714d8 Changed context paths 2016-07-12 01:32:15 +05:30
mharindu
2563098948 Fixed conflicts and merged 2016-07-11 22:12:54 +05:30
hasuniea
ad8bbf8863 removing notnull constraint from android device type 2016-07-11 19:07:13 +05:30
hasuniea
e84a868069 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-11 17:52:55 +05:30
hasuniea
53063284d0 fixing validation issue 2016-07-11 17:50:56 +05:30
Chatura Dilan
0818ae6860 [maven-release-plugin] prepare for next development iteration 2016-07-08 20:18:00 +05:30
Chatura Dilan
62c16e07ce [maven-release-plugin] prepare release v2.1.1 2016-07-08 20:17:52 +05:30
madhawap
3851be8742 fix to permissions.xml 2016-07-08 16:10:49 +05:30
hasuniea
b30aadc438 fix code conflicts 2016-07-08 15:28:01 +05:30
hasuniea
4ccf018bb3 adding validations 2016-07-08 15:26:20 +05:30
mharindu
ba4065265d Refactored permission.xml of android webapp 2016-07-08 13:57:50 +05:30
Kasun Delgolla
79b1d51643 Committing VPN operation fixes + logcat operation 2016-07-07 17:46:33 +05:30
mharindu
48613018ab Fixed issues in scope based autorization implementation 2016-07-04 19:27:46 +05:30
mharindu
f675468e44 Added scopes to APIS 2016-07-04 18:03:20 +05:30
Chatura Dilan
bedb171eb7 Added OS build date 2016-07-01 15:47:26 +05:30
Chatura Dilan
971185decf fixes for android sense client 2016-06-30 15:59:40 +05:30
Chatura Dilan
e05906fed5 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-06-30 07:34:31 +05:30
Ruwan
1d12d8771d Merge pull request #306 from WarunaS/rapid_accelarations
Rapid accelarations
2016-06-29 20:22:25 +05:30
Waruna Samarsinghe
bc08e31c4c Android Sense iBeacon 2016-06-29 17:50:22 +05:30
Chatura Dilan
f58abbe0db Added is_active field 2016-06-29 17:41:09 +05:30
Waruna Samarsinghe
a8371e046e Scanning Beacon 2016-06-28 16:18:13 +05:30
Waruna Samarsinghe
cd1cf2bf44 Beacon Scaning 2016-06-28 16:04:59 +05:30
Ruwan
8b6fe27cab Merge pull request #304 from ayyoob/transport
few changes added to transport adapters after testing with the cluster
2016-06-27 05:51:31 +05:30
ayyoob
8a9ad21e74 few changes added to transport adapters after testing with the cluster 2016-06-27 00:13:15 +05:30
Waruna Samarsinghe
32c4a34283 Ranged iBeacons 2016-06-26 14:36:06 +05:30
prabathabey
1205d26463 Merging rest-api-improvements branch with master 2016-06-21 16:05:27 +05:30
Chatura Dilan
6a702adaa3 Change emm_admin to admin 2016-06-21 15:51:35 +05:30
Chatura Dilan
529c828b81 Fixed paths in Android related permissions.xml 2016-06-21 11:32:01 +05:30
ayyoob
6c24f44abc Added push notification support for device types 2016-06-20 02:34:44 +05:30
ayyoob
562ac197af added configurations for device types 2016-06-17 17:21:13 +05:30
inoshperera
bb0ea53909 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-16 07:57:46 +05:30
inoshperera
c45400afd0 fixing error messages not thrown properly. 2016-06-16 07:57:40 +05:30
Kasun Delgolla
ef281e1524 Fixing operation response ERROR state exception 2016-06-15 13:51:08 -07:00
Ruwan
208bf6a7ab Merge pull request #298 from WarunaS/rapid_accelarations
Fix Orientation Issue
2016-06-13 16:47:38 +05:30
Waruna Samarsinghe
f3f28c544f Fix Orientation Issue 2016-06-13 16:30:39 +05:30
inoshperera
90747a5579 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-08 16:56:14 +05:30
inoshperera
486e2f48ed adding validation 2016-06-08 16:55:42 +05:30
Shabirmean
38c087ebc1 Added necessary changes to store CA_CERT and handle expired refresh-token scenario 2016-06-08 12:00:32 +05:30
Shabirmean
f0206d7ed4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-06 19:14:24 +05:30
ayyoob
28254e0da8 updated android sense 2016-06-06 16:52:48 +05:30
ayyoob
96638f88e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-06 13:20:00 +05:30
Ruwan
a2c54eb91c Merge pull request #293 from WarunaS/rapid_accelarations
rapid acceleration and turns- android sense
2016-06-06 13:18:14 +05:30
ayyoob
d4b319c42a added weburl for https 2016-06-06 13:14:04 +05:30
GPrathap
a3ff9fbdc5 adding sso configuration 2016-06-05 23:36:38 +05:30
Waruna Samarsinghe
d44170e52e rapid acceleration and turns- android sense 2016-06-05 22:58:38 +05:30
Waruna Samarsinghe
fec14a8509 rapid acceleration and turns- resolved 2016-06-05 00:06:50 +05:30
dilanua
c9a07df91a Fixing wrong device id shown for OTA-UPGRADE operation 2016-06-04 00:27:19 +05:30
dilanua
741bb0ac16 Updating Responces in pending-operations api 2016-06-03 23:49:19 +05:30
dilanua
bcba6216c0 Update UpgradeFirmware operation with server properties 2016-06-03 20:51:54 +05:30
dilanua
9ac7ffe828 Update UpgradeFirmware operation with server properties 2016-06-03 20:47:44 +05:30
mharindu
4a8ab39dec Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-03 19:49:00 +05:30
Ace
6425d6ab1a Adding null check for operations response 2016-06-03 19:27:20 +05:30
mharindu
9237fed74e Added notification title 2016-06-03 19:22:44 +05:30
prabathabey
55aa1c8113 Fixing compilation issues 2016-06-02 21:07:33 +05:30
mharindu
62a116ba71 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-02 17:12:09 +05:30
Shabirmean
dca55d692c Changes following the hashCode of the deviceId being used as the certificate alias 2016-06-02 17:12:06 +05:30
mharindu
c5d1eaa21b Fixed issue in location service 2016-06-02 17:11:05 +05:30
hasuniea
2b89b692a4 adding event configuration refference 2016-06-02 16:37:50 +05:30
hasuniea
c170373ace fix responce code 2016-06-02 15:57:00 +05:30
hasuniea
ec91b0a539 fixing eventReceiver 2016-06-02 15:30:09 +05:30
Shabirmean
fa454388ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-02 14:20:05 +05:30
Shabirmean
a117ae37c7 Modifications to the Token Refresh Flow & the Enrolment flow in the VFAlarm 2016-06-02 14:19:48 +05:30
Anushka Samaranayake
1265a1dd34 Alert generation 2016-06-01 20:22:29 +05:30
hasuniea
198b3c67dc add entry in permission xml 2016-05-31 19:16:52 +05:30
hasuniea
0bcbab7071 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:54:27 +05:30
Chatura Dilan
d3a0fc3f12 Added install application permissions 2016-05-31 18:50:26 +05:30
hasuniea
daee6109cc fixing code issues 2016-05-31 18:48:49 +05:30
Chatura Dilan
7c59e391de Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:42:54 +05:30
Chatura Dilan
ba1f3bbbcc fixed issue in unlock devices permissions 2016-05-31 18:42:37 +05:30
hasuniea
786c6859bd Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:15:11 +05:30
hasuniea
d01e176933 add eventreceiver fix 2016-05-31 18:08:16 +05:30
prabathabey
640cf95528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:02:15 +05:30
prabathabey
d7b4b83424 Fixing path of license resource 2016-05-31 18:02:04 +05:30
mharindu
56a2ca0aa0 Added missing HTTP method attribute in permissions.xml in android webapp 2016-05-31 17:21:31 +05:30
Chatura Dilan
9086a130c4 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 16:21:54 +05:30
Chatura Dilan
3fd56b56c4 Fix cxf servelt issues 2016-05-31 16:21:42 +05:30
prabathabey
212c11750c Added http schem supported by the API 2016-05-31 16:13:20 +05:30
inoshperera
763854ef9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 14:51:07 +05:30
ayyoob
61d88f77b6 removed device Id from notification bean 2016-05-31 14:48:23 +05:30
inoshperera
6d14133bab fixing the mismatch of swagger annotation and implementation 2016-05-31 14:45:05 +05:30
Chatura Dilan
bf1e00f472 Fixed the host name of Android API 2016-05-30 17:07:04 +05:30
prabathabey
eb025c42f7 Fixing issues encountered while deploying the agent webapp of windows 2016-05-30 12:30:12 +05:30
prabathabey
18257b8729 Changing the name of the android API webapp 2016-05-30 12:08:44 +05:30
prabathabey
4dbf699b66 Fixing issues in android sense plugin which were caused by refactoring done in cdm-f 2016-05-30 08:33:55 +05:30
prabathabey
63bb616e9c Improving swagger annotations 2016-05-28 08:12:10 +05:30
prabathabey
631d57e70d Improving swagger annotations 2016-05-28 06:03:06 +05:30
Kasun Delgolla
a01fe5e4f9 Adding missing parameters 2016-05-28 02:14:56 +05:30
prabathabey
44aa3a93a9 Adding more improvements to swagger annotations 2016-05-28 02:07:17 +05:30
inoshperera
9f8ca3ea9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-28 01:50:20 +05:30
inoshperera
4dbf1bdc2f adding swagger annotation and making APIs standerdize 2016-05-28 01:50:14 +05:30
Kasun Delgolla
bd65e8b2a7 Committing missing android features 2016-05-28 01:38:03 +05:30
Chatura Dilan
b8cfcf4413 Fixed Enrollment issue 2016-05-27 23:18:11 +05:30
Chatura Dilan
91003fdee1 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-27 22:44:22 +05:30
Chatura Dilan
d25e1b2421 Fixed Android APIs 2016-05-27 22:43:03 +05:30
hasuniea
cc8190b541 add windows feature 2016-05-27 20:03:25 +05:30
inoshperera
f346c7c528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-27 19:38:41 +05:30
prabathabey
479acf3b45 Improving swagger annotations of device management admin API 2016-05-27 19:38:12 +05:30
hasuniea
d7527e95f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 18:45:49 +05:30
hasuniea
d4bce21f75 windows plugin 2016-05-27 18:45:20 +05:30
prabathabey
ba9d85b065 Adding swagger related dependencies to android agent webapp 2016-05-27 18:26:34 +05:30
inoshperera
aa4a4889a5 adding API header 2016-05-27 15:36:22 +05:30
prabathabey
9a01df5d55 Renaming android agent webapp 2016-05-27 14:58:19 +05:30
prabathabey
23343eb765 Fixing the name of android agent webapp 2016-05-27 12:50:29 +05:30
prabathabey
8620eb912f Removing redundant implementations of android and windows plugins 2016-05-27 11:59:28 +05:30
prabathabey
8f3a2eec5d Merging the latest changes introduced to master 2016-05-27 11:47:28 +05:30
prabathabey
98a8a09813 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 11:23:34 +05:30
prabathabey
6f7f706428 Renaming TenantConfiguration as PlatformCongfiguration 2016-05-27 11:23:19 +05:30
Milan Perera
23c404260e Merge pull request #283 from ayyoob/transport
fixed db related jiras
2016-05-26 21:23:05 +05:30
Rasika Perera
07984e4b6e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-26 18:34:58 +05:30
Rasika Perera
91cc0baaf5 Moved CSS into separate file 2016-05-26 18:34:07 +05:30
Rasika Perera
0862e95f4c Moved CSS into separate file 2016-05-26 18:22:32 +05:30
prabathabey
fd1d62454a Improving Android JAX-RS API definitions 2016-05-26 18:01:14 +05:30
ayyoob
6f6b5104d5 fixed https://wso2.org/jira/browse/IOTS-172 2016-05-26 16:23:42 +05:30
Kasun Delgolla
86327ab870 Committing android service improvements + integration 2016-05-26 15:35:26 +05:30
prabathabey
03a21752e2 Adding maven-compiler-plugin to the build profile 2016-05-26 11:14:31 +05:30
hasuniea
9f33110e6f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 18:16:11 +05:30
GPrathap
2e10d2ba2b added some bundles which required for this feature 2016-05-25 14:42:54 +05:30
hasuniea
ab70703da8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 13:54:12 +05:30
hasuniea
2eb5aebb60 fixed code issues in EventService 2016-05-25 13:53:39 +05:30
Ruwan
9e8e479d63 Merge pull request #281 from rasika90/master
Adding licence headers for server-side handlebar templates
2016-05-25 11:45:16 +05:30
geethkokila
57a9834145 Changing apis to return activity when an operation is added 2016-05-25 11:43:19 +05:30
Rasika Perera
f0b5ad32c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 11:35:27 +05:30
Rasika Perera
c49e19a3c6 Adding licence headers for handlebar templates 2016-05-25 11:34:22 +05:30
Milan Perera
028a9b106a Merge pull request #280 from ayyoob/transport
added UI output adapter
2016-05-24 19:35:24 +05:30
ayyoob
b7748b0001 added UI output adapter 2016-05-24 19:28:47 +05:30
Kasun Delgolla
4f33789d38 Committing MDM android APIs responses standardization 2016-05-24 15:34:43 +05:30
Hasunie
df6f420d6e Merge pull request #279 from hasuniea/master
fixed code issues
2016-05-23 15:11:15 +05:30
hasuniea
4757ac797c fixed code issues 2016-05-23 15:09:33 +05:30
ayyoob
dc32a8f8d3 Merge branch 'release-2.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-23 10:18:46 +05:30
Shabirmean
75914aee4e Changes to the VirtualFirealarm Agent + the API to enable token refresh upon expiration 2016-05-21 01:46:34 +05:30
mharindu
f3730c64ae [maven-release-plugin] prepare for next development iteration 2016-05-20 17:49:18 +05:30
mharindu
7a982093a1 [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:49:08 +05:30
mharindu
862075bd2f Removed maven clean plugin 2016-05-20 17:45:40 +05:30
mharindu
be4078cf38 [maven-release-plugin] rollback the release of v2.1.0 2016-05-20 17:35:17 +05:30
mharindu
a2d2f26123 [maven-release-plugin] prepare for next development iteration 2016-05-20 17:26:28 +05:30
mharindu
3af112898d [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:26:19 +05:30
hasuniea
a48529be59 fix code conflicts 2016-05-20 16:38:33 +05:30
hasuniea
5c29ac8c4f fix code conflicts 2016-05-20 16:29:24 +05:30
hasuniea
a7665033b4 refactored events 2016-05-20 16:18:24 +05:30
Rasika Perera
6696603ec5 Showing error when device name is less than 4 letters 2016-05-19 15:55:05 +05:30
Rasika Perera
a46863b4ad Fixing incorrect deviceIdentifier 2016-05-19 11:22:42 +05:30
Shabirmean
e656f383fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 01:35:01 +05:30
Shabirmean
10c49cfb4c Fixes to small bugs in the virtual firealarm 2016-05-19 01:34:49 +05:30
mharindu
6da020e5d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:42:44 +05:30
sumedharubasinghe
b8b0eda0bb Merge pull request #269 from ayyoob/transport
fixed exponential backup logic
2016-05-19 00:40:07 +05:30
mharindu
cbb1f44138 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:33:31 +05:30
ayyoob
d7b423d694 fixed exponential backup logic 2016-05-19 00:28:08 +05:30
prabathabey
f563f95c41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 00:22:18 +05:30
prabathabey
5b0748489d Improving virtual fire alarm plugin to use newly introduced push notification framework 2016-05-19 00:22:01 +05:30
sumedharubasinghe
fe89e8cac7 Merge pull request #268 from ayyoob/transport
fixed exponential backup logic
2016-05-18 23:18:11 +05:30
mharindu
0fee083c4b Added a null check to virtualfire-alarm 2016-05-18 22:03:16 +05:30
ayyoob
4001dbf887 fixed exponential backup logic 2016-05-18 19:32:39 +05:30
mharindu
cf9daf083d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-18 11:49:59 +05:30
Rasika Perera
c51cdaacdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into IOTS-159 2016-05-18 10:52:17 +05:30
Rasika Perera
32a9ff18ac Fixing IOTS-159: Adding meaningfull messages 2016-05-18 10:48:52 +05:30
sumedharubasinghe
7fa598e646 Merge pull request #266 from ayyoob/transport
updated android sense apk
2016-05-18 02:19:12 +05:30
ayyoob
2d6caafa0c updated android sense apk 2016-05-18 02:09:27 +05:30
charitha
b081f02594 Bug fixes 2016-05-17 23:33:55 +05:30
mharindu
29a1241ee9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-17 20:34:00 +05:30
Shabirmean
7f2fc73146 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-17 17:40:14 +05:30
Shabirmean
eec796732e Correction to the RaspberryPi table from which the batch data to be pulled 2016-05-17 17:40:03 +05:30
mharindu
3db3e52657 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-17 12:26:39 +05:30
hasuniea
8eb53927a6 add swagger annotations to windows plugin 2016-05-17 10:20:31 +05:30
Shabirmean
b4665f36bf Fixes to the RaspberryPi DeviceTypes to generate real-tome stats and send operations 2016-05-17 00:39:26 +05:30
charitha
eb57d38507 Fix for https://wso2.org/jira/browse/IOTS-152 2016-05-16 17:51:19 +05:30
charitha
a954de26f9 Moved api from device-mgt 2016-05-16 17:04:47 +05:30
mharindu
d7b84cf9e4 Fixed conflicts 2016-05-16 14:14:39 +05:30
mharindu
36c88aee3c Fixed conflicts 2016-05-16 12:24:14 +05:30
mharindu
24e353698f Added permission annotations to virtual fire alarm API 2016-05-16 12:12:47 +05:30
Ruwan
7f9b7c4914 Merge pull request #258 from ayyoob/transport
refactored apis and resolved xmpp issues
2016-05-15 20:07:28 +05:30
ayyoob
67831883fb refactored apis 2016-05-15 17:45:53 +05:30
Sumedha Rubasinghe
a1db2f1d08 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-15 13:20:15 +05:30
Sumedha Rubasinghe
6348ca31a3 removed unwanted text 2016-05-15 13:19:38 +05:30
charitha
f3d7608cdc Add support to grouping and bug fixes 2016-05-15 13:12:50 +05:30
ayyoob
b2a8b1b7c3 resolved xmpp stream conflict error 2016-05-15 12:39:34 +05:30
ayyoob
bb0b10f14c resolved xmpp issues in virtual fire alarm 2016-05-15 11:59:10 +05:30
Ruwan
f5442384d1 Merge pull request #256 from ayyoob/transport
few fixes after testing the device types with the refactoring
2016-05-14 21:01:31 +05:30
ayyoob
64cdb33d67 few fixes after testing the device types with the refactoring 2016-05-14 20:43:15 +05:30
GPrathap
b5fd68a6b4 fix typos 2016-05-14 18:31:22 +05:30
ayyoob
bd1c0554a8 updated android sense agent 2016-05-14 01:02:03 +05:30
ayyoob
bfbe790aa1 updated android sense topic 2016-05-14 00:43:50 +05:30
ayyoob
aa9fe6006a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-14 00:35:54 +05:30
ayyoob
12ace9efe1 refactored analytics scripts 2016-05-14 00:35:20 +05:30
ayyoob
3974ec7753 refactored analytics scripts 2016-05-14 00:34:36 +05:30
ayyoob
3d583cd39b refactored analytic scripts 2016-05-14 00:33:27 +05:30
Waruna Samarsinghe
1fdb6fd54c fix bugs location and accelerometer 2016-05-13 14:15:39 +05:30
ayyoob
e7ba11f709 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-13 05:27:41 +05:30
inosh-perera
bf7975c5d4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:59:27 +05:30
dilanua
bc1dfb86f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:56:34 +05:30
dilanua
2dabfa02fa Adding swagger annotations 2016-05-13 02:56:15 +05:30
ayyoob
da24c3fc1b removed method and type from feature 2016-05-13 02:53:30 +05:30
inosh-perera
0787aa2ac1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:51:54 +05:30
inosh-perera
afc7be590e adding swagger annotations for Android APIs 2016-05-13 02:50:17 +05:30
Madhawa Perera
f25cb51679 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
Adding swagger annotations to beans
2016-05-13 02:43:43 +05:30
Madhawa Perera
0d8010c25a Adding swagger annotations to beans 2016-05-13 02:43:23 +05:30
dilanua
f66aad9e0e Adding swagger annotations 2016-05-13 02:39:30 +05:30
ayyoob
04566ec250 updated event receivers 2016-05-12 21:59:35 +05:30
Kasun Delgolla
34d4da7e66 Merge pull request #250 from charithag/master
Fixed https://wso2.org/jira/browse/IOTS-104
2016-05-12 21:49:51 +05:30
Hasunie
cb73e24036 Merge pull request #181 from hasuniea/master
Refactored code issues
2016-05-12 21:49:45 +05:30
hasuniea
3cdb490908 added swagger annotations 2016-05-12 21:41:49 +05:30
ayyoob
a0c228f538 updated properties 2016-05-12 19:17:54 +05:30
ayyoob
303f6ad962 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-12 13:43:40 +05:30
ayyoob
f880bda706 refactored device type after adapter changes 2016-05-12 13:39:57 +05:30
ayyoob
10f75d5f73 refactored topic structure 2016-05-12 09:06:11 +05:30
ayyoob
d53942eeaa updated android sense and raspberry pi code 2016-05-12 03:09:51 +05:30
ayyoob
44fa7aa486 added input and output adapters as transport 2016-05-12 02:44:43 +05:30
charitha
70d47f96c1 Fix header title 2016-05-11 19:59:01 +05:30
charitha
ffcbea8421 Fixed https://wso2.org/jira/browse/IOTS-104 2016-05-11 16:00:05 +05:30
hasuniea
a47654e1f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-11 11:36:31 +05:30
charitha
4aa376b98e Enable group analytics 2016-05-10 21:32:09 +05:30
ayyoob
edaacd4989 device adapters updated 2016-05-09 01:05:34 +05:30
ayyoob
2b6816d7ed added xmpp, mqtt input/output adapters 2016-05-08 02:45:07 +05:30
hasuniea
5846f693e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-06 12:54:49 +05:30
ayyoob
6f000cbc64 refactoring version tags 2016-05-05 14:34:49 +05:30
hasuniea
feadc7d3ae Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-05 10:27:53 +05:30
sumedharubasinghe
671a70d161 Merge pull request #245 from ayyoob/das-ext
added template for host
2016-05-04 03:15:20 +05:30
sumedharubasinghe
7420ed4df6 Merge pull request #243 from rasika90/master
Adding permissions checking for isAuthorized
2016-05-04 03:01:40 +05:30
ayyoob
514c207495 changes on temperate event receiver 2016-05-04 03:01:06 +05:30
ayyoob
9e0fdca3ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-05-04 01:36:02 +05:30
Milan Perera
eaa933bff3 Merge pull request #244 from Shabirmean/master
Changes in include RPi to use MQTT Communication
2016-05-04 01:31:36 +05:30
ayyoob
441815afb9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-05-04 01:20:36 +05:30
ayyoob
cb939d6416 added template for host 2016-05-04 01:18:38 +05:30
mharindu
b03105f50b Fixed issues in arduino temperature sensor 2016-05-04 01:15:31 +05:30
Rasika Perera
7a5acb6f58 Adding group permission checking 2016-05-04 00:49:07 +05:30
Shabirmean
259405995a Modifications to the RPi Agent to publish to the DAS MQTT Receiver for temperature 2016-05-04 00:47:52 +05:30
Shabirmean
07bc52e86c Changes to enable MQTT Support for RPi DeviceType 2016-05-03 23:24:19 +05:30
Rasika Perera
0914b94dfc Adding policy update 2016-05-03 20:56:59 +05:30
Rasika Perera
b82fd2562d Adding permissions checking for isAuthorized 2016-05-03 19:28:42 +05:30
Shabirmean
4e51ca9ac4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-03 17:55:07 +05:30
Shabirmean
39a1020ef4 Fixes on the RPi API and modifications for MQTT Communication for RPi 2016-05-03 17:54:56 +05:30
hasuniea
81471f3a49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-03 16:03:23 +05:30
ayyoob
dbf82a3aa0 added recivers for temperature and few code changes after testing 2016-05-03 13:37:09 +05:30
gayank
893c535fb3 Android feature for Updating an application 2016-04-29 20:01:19 +05:30
hasuniea
b33023a770 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-29 19:31:07 +05:30
ayyoob
bbc2850509 few changes after testing 2016-04-29 17:41:22 +05:30
ayyoob
308ac40277 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-29 17:04:54 +05:30
ayyoob
2d57f252f0 few changes added to permissions IoT device type plugins 2016-04-29 17:04:19 +05:30
Shabirmean
c436a555bc Changes to use keystones provided by default and subsequent modifications to the agent enrolment code 2016-04-29 16:41:19 +05:30
ayyoob
14aac9f4f6 few changes after testing raspberry, arduino and refactored the jot plugins implementation 2016-04-29 16:41:18 +05:30
ayyoob
3b75a2e9a4 fixed issues in android sense 2016-04-29 00:35:52 +05:30
ayyoob
e775c8ebe0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-28 22:21:22 +05:30
ayyoob
315177b787 Few changes to support multi tenancy for virtual fire alarm and android sense 2016-04-28 22:21:08 +05:30
hasuniea
8d039551fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 17:50:57 +05:30
mharindu
7e4aaed2ee Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 12:04:18 +05:30
hasuniea
0e8c8c7eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 10:55:42 +05:30
ayyoob
012fc028cf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-28 03:10:01 +05:30
ayyoob
06bb551842 added android sense batch graphs 2016-04-28 03:05:27 +05:30
ayyoob
32958b2076 few changes in android agent and added android sense realtime graphs 2016-04-28 01:52:12 +05:30
charithag
4ef3f8d461 Fix timing issue 2016-04-27 17:45:29 +05:30
charithag
fb71f5743c Remove obsolete units and update analytics components 2016-04-27 15:41:27 +05:30
charithag
03c4768e7d Update new analytics components. 2016-04-27 13:44:38 +05:30
mharindu
e63afcec48 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-27 12:28:51 +05:30
mharindu
f6d75bb880 Added permissions to firealarm API 2016-04-27 12:28:43 +05:30
prabathabey
cfbc36ff2d Making the plug-in implementations compatible with the changes introduced to DeviceManagementService SPI 2016-04-26 17:17:37 +05:30
ayyoob
313b48f01d added virtual firealarm graphs 2016-04-26 15:58:54 +05:30
Rasika Perera
0e3ed08de4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-26 11:36:32 +05:30
Rasika Perera
cb7f7a6cd9 Autocompleting API params for Operations Implemented 2016-04-26 11:35:35 +05:30
prabathabey
ac407a6a1a Removing obsolete dependencies to ApplicationManagert interface from plug-in specific device management service implementations 2016-04-25 20:30:10 +05:30
ayyoob
f0c17184f8 few changes on while creating a role for android sense and virtual firelaarm 2016-04-23 23:39:11 +05:30
Ruwan
525fc5f5e9 Merge pull request #233 from ayyoob/das-ext
Few changes in android sense and virtual firealarm
2016-04-23 21:42:03 +05:30
ayyoob
d128804b04 added real time analytics for virtual fire alarm 2016-04-23 20:30:37 +05:30
ayyoob
e3f117e8fe few changes in virtual firealarm stats api 2016-04-23 00:07:54 +05:30
ayyoob
16fb54d463 Changes after testing with virtual firealarm and android sense 2016-04-22 20:58:13 +05:30
NuwanSameera
eb0069381d Remove digital display and drone analyzer from plugins 2016-04-22 15:51:32 +05:30
NuwanSameera
59ea70e761 Remove digital display and drone analyzer from plugins 2016-04-22 15:35:12 +05:30
NuwanSameera
fda0e9fb5d Add uninstall feature to mobile application features 2016-04-22 14:33:47 +05:30
hasuniea
05d252e61d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-22 09:33:38 +05:30
ayyoob
5f43cc47e8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-20 17:39:44 +05:30
Rasika Perera
8e8b2a69c1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-20 15:09:58 +05:30
ayyoob
a3c7208cea Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt-plugins into das-ext 2016-04-20 15:03:20 +05:30
ayyoob
6101d2dc09 few changes on android sense 2016-04-20 14:59:14 +05:30
Rasika Perera
0a060d9a73 Fixing android-sense to support auto-generated operations 2016-04-20 14:04:06 +05:30
Rasika Perera
506a48569b Now operations are auto generated and supports query params, path params and form params. 2016-04-20 13:38:37 +05:30
ayyoob
d2f59f50bb few changes to resolve start up issues 2016-04-20 00:11:59 +05:30
ayyoob
087be385c4 merged with upstream 2016-04-19 23:58:38 +05:30
ayyoob
f5fc978b5b refactored analytics scripts 2016-04-19 23:43:27 +05:30
Ruwan
c609ef1c9b Merge pull request #229 from NuwanSameera/master
Remove monitor operations from controller APIs.
2016-04-19 18:35:40 +05:30
NuwanSameera
4ad62b1dc1 Remove monitor operations from controller api. 2016-04-19 17:16:58 +05:30
Kasun Delgolla
a6a0fc2a57 Adding VPN feature for android 2016-04-19 16:25:19 +05:30
NuwanSameera
1606c365e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 15:13:04 +05:30
charithag
4a2b28cd9f Fix UI issues occured after merge with emm ui 2016-04-19 14:57:16 +05:30
NuwanSameera
f3cbe67cad \Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 13:38:25 +05:30
Prabath Abeysekara
ec983337a9 Merge pull request #226 from charithag/master
Moved devicemgt_admin jax-rs to carbon-device-mgt
2016-04-19 13:36:46 +05:30
NuwanSameera
f8c4b6413c Resolve conflicts 2016-04-19 11:46:27 +05:30
NuwanSameera
2d4f07fc55 Add REST Api annotations to Api implementations. 2016-04-19 11:33:31 +05:30
hasuniea
61353730ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:02:34 +05:30
charithag
c8b55ea2c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:00:27 +05:30
ayyoob
2567c812f2 removed das extension feature 2016-04-18 17:13:51 +05:30
charithag
7fb167b7fa Moved devicemgt_admin jax-rs to carbon-device-mgt 2016-04-18 16:41:04 +05:30
ayyoob
30578a9161 added android sense code after testing 2016-04-18 02:59:43 +05:30
ayyoob
0b67c0f74a added android sense agent code 2016-04-17 12:18:25 +05:30
ayyoob
3e1b0c54e9 made content validator to process batch events 2016-04-16 01:10:58 +05:30
ayyoob
cdb1f62ba9 Made device plugins to connect securely with the MQTT broker 2016-04-15 23:10:48 +05:30
ayyoob
d3a769776b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-14 20:04:41 +05:30
ayyoob
6709360249 adding das receivers and publisher with OAUTH 2016-04-14 19:56:33 +05:30
NuwanSameera
50f8716527 Resolve conflicts. 2016-04-11 16:09:23 +05:30
hasuniea
34cf1abf80 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-11 09:42:38 +05:30
charithag
73d3321154 Fix issues in virtual fire alarm jax-rs api 2016-04-08 16:13:37 +05:30
hasuniea
339deef5c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-08 11:03:34 +05:30
charithag
6daa5c43c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-07 20:47:37 +05:30
charithag
29486fedd5 Refactoring admin jax-rs to comply with restructured cdm 2016-04-07 20:42:56 +05:30
mharindu
918302475b Fixed incorrect location coordinate issue (EMM-1313) 2016-04-07 17:28:27 +05:30
hasuniea
b41cac80db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-04 14:50:46 +05:30
mharindu
2548a1dd18 Fix for EMM-1297 2016-04-04 14:21:11 +05:30
charithag
d09aa13497 Refactor group management service 2016-04-01 13:31:07 +05:30
charithag
ecc63f0f0e Refactor group management service 2016-03-31 17:53:53 +05:30
NuwanSameera
d637325590 Add db scripts to mssql, oracle, postgresql databases. 2016-03-31 17:06:25 +05:30
ayyoob
3488d9d79d refactored device type implemenation 2016-03-31 04:24:45 +05:30
ayyoob
2778e1c1ef Merge branch 'master' of https://github.com/NuwanSameera/carbon-device-mgt-plugins into merge-latest 2016-03-30 22:53:48 +05:30
ayyoob
c05191dac5 Added IoT plugins feature and refactored IoT base. 2016-03-30 22:49:20 +05:30
ayyoob
0bf219c93a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 20:25:26 +05:30
ayyoob
71d2897f20 Added jot plugins features 2016-03-30 20:25:02 +05:30
NuwanSameera
1f0f449385 Modify permissions.xml files in device type. 2016-03-30 17:55:33 +05:30
NuwanSameera
8656f84ac6 Move device type plugins to iot-plugins 2016-03-30 16:14:43 +05:30
inosh-perera
45512be823 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 16:09:04 +05:30
charithag
53eb49d5ae Fix bundle imports for java 8 2016-03-30 10:00:25 +05:30
inosh-perera
657cf05ef5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 09:21:50 +05:30
inosh-perera
56a96cf2c3 addning new features for user restrictions 2016-03-30 09:21:42 +05:30
charithag
8c6690a597 Update MDM admin content from product-emm 2016-03-30 02:10:31 +05:30
charithag
6e981fb2c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 01:59:17 +05:30
charithag
f74a8ddf0d Add device type plugins and features related to emm with IoTS base feature. 2016-03-30 01:57:32 +05:30
charithag
4f5b5188ea Updated with core changes 2016-03-29 18:32:12 +05:30
mharindu
b74f26975e Fixed conflicts and merged 2016-03-29 17:29:21 +05:30
charithag
887af1a9f6 Enable IoT base plugin component back and fix isses 2016-03-29 14:22:48 +05:30
charithag
f6d04fba4b Fix module locations 2016-03-29 12:59:10 +05:30
mharindu
cb9ab9fb0a Added unlock feature 2016-03-29 11:10:50 +05:30
prabathabey
39d2ce12dc merging resturctured iot and mobile plugins 2016-03-27 03:02:20 +05:30
gayank
c0a25f08bd Fixing EMM-1289 2016-03-24 15:31:21 +05:30
geethkokila
64c1772f5b Changing the plugins snapshit versions to 2.1.0 from 2.0.4 2016-03-24 11:45:41 +05:30
hasuniea
79e143d236 refactored code comments 2016-02-19 06:44:08 +05:30
hasuniea
5690dec4b7 refactored code issues 2016-02-17 18:00:28 +05:30
hasuniea
9ff91085c8 refactored code issue 2016-02-17 17:54:52 +05:30
hasuniea
77dc0f257c refactored code issues 2016-02-17 12:05:58 +05:30
hasuniea
e8a47a5239 refactored code issues 2016-02-15 10:46:29 +05:30
hasuniea
9c1b34b891 fixed code line issue 2016-02-13 18:24:03 +05:30
hasuniea
d5ec50c4e6 fixed code issue 2016-02-12 13:53:32 +05:30
hasuniea
7aeecf7345 refactored code issues 2016-02-10 18:10:00 +05:30
hasuniea
f32bdf4021 fixed code issues 2016-02-02 18:24:27 +05:30
hasuniea
4205ad18dd fixed issue in windowsUtil 2016-02-02 18:10:54 +05:30
hasuniea
69299b69e8 fixed code issues 2016-02-02 18:00:01 +05:30
Kamidu Sachith
512bf6c514 Preventing Infromation leakage 2016-01-25 14:42:59 +05:30
WSO2
2a46d2ed98 [maven-release-plugin] prepare for next development iteration 2016-01-07 17:33:06 +05:30
WSO2
e5d15f6616 [maven-release-plugin] prepare release v2.0.3 2016-01-07 17:32:57 +05:30
Kasun Delgolla
99286922dc Fixing character encoding issues in default licenses. 2016-01-07 15:52:33 +05:30
geethkokila
4eb78d8353 [maven-release-plugin] prepare for next development iteration 2015-12-30 14:39:40 +05:30
geethkokila
937e9af0d8 [maven-release-plugin] prepare release v2.0.2 2015-12-30 14:39:32 +05:30
geethkokila
e0233e9337 [maven-release-plugin] prepare for next development iteration 2015-12-23 23:00:55 +05:30
geethkokila
a3993b09e1 [maven-release-plugin] prepare release v2.0.1 2015-12-23 23:00:46 +05:30
geethkokila
9957ec1022 [maven-release-plugin] rollback the release of carbon-device-mgt-plugins-parent-2.0.1 2015-12-23 22:53:34 +05:30
geethkokila
bf73c3b81d [maven-release-plugin] prepare for next development iteration 2015-12-23 22:51:14 +05:30
geethkokila
a6788da596 [maven-release-plugin] prepare release carbon-device-mgt-plugins-parent-2.0.1 2015-12-23 22:51:06 +05:30
Prabath Abeysekara
820bd75223 Merge pull request #102 from hasuniea/master
fixed device enrollment modification
2015-12-23 15:57:33 +05:30
harshanl
618cd1b8fd Added null checks to GCM service. 2015-12-23 15:30:42 +05:30
hasuniea
9c77c6ae46 fixed device enrollment modification 2015-12-23 15:27:16 +05:30
geethkokila
81e3f53311 [maven-release-plugin] prepare for next development iteration 2015-12-22 08:42:03 +05:30
geethkokila
ab0aa475cc [maven-release-plugin] prepare release v2.0.0 2015-12-22 08:41:55 +05:30
Kamidu Sachith
9e99e2ec7a Improve performance of the core 2015-12-21 17:55:04 +05:30
harshanl
fc7776d736 Added null checks for empty regid scenarios as a fix for MDM-396 2015-12-21 17:13:07 +05:30
harshanl
889598c3b3 Removed deleting device data from disenrolment function. 2015-12-18 22:18:10 +05:30
harshanl
2397abaa6c Fixed NPE issue 2015-12-17 10:33:29 +05:30
harshanl
cb1c0c0439 Fixed DAO connection close issue. 2015-12-16 15:28:51 +05:30
Kasun Delgolla
f0669887fb Committing policy compliance monitoring issue 2015-12-16 14:40:44 +05:30
inosh-perera
330930ade7 fixes related to location in iOS - EMM-1048 2015-12-11 10:02:55 +05:30
hasuniea
665a46a65a add Language type constant 2015-12-04 15:32:43 +05:30
hasuniea
75d35dadca fixed default license issue 2015-12-04 11:02:40 +05:30
Kasun Delgolla
be37d3aeb5 Committing app context name change from mdm to emm 2015-11-30 20:18:11 +05:30
harshanl
b2d344bad7 Added a method to reset the tenant config cache. 2015-11-30 16:55:45 +05:30
manoj
be6d0647a6 Add notify to plugin for ios operations 2015-11-20 22:20:33 +05:30
manoj
aa19dc7261 APP manager integration 2015-11-19 10:58:43 +05:30
harshanl
92317260d3 Added GCM support to android 2015-11-18 20:14:36 +05:30
harshanl
9d807400ce Added GCM failure handling logic 2015-11-18 14:38:18 +05:30
harshanl
cfb6464cbe Fixed policy monitoring empty device list issue 2015-11-18 12:51:54 +05:30
harshanl
b401d7f61e added GCM support to android 2015-11-17 23:05:21 +05:30
harshanl
5a797d4de1 Updated DeviceManager service to latest DMService 2015-11-13 21:59:47 +05:30
Kamidu Sachith
3dceccc8c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-11-03 11:10:05 +05:30
harshanl
b33be7d49d Fixed EMM-897 issue. 2015-11-02 14:42:25 +05:30
Kamidu Sachith
bbcfe309f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-11-02 10:50:41 +05:30
Kamidu Sachith
b699e7744f Fixing Jira for repeat log 2015-11-02 10:49:58 +05:30
hasuniea
7701015ea0 refactored code conflicts 2015-10-30 20:12:26 +05:30
hasuniea
20fd4c1eff refactored code issues 2015-10-30 20:04:24 +05:30
hasuniea
728cf39853 refactored code issues 2015-10-30 20:00:59 +05:30
hasuniea
c257a7a5ab refactored code issues 2015-10-30 19:53:16 +05:30
hasuniea
85fdb3c930 refactored code issues 2015-10-30 19:48:45 +05:30
hasuniea
16b6c527ef refactored windowsFeatureManager 2015-10-29 14:47:59 +05:30
hasuniea
a437bda6af fixed code issues 2015-10-29 14:21:34 +05:30
hasuniea
8a97c3d612 Fixed code issues 2015-10-29 14:13:37 +05:30
hasuniea
9adfb05b37 refactored WindowsFeatureManager 2015-10-29 14:12:52 +05:30
hasuniea
7f66885f61 fixed conflicts 2015-10-29 10:11:13 +05:30
harshanl
1aee8edace updated android featuremgr 2015-10-28 22:39:31 +05:30
harshanl
3de1d0ffd7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-10-28 20:40:32 +05:30
prabathabey
58ae783a49 Fixing issues uncovered while running -Dsetup option with non-existent plugin based database scripts 2015-10-28 20:39:10 +05:30
harshanl
d24c0be7c5 Merged with master 2015-10-28 20:21:19 +05:30
harshanl
78f0ba2cdf Added feature addition to the plugin initialization. 2015-10-28 20:07:03 +05:30
prabathabey
530c6049ba Cleaning up mobile device management implementation 2015-10-28 19:09:09 +05:30
prabathabey
363dca0b61 code clean up 2015-10-28 17:55:38 +05:30
prabathabey
b5548f5744 Adding postgreSQL and Oracle schemas for plugin specific datastores and refactoring existing schemas to be consistent across that of all available plugin types 2015-10-28 17:55:26 +05:30
hasuniea
b72e481371 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-10-23 14:51:42 +05:30
hasuniea
1abb674b7e refactored WindowsFeatureImpl 2015-10-23 14:49:01 +05:30
geethkokila
c47ace254c Fixing the -Dsetup issue in mobile device database setup 2015-10-22 14:10:34 +05:30
hasuniea
a277fd53c2 Implemented WindowsFeatureDAOImpl 2015-10-21 19:29:34 +05:30
harshanl
d085106158 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-10-20 04:55:28 +05:30
hasuniea
a243819cf5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-10-20 01:43:08 +05:30
Kasun Delgolla
647998c7d0 Committing windows feature manager 2015-10-20 01:39:03 +05:30
hasuniea
fe7283ee01 refactored code issues 2015-10-20 01:05:58 +05:30
hasuniea
ca20492ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-10-15 18:35:05 +05:30
harshanl
e7733f2b12 Changed getTenantconfiguration implementation. 2015-10-15 12:31:26 +05:30
hasuniea
b644edd5b0 refactored code issues 2015-10-14 19:59:19 +05:30
hasuniea
023d019864 refactored Windows Device Manager 2015-10-12 17:43:19 +05:30
hasuniea
1a777941fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-10-12 12:37:26 +05:30
hasuniea
c5397cde67 refactored checkPolicyCompliance 2015-10-06 18:37:58 +05:30
hasuniea
aba2cf4447 implemented checkCompliancePolicy Service 2015-10-02 16:21:12 +05:30
hasuniea
ac88e32171 implimented policyMonitoring service for windows 2015-09-30 18:35:03 +05:30
mharindu
571b4deb4e Refactored android policy compliance 2015-09-21 16:37:14 +05:30
mharindu
ade7895901 Added data type check in android policy compliance 2015-09-21 16:26:10 +05:30
hasuniea
d8d8bb6f7e refactored WindowsDAOFactory 2015-09-18 19:30:21 +05:30
hasuniea
d5e583becc refactored coding issues. 2015-09-18 15:50:03 +05:30
hasuniea
7091a45590 refactored code issues 2015-09-18 15:34:58 +05:30
hasuniea
f35c3d084a refactored code issues 2015-09-18 14:18:26 +05:30
hasuniea
c06617d762 refactored formatting issues 2015-09-14 10:58:18 +05:30
hasuniea
a1b258a99a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-09-11 13:33:59 +05:30
hasuniea
716daee269 refactored issues in codes 2015-09-10 17:24:06 +05:30
mharindu
be6b6039fa Removed unnecessary newlines 2015-09-09 20:14:56 +05:30
mharindu
27752fe35e Corrected spelling mistakes of policy component 2015-09-09 20:02:36 +05:30
mharindu
17ad655f7d Fixing issues of previous PRs 2015-09-09 19:36:20 +05:30
hasuniea
7584e4d0c3 refactored windows plugin properties 2015-08-31 18:37:09 +05:30
hasuniea
6669d25f80 refactored windowsdevicemanager 2015-08-26 09:36:22 +05:30
mharindu
3eec1a3846 Refactored policy compliance 2015-08-22 04:55:22 +05:30
hasuniea
e394783668 refactored windows device disenrollment 2015-08-21 19:54:50 +05:30
harshanl
6e469087b6 Tenant configuration changes 2015-08-21 17:42:06 +05:30
mharindu
eab9aa93d0 Fixed formating issues 2015-08-21 16:57:56 +05:30
mharindu
4790de94ef Implemented policy compliance checking function for Android plugin 2015-08-21 16:46:45 +05:30
hasuniea
2177d2b987 refactored windows device plugin for enrollment 2015-08-21 06:27:37 +05:30
Dilshan Edirisuriya
95ea4ab5f4 supporting iOS 2015-08-12 17:45:10 +05:30
harshanl
4cbe38a5c2 Tenant configuration changes added for Windows platform 2015-08-07 10:25:39 +05:30
harshanl
a89b67aa25 Fixed tenant configuration persisting issue 2015-08-06 18:13:12 +05:30
milanperera
babe8e6c5e Removed info logs 2015-08-04 11:27:07 +05:30
milanperera
133bb9a6ea Fixed indentation issues 2015-08-04 11:20:27 +05:30
milanperera
b0bc3ff3f1 Merged 2015-08-03 11:29:37 +05:30
prabathabey
b4a61b0243 Adapting packaging changes introduced in device.mgt.extensions for registry based license manager 2015-07-30 15:16:45 +05:30
prabathabey
90502c34d7 Configuring default license for Android and code cleanup 2015-07-30 14:44:54 +05:30
milanperera
b3e6f24b17 Merged 2015-07-30 10:22:18 +05:30
prabathabey
ef9407859a Incorporating changes done upon RegistryBasedLicenseManager implementation 2015-07-28 20:38:33 +05:30
prabathabey
e8b6cd1830 Adding URL Printer startup handler implementation to devicemgt-plugins 2015-07-28 18:28:48 +05:30
milanperera
7374fe8e4b Refactored 2015-07-28 15:35:19 +05:30
milanperera
6293930800 Merged 2015-07-27 11:16:32 +05:30
milanperera
ff7854daaf Merged 2015-07-27 10:48:43 +05:30
prabathabey
29a6f0706a Adapting LicenseManager changes introduced in org.wso2.carbon.device.mgt.core and org.wso2.carbon.device.mgt.extensions 2015-07-24 12:09:01 +05:30
milanperera
c9bd29f40d Merged 2015-07-24 10:56:59 +05:30
milanperera
b48536dcd1 Fixed enrollment issue 2015-07-24 10:45:45 +05:30
harshanl
d07c226dd5 Added tenant configuration related changes 2015-07-22 15:39:02 +05:30
geethkokila
87073ffc5c Fixing the policy monitoring interface 2015-07-20 19:06:16 +05:30
geethkokila
fdec4ec5e2 Adding the policy monitoring service for android and windows 2015-07-20 18:48:57 +05:30
manoj
656c90b61d change add operation return to int 2015-07-15 12:13:35 +05:30
prabathabey
ce348da6fb Fixing Android and Windows plugin implementations to be compliant with the API changes introduced 2015-07-09 22:07:59 +05:30
harshanl
2014902cfb Fixed build break 2015-07-06 09:20:35 +05:30
prabathabey
0e05a992a5 Fixing Android and Windows MDM plugins to be compliant with changes introduced to device.mgt.core 2015-06-16 14:45:44 +05:30
prabathabey
f7dbfa7985 Code cleanup 2015-06-13 00:44:45 +05:30
prabathabey
f9f0e2a6a4 Adapting changes done to the upstream interfaces 2015-05-29 16:53:01 +05:30
Milan Perera
679cc35265 Update AndroidDeviceManager.java 2015-05-19 17:45:39 +05:30
mharindu
758c6a5f24 Refactored device info function 2015-05-19 15:42:35 +05:30
mharindu
e4c64afdd3 Refactored device info 2015-05-19 11:22:19 +05:30
manoj
145fe35c7e Remove applist from device status update 2015-05-18 15:04:41 +05:30
manoj
3da5169bbb Install APP service 2015-05-18 02:52:11 +05:30
manoj
22a951c84d Refractor connection handling in mobile dao factory 2015-05-15 02:21:21 +05:30
manoj
10bf596281 Refractor DB connections and resultsets 2015-05-14 20:44:40 +05:30
manoj
d416a38eaf Remove bundle activator 2015-05-14 19:40:56 +05:30
manoj
4516aeecec Refractor Mobile DAO Factory. Remove device source map and config map 2015-05-14 19:11:53 +05:30
manoj
e3f3753e7e Move IOS plugin to ios proprietary repo 2015-05-12 19:33:20 +05:30
manoj
c070c0c599 Change plugin interface DeviceMgt Service 2015-05-11 14:19:38 +05:30
manoj
18d3b0d20d APP Manager integration and move IOS related functionality to IOS plugin 2015-05-11 12:36:19 +05:30
manoj
028241f518 APP Manager integration. Remove IOS related stuff and move to ios plugin 2015-05-11 12:34:36 +05:30
manoj
4a384498f2 Connection close implement for feature dao 2015-05-05 14:04:45 +05:30
Dulitha Wijewantha
0f401090c0 * Changing sql ID to correct name 2015-04-21 14:00:22 +05:30
manoj
eec444201d Refractor DAO Fatcory connections 2015-04-20 18:34:42 +05:30
manoj
df99f5a245 components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java
Refractor DAO factory connection handling
2015-04-20 17:41:30 +05:30
harshanL
4455f284f8 Refactored Android plugin code 2015-04-09 18:24:54 +05:30
harshanL
7c2a25a1c9 Fixed issues in AndroidDeviceDAO implementation 2015-04-08 22:04:13 +05:30
harshanL
d790260789 Fixed AndroidDAO layer to insert DEVICE_MODEL 2015-04-08 10:46:01 +05:30
harshanL
8f631ce92e Fixed AndroidDAO layer to insert DEVICE_MODEL 2015-04-08 10:44:15 +05:30
harshanL
a6a1f1aaf3 Android DeviceDAO layer fixes added 2015-04-07 14:28:07 +05:30
harshanL
f75aa4e1c8 Added Android pluging DAO layer & db scripts 2015-04-07 14:24:01 +05:30
Dilshan Edirisuriya
f693311ed9 iOS device DAO implementation 2015-04-01 17:11:36 +05:30
Dilshan Edirisuriya
8437e30b97 Removing tests which is not applicable after refactoring 2015-03-31 20:24:04 +05:30
Dilshan Edirisuriya
928c6f3384 Implementing IOS feature DAO and device DAO 2015-03-31 20:11:05 +05:30
manoj
46b3a8fd83 Refractor Plugin DAO factories 2015-03-31 19:56:55 +05:30
manoj
c5af46aa5c Refractor Plugin DAO factories 2015-03-31 19:55:36 +05:30