community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,615 Commits 11 Branches 275 Tags 396 MiB
362003c9ab
Commit Graph

497 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
f58abbe0db Added is_active field 2016-06-29 17:41:09 +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
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
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
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
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
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
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
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
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
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
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