Commit Graph

497 Commits

Author SHA1 Message Date
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
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