Commit Graph

2924 Commits

Author SHA1 Message Date
Ace
154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
2016-09-22 19:08:21 +05:30
harshanl
17127c3846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 16:54:56 +05:30
Rasika Perera
98ab29fe94 Fixing virtual firealarm device agent download 2016-09-22 15:53:16 +05:30
Rasika Perera
eb5a36ef42 Supporting stream download on service invoker 2016-09-22 15:52:52 +05:30
dilanua
1d9abd0330 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 15:11:33 +05:30
Rasika Perera
728307defd Adding bundle import 2016-09-22 14:57:00 +05:30
Rasika Perera
4691bedbc5 Fixes to devices listing 2016-09-22 14:35:17 +05:30
Rasika Perera
c6c555abc6 Fixing null pointer issue on mqtt notification strategy implementation 2016-09-22 14:34:25 +05:30
Rasika Perera
1d3f5f39a7 Adding custom headers support to invoker util 2016-09-22 14:33:53 +05:30
Imesh Chandrasiri
f8b08849cd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-22 14:14:20 +05:30
Imesh Chandrasiri
3d5b6cd89f Removing unwanted url params from datatable serverside search 2016-09-22 14:14:07 +05:30
harshanl
12713f3301 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 10:45:47 +05:30
Rasika Perera
e71d3947cb Adding intuitive error when specified notification provider is not found 2016-09-22 08:57:34 +05:30
Rasika Perera
513015c1b5 Changing context path /emm into /devicemgt on cdmf base app 2016-09-22 08:56:41 +05:30
Rasika Perera
0fb87f3aa2 Fixing device types not shown issue 2016-09-22 08:56:12 +05:30
Rasika Perera
9148c3baea Fixing dashboard styling issues 2016-09-22 08:55:29 +05:30
Ace
f4d6eb6898 Upgrading jscep and other fixes 2016-09-22 08:24:58 +05:30
harshanl
108ea98677 Refactor policy mgt components and fixed add operations for invalid devices from task service 2016-09-21 19:44:46 +05:30
dilanua
e79eeb6d0f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-21 15:06:15 +05:30
dilanua
87f4939ba5 Updating MSSQL script with dasboard analytics views 2016-09-21 15:05:45 +05:30
Ace
9548bdc263 Fixing dependency related issues 2016-09-21 12:56:40 +05:30
harshanl
c967fc34d0 Fixed EMM-1513 2016-09-20 18:43:50 +05:30
Ace
5f90587564 Synching with master 2016-09-20 18:13:53 +05:30
Chatura Dilan Perera
7395c76408 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-09-20 17:45:24 +05:30
Ace
33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
2016-09-20 17:02:28 +05:30
dilanua
81c684be50 Refactoring user-menu - UI 2016-09-20 16:27:07 +05:30
dilanua
d8e057abdd Fix for JIRA: https://wso2.org/jira/browse/EMM-1582 2016-09-20 15:28:45 +05:30
dilanua
6fea974c90 Refactoring notifications side-pane - UI 2016-09-20 14:21:17 +05:30
dilanua
ce1a063688 Refactoring notifications side-pane - UI 2016-09-20 12:49:41 +05:30
dilanua
9a095fa670 Refactoring change password modal - UI 2016-09-20 12:14:45 +05:30
Ace
87ad1e0e71 Fixing intermittent jackson bind issue 2016-09-20 12:07:14 +05:30
dilanua
b16f0fd592 Refactoring change password modal - UI 2016-09-20 11:27:04 +05:30
Ace
099ffd6a74 Updating velocity dependencies to OSGI enabled bundle version 2016-09-20 10:38:39 +05:30
Chatura Dilan Perera
50d8885f8b [maven-release-plugin] prepare for next development iteration 2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4 [maven-release-plugin] prepare release v1.2.1 2016-09-19 18:54:38 +05:30
harshanl
75df243a33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-19 12:22:08 +05:30
Ace
6a8a5cbd5a Merging with master 2016-09-19 12:21:41 +05:30
harshanl
4169d3b2bd Fixed EMM-1554 2016-09-19 12:08:06 +05:30
dilanua
b4e4b114a5 Updating dashboard title 2016-09-18 17:01:36 +05:30
dilanua
e8571b7b65 Updating operation-mod with windows operation apis 2016-09-18 16:06:32 +05:30
dilanua
408e10a890 Changing admin dashboard name to 'Navigating Dashboard' - UI 2016-09-18 08:39:41 +05:30
dilanua
713c8ac4d8 Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:14 +05:30
dilanua
cd66f64945 Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI 2016-09-17 20:05:34 +05:30
dilanua
37131afb4a Adding radio:checked and input[type=hidden] support to operation mod - UI 2016-09-17 19:57:02 +05:30
dilanua
e4dae67fea Changing permissions - /devices/any to /devices/any-device 2016-09-17 17:36:06 +05:30
dilanua
58f8656e94 Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:22:47 +05:30
Rasika Perera
d9b25eda08 Adding deviceName into notifications 2016-09-16 09:39:21 +05:30
Dilan U. Ariyaratne
1651ade4a7 Merge pull request #357 from thusithak/master
Theme migration - 2.2.0 alpha defect fixes
2016-09-15 16:49:41 +05:30
Dilan U. Ariyaratne
df7c54b1af Merge pull request #356 from DimalChandrasiri/theme-migration
Model Fixes
2016-09-15 16:49:14 +05:30
thusithakalugamage
2f5d90cb6c [EMM-1571] Add policies page wizard styling and layout defects 2016-09-15 13:46:48 +05:30