community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,528 Commits 31 Branches 461 Tags 183 MiB
c2490347b6
Commit Graph

2815 Commits

Author SHA1 Message Date
Rasika Perera
56a81e431c Removed extra license headers 2016-09-26 19:21:46 +05:30
Rasika Perera
6bfe166b5d Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username 2016-09-26 19:17:05 +05:30
Rasika Perera
54c518a4fd Making datatables-extended to get context path from global js variable 2016-09-26 19:13:12 +05:30
Rasika Perera
77720dd61a Fixing devices listing page styling issue. 2016-09-26 18:25:11 +05:30
Rasika Perera
1bef7a38ef Minor style fix for wr-hidden-operations 2016-09-26 18:08:06 +05:30
kamidu
225268bd78 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-26 18:05:36 +05:30
kamidu
0ab9db2afd Fix for EMM-1575 2016-09-26 18:05:29 +05:30
dilanua
378dd4084c FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585 2016-09-26 17:27:57 +05:30
harshanl
1a12838b7c Fixed issue in NotificationDAO due to invalid column name 2016-09-26 17:16:27 +05:30
Rasika Perera
4c4eba93d8 Returning correct representation of the device to template. 2016-09-26 17:15:12 +05:30
Rasika Perera
cef865f53a Parsing deviceType configs with %https.ip% and %http.ip% 2016-09-26 17:13:43 +05:30
Rasika Perera
86a45fec2e Fixes to mqtt notification strategy when message body is null 2016-09-26 14:57:10 +05:30
Rasika Perera
a61be7a7ec Enable group management api 2016-09-26 14:56:34 +05:30
Rasika Perera
b5b4f508b0 Fixing NPE when fetching opeartion 2016-09-26 14:53:04 +05:30
Rasika Perera
f2af4bd078 Fixing undefined exception when device properties not available 2016-09-24 01:35:59 +05:30
harshanl
27a9eeb692 Removed unnecessary DM service 2016-09-23 23:22:58 +05:30
harshanl
f24242fb8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-23 21:17:50 +05:30
harshanl
dd03d0b740 Added device status change upon inactivity mechanism 2016-09-23 21:17:37 +05:30
Ruwan
0c92f80e68 Merge pull request #361 from ruwany/carbon-kernel-4.4.7 
Migrating kernel/apim/appm/identity to latest versions
 2016-09-23 17:04:18 +05:30
Rasika Perera
ccf4b6492c Fixing devices listing issue 2016-09-23 12:45:45 +05:30
Rasika Perera
3e2731a772 Fixing invoker service return nothing on httpClient requests. 2016-09-23 12:45:15 +05:30
dilanua
ebead1249c Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:38:40 +05:30
Ace
6aad76eff1 Synching with master and updating jscep and bcpkix dependencies 2016-09-23 11:24:49 +05:30
dilanua
87a03e8312 Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:15:12 +05:30
dilanua
71424c4bb7 Fix for JIRA: https://wso2.org/jira/browse/EMM-1613 2016-09-22 22:47:18 +05:30
dilanua
e3256417a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 22:16:24 +05:30
dilanua
a4b39f92e5 Fix for JIRA: https://wso2.org/jira/browse/EMM-1593 2016-09-22 22:15:55 +05:30
harshanl
5a6120d6fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 20:31:14 +05:30
harshanl
1b6c7ea502 Refactored PolcyMgt component 2016-09-22 20:30:18 +05:30
dilanua
92aa413773 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 19:53:36 +05:30
dilanua
f7a38b2313 Fix for JIRA: https://wso2.org/jira/browse/EMM-1612 2016-09-22 19:53:18 +05:30
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
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
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
harshanl
5b0e99aeff Fixed EMM-1562 2016-09-15 12:37:35 +05:30
harshanl
78cab76101 Fixed EMM-1531 2016-09-15 12:36:55 +05:30
Imesh Chandrasiri
1599b84e54 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-15 10:19:42 +05:30
Imesh Chandrasiri
e2576b21a8 Adding default button class to modal popups 2016-09-15 10:19:22 +05:30
kamidu
a448959fe0 Fix for EMM-1548 2016-09-15 06:40:05 +05:30
Ace
1dfb8e22e1 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:09 +05:30
kamidu
e2d0f7d040 Fix for EMM-1559 2016-09-14 16:23:21 +05:30
Imesh Chandrasiri
3e5064feed Fix for datatable icon size change on pagination 2016-09-14 15:13:54 +05:30
Imesh Chandrasiri
9573bce48f Fix for datatable icon size change on pagination 2016-09-14 14:35:56 +05:30
Imesh Chandrasiri
317252ebb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-14 10:22:00 +05:30
Rasika Perera
1d7546916c Changes to the policiesCount, rolesCount, usersCount methods 2016-09-14 07:09:05 +05:30
Rasika Perera
0fab418187 Fixing invalid device count and group count 2016-09-13 19:43:43 +05:30
Imesh Chandrasiri
b56fb667b7 Modal fixes 2016-09-13 15:16:50 +05:30
kamidu
d7c7315f16 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-13 12:15:03 +05:30
kamidu
70dd5ded77 Fix for the policy edit internal server issue 2016-09-13 12:14:55 +05:30
Dilan U. Ariyaratne
3cbaecfbbf Merge pull request #355 from DimalChandrasiri/theme-migration 
Data Table CSS Removed from custom.desktop file
 2016-09-13 11:19:30 +05:30
thusithakalugamage
144dd92c47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-12 18:09:57 +05:30
thusithakalugamage
d2a44647dd [EMM-1549] - Heading defect fix 2016-09-12 18:09:33 +05:30
dilanua
00d79c9ece Changing certificates breadcrumb name from certificate to certificates - UI 2016-09-12 17:09:40 +05:30
Imesh Chandrasiri
7a452d09ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-12 15:18:37 +05:30
Imesh Chandrasiri
e3b230937e Remove data table styles 2016-09-12 15:18:21 +05:30
thusithakalugamage
4cb5238112 [EMM-1543] styling defect fix 2016-09-12 14:37:52 +05:30
thusithakalugamage
3b3962b772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-12 14:36:25 +05:30
thusithakalugamage
0273a6e369 responsive tab panel component - markup rewrite for uuf 2016-09-12 14:35:58 +05:30
dilanua
6aa01d2e7a Fixing NPE issue in token-protected-service-invokers - UI 2016-09-12 14:17:44 +05:30
Chatura Dilan Perera
de23a8cf27 [maven-release-plugin] prepare for next development iteration 2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9 [maven-release-plugin] prepare release v1.2.0 2016-09-09 20:18:12 +05:30
Rasika Perera
ae7f4b8373 Adding permission update error message box 2016-09-09 19:27:09 +05:30
Rasika Perera
7edc7f29db Fixing role add permission update issue 2016-09-09 19:27:09 +05:30
harshanl
0eaf33aa5c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 19:16:27 +05:30
harshanl
87a5b09266 Added users/count API 2016-09-09 19:16:00 +05:30
thusithakalugamage
6825a87bb9 button component - active and focus style defect fix 2016-09-09 19:11:02 +05:30
thusithakalugamage
c871fbcdad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:53:17 +05:30
thusithakalugamage
b2cde2228f wizard component - layout defect fixes 2016-09-09 18:44:20 +05:30
thusithakalugamage
0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:42:46 +05:30
Imesh Chandrasiri
b08aeefbbc Modal Changes 2016-09-09 18:42:31 +05:30
kamidu
2ec2600471 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 18:40:12 +05:30
harshanl
671ef77b63 Fixed EMM-1107 issue 2016-09-09 18:25:28 +05:30
Imesh Chandrasiri
8f68a3658e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:23:53 +05:30
Imesh Chandrasiri
f908738659 Modal Changes 2016-09-09 18:23:44 +05:30
Rasika Perera
8e247bda62 Fixing font warning on page load 2016-09-09 17:58:33 +05:30
Rasika Perera
4d0fd67539 Adding missing woff2 fonts 2016-09-09 17:50:30 +05:30
kamidu
0fdcbae817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 17:47:49 +05:30
kamidu
878daae5c5 Permission modifications 2016-09-09 17:47:42 +05:30
Imesh Chandrasiri
47b46c50b0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 17:19:18 +05:30
thusithakalugamage
42c6500a31 adding responsive, date addition and version number update 2016-09-09 17:16:08 +05:30
Chatura Dilan Perera
2d5262e21e [maven-release-plugin] prepare for next development iteration 2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404 [maven-release-plugin] prepare release v1.2.0 2016-09-09 17:10:04 +05:30
thusithakalugamage
ef646800fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 16:05:42 +05:30
thusithakalugamage
dc23e55444 responsive tab panel component - style changes 2016-09-09 16:02:09 +05:30
Imesh Chandrasiri
d182c194ed removing data table css from custom.desktop.css 2016-09-09 15:47:55 +05:30
harshanl
2f1c03ae1f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 15:36:17 +05:30
dilanua
7a0e52e8f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 15:30:54 +05:30
dilanua
6a9225d249 Updating device module for permissions - Ui 2016-09-09 15:30:23 +05:30
harshanl
97cb3cc015 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 15:10:21 +05:30
harshanl
7dc93ff010 MSSQL script fixes and added the /users/count REST API 2016-09-09 15:06:30 +05:30
Imesh Chandrasiri
690bd7de5c modal popup changes 2016-09-09 14:58:31 +05:30
Rasika Perera
940f2aaede Merge pull request #348 from DimalChandrasiri/theme-migration 
Theme migration
 2016-09-09 12:29:41 +05:30
harshanl
d60daae97f MSSQL fixes to dbscrpits and DAO layer 2016-09-09 12:15:51 +05:30
Imesh Chandrasiri
613d0ff7be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 11:39:29 +05:30
Imesh Chandrasiri
f42215a926 Adding modal code changes 2016-09-09 11:37:41 +05:30
kamidu
c2471fc2bb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 11:17:50 +05:30
kamidu
2cd5a0e659 Enable permission check according to the new permissions 2016-09-09 11:13:37 +05:30
Rasika Perera
432c46601b Fixing breadcrumb height issue 2016-09-09 11:12:08 +05:30
Rasika Perera
cfa32cf75c Fixing icons background color issue 2016-09-09 11:10:01 +05:30
dilanua
2d864bf02e Removing unnecessary spacing provided for operation-bar - UI 2016-09-09 10:23:11 +05:30
harshanl
1e00a012a8 Removed unnecessary import statements 2016-09-09 10:07:16 +05:30
harshanl
0ee6110b3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 09:57:48 +05:30
mharindu
ce1f5c5701 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 02:56:41 +05:30
mharindu
115099c8fe Implemented permission based authorization 2016-09-09 02:56:21 +05:30
dilanua
4fe79be5f8 Updating datatables server-side-paging module 2016-09-08 22:44:18 +05:30
dilanua
9e9f3e859a Updating custom-desktop.css to remove unnecessary bottom border of operation-bar 2016-09-08 22:41:11 +05:30
kamidu
f5e1fee561 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-08 18:42:18 +05:30
kamidu
411641bc57 Enable permission check according to the new permissions 2016-09-08 18:41:51 +05:30
charitha
de6f2558c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-08 14:48:38 +05:30
charitha
2fde165b7c Fix SQL error when could happen due to duplicate enrollments. 
(cherry picked from commit c75307f)
 2016-09-08 14:47:21 +05:30
Rasika Perera
5157cb81f8 Merge pull request #345 from thusithak/theme-migration 
Theme migration - responsive small device view defect fixes
 2016-09-08 12:34:07 +05:30
thusithakalugamage
e80daf7709 responsive small device view defect fixes 2016-09-08 12:29:49 +05:30
harshanl
e72d3147f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-08 11:53:08 +05:30
dilanua
d24ba98643 Updating activate and deactivate policy endpoints from PUT to POST 2016-09-07 16:15:26 +05:30
harshanl
b7ffaf0b0f Fixed issues in DAO implementations and MSSQL db script 2016-09-07 15:01:09 +05:30
dilanua
a74862d73b Updating policy module - UI 2016-09-07 14:56:27 +05:30
Rasika Perera
f37c2c6de8 Fixing requesting invalid url for Roboto-Regular web font 2016-09-07 01:39:22 +05:30
Rasika Perera
887322b716 Merge pull request #344 from DimalChandrasiri/theme-migration 
Theme migration
 2016-09-06 19:05:00 +05:30
dilanua
795fbcb366 Updating ios operation endpoints - UI 2016-09-06 12:52:52 +05:30
Imesh Chandrasiri
f898ed838c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-06 11:43:08 +05:30
Imesh Chandrasiri
2786c576ea Merge Conflicts Fixed 2016-09-06 11:42:54 +05:30
harshanl
0479742bc4 Fixed a minor issue in GCM notification provider 2016-09-05 17:43:04 +05:30
mharindu
24930b3042 Partial commit of migration 2016-09-05 16:37:09 +05:30
Imesh Chandrasiri
fe0bdb9ba6 Merge Conflicts Fixed 2016-09-05 14:45:41 +05:30
Imesh Chandrasiri
d1acfe1503 Modal Changes added 2016-09-05 14:44:21 +05:30
harshanl
bdb5b970fd Removed access modifiers from Interface APIs 2016-09-05 11:51:51 +05:30
harshanl
8e6c15acf2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-05 09:49:16 +05:30
dilanua
e881aa6da4 Fixing Role Editing UI 2016-09-02 18:55:00 +05:30
dilanua
c57e9eba3a Updating Roles listing UI to dynamically fetch app-context 2016-09-02 18:08:27 +05:30
dilanua
0427a6dd4b Refactoring Role Create UI - moving units to page 2016-09-02 18:00:40 +05:30
dilanua
934c45cd95 Adding role creation UI 2016-09-02 17:43:43 +05:30
dilanua
746a4d4372 Refactoring roles listing UI - merging srcs in units to page 2016-09-02 10:27:52 +05:30
dilanua
fd6ddf7a52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-01 22:31:21 +05:30
dilanua
677385920e Updating User Listing UI 2016-09-01 22:30:49 +05:30
Rasika Perera
ad5c97e354 Temporary resolving WARN logs for css fonts on the theme. 2016-09-01 22:12:51 +05:30
dilanua
687efa97b1 Updating Role Listing UI 2016-09-01 20:12:47 +05:30
dilanua
eedb66ec45 Updating User Listing UI 2016-09-01 19:08:20 +05:30
dilanua
6f28bf1d94 Updating User Listing UI 2016-09-01 18:51:26 +05:30
dilanua
32fc58c917 Updating User Listing UI 2016-09-01 17:49:16 +05:30
dilanua
54807b99ee Updating role listing UI 2016-09-01 17:00:43 +05:30
Rasika Perera
8148b5b06c Separating CDMF base app and uuf-template app 2016-09-01 16:28:05 +05:30
Imesh Chandrasiri
4a69e162b3 Modal Changes added 2016-09-01 12:09:24 +05:30
Imesh Chandrasiri
1ed6213916 Modal Changes added 2016-09-01 10:51:38 +05:30
harshanl
54112a3f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-01 10:25:37 +05:30
charitha
3575c9a33d Fix issue in get devices with since parameter. 2016-08-31 17:43:13 +05:30
Chatura Dilan Perera
f29b9e84f2 Fixed 200 returns when activities are empty and since is a future date 2016-08-31 13:56:59 +05:30
harshanl
6554368bfa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-31 11:04:44 +05:30
harshanl
551d77bd62 Refactored OperationMgr code 2016-08-30 16:58:25 +05:30
kamidu
cd77ce692e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-30 16:37:34 +05:30
kamidu
abb3aea9a9 fixes for notification isses 2016-08-30 16:36:26 +05:30
harshanl
675843d7f7 Added Valid device list to Activity response 2016-08-30 15:53:07 +05:30
harshanl
a77564ac2d Added status for each device in Activity response 2016-08-30 14:53:56 +05:30
Chatura Dilan Perera
9aa5f2793f return date format as UTC in APIs 2016-08-30 14:17:06 +05:30
Chatura Dilan Perera
475b832c59 Changed return date format to UTC date 2016-08-29 18:50:23 +05:30
Chatura Dilan Perera
83442b0bca Fixed issue in activity retrival 2016-08-29 15:52:54 +05:30
Chatura Dilan Perera
29d6b38d15 Fixed issue in activity getting with response 2016-08-29 15:52:36 +05:30
Chatura Dilan Perera
40cabd0064 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-08-27 01:53:20 +05:30
Chatura Dilan Perera
549a2773f2 Fixed issue releated to activity api since 2016-08-27 01:52:48 +05:30
harshanl
624bf7c7b4 Fixed EMM-1518 2016-08-26 23:07:07 +05:30
harshanl
56f23a83fc changed comments 2016-08-26 20:52:14 +05:30
hasuniea
1ebf4e2c7c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-26 17:42:32 +05:30
hasuniea
d1e058ce8e fixing api-mgt upgrading issues 2016-08-26 17:40:30 +05:30
Imesh Chandrasiri
e02264099b Adding user menu update 2016-08-26 16:05:29 +05:30
thusithakalugamage
00bf595cb2 moving wso2 theme to emm - removing duplicated styles for buttons and links, navbar style update 2016-08-26 15:56:25 +05:30
thusithakalugamage
42a3d5f7e5 moving wso2 theme to emm - modal window content positioning and background fixes 2016-08-26 14:19:24 +05:30
thusithakalugamage
b5fda80377 emm login page layouts updated to wso2 theme markup 2016-08-26 13:39:10 +05:30
thusithakalugamage
b67b34e831 cdmf navbar hamburger menu and menu open state icons correction 2016-08-26 11:52:18 +05:30
thusithakalugamage
6b5d884fd5 vertical tab component bottom margin defect fix 2016-08-26 11:50:29 +05:30
thusithakalugamage
333e05dcc5 Merge branch 'theme-migration' of https://github.com/DimalChandrasiri/carbon-device-mgt into theme-migration 2016-08-26 10:25:14 +05:30
thusithakalugamage
ee856d6b8b moving wso2 theme to emm - link hover defect fix 2016-08-26 07:43:06 +05:30
thusithakalugamage
cd6cf9f6b3 moving wso2 theme to emm - navbar cllapse color fixes 2016-08-26 06:03:22 +05:30
thusithakalugamage
849c2a4f55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-08-25 14:44:51 +05:30
Imesh Chandrasiri
5cdafa04a6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-08-25 14:44:31 +05:30
Imesh Chandrasiri
802d5e5fe9 Markup change to suite the padding 2016-08-25 14:42:26 +05:30
thusithakalugamage
aa23239f40 moving wso2 theme to emm - layout color update 2016-08-25 14:30:09 +05:30
Charitha Goonetilleke
9e0edf84ab Merge pull request #337 from charithag/master 
Fix issue in get devices with since parameter
 2016-08-25 14:12:59 +05:30
harshanl
811d225bc3 Fixed adding operations to invalid devices 2016-08-25 13:58:38 +05:30
charitha
0fe827ca9f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-25 13:10:48 +05:30
charitha
579d91bd79 Fix issue in get devices with since parameter. 2016-08-25 13:10:23 +05:30
Imesh Chandrasiri
4bebb77d5f Merge branch 'theme-migration' of https://github.com/thusithak/carbon-device-mgt into theme-migration 2016-08-25 12:34:12 +05:30
thusithakalugamage
1a2c6ec8eb moving wso2 theme to emm - layout 2016-08-25 12:33:48 +05:30
Imesh Chandrasiri
8a17ec9e48 Changing the login button to new theme 2016-08-25 12:30:56 +05:30
charitha
9246cdcf30 Return empty array when results not found with since parameter 2016-08-25 12:28:55 +05:30
Chatura Dilan Perera
763993263c Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-08-25 11:53:57 +05:30
Chatura Dilan Perera
16e6e12436 Fixed issue in Activity API returning one activity 2016-08-25 11:53:29 +05:30
thusithakalugamage
1f7b618d5a moving wso2 theme to emm - layout 2016-08-25 11:48:53 +05:30
Saad Sahibjan
a72b47f6f7 Fixing incorrect response for remove policy 2016-08-24 19:18:35 +05:30
mharindu
d7e8cc30dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7 2016-08-24 14:56:06 +05:30
harshanl
f3aefcca77 Fixed EMM-1450 2016-08-23 17:57:08 +05:30
hasuniea
e723761344 fixing code conflicts 2016-08-19 16:21:20 +05:30
Chatura Dilan Perera
8b17cbb339 Fix conflicts 2016-08-19 15:00:57 +05:30
hasuniea
b3582f9d47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-19 13:40:21 +05:30
dilanua
7bc927fbd0 Removing obsolete constants from constants.js - UI 2016-08-19 11:52:24 +05:30
dilanua
fbd51e31c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-19 10:50:31 +05:30
dilanua
13e2381293 Updating OAuth Utils - UI 2016-08-19 10:50:12 +05:30
Chatura Dilan Perera
654e1d9938 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667 [maven-release-plugin] prepare release v1.1.2 2016-08-18 22:09:33 +05:30
harshanl
67942d5c1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 19:45:47 +05:30
dilanua
0ba6edf36d Updating utility.js and removing unused config files - UI 2016-08-18 18:41:07 +05:30
dilanua
e32c9c0bdb Updating init.js module - UI 2016-08-18 18:27:24 +05:30
dilanua
f61b929bfd Updating data-tables API - UI 2016-08-18 18:11:31 +05:30
dilanua
78b5cf9fb3 Updating user APIs - UI 2016-08-18 16:27:07 +05:30
dilanua
4eaa3be491 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 16:24:22 +05:30
dilanua
83498b1039 Updating operation APIs 2016-08-18 16:23:57 +05:30
kamidu
8eeabcee2c Fix for Jira issue EMM-1418 2016-08-18 15:21:52 +05:30
hasuniea
1ba598a93e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 15:12:50 +05:30
dilanua
6b4ab635af Fixing jiras: EMM-1472, EMM-1505 2016-08-18 14:30:53 +05:30
charitha
3d19d9ed2e Add MySQLOperationDAOImpl for row locking. 2016-08-18 14:26:53 +05:30
hasuniea
6db619317c fixing app-install issue 2016-08-17 15:29:51 +05:30
harshanl
2cb8f0b313 Fixed EMM-1392 2016-08-16 18:02:30 +05:30
harshanl
d81733a4d6 Removed unused class 2016-08-16 18:01:49 +05:30
kamidu
4506db3647 Fix notification view issue 2016-08-16 14:53:44 +05:30
kamidu
77a8fed7de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-16 10:39:10 +05:30
hasuniea
5c57b664ad fixing getAllActivity H2 issue 2016-08-16 09:57:32 +05:30
Ruwan
6134f94e3c Merge pull request #332 from ayyoob/com 
fixing commit issues
 2016-08-16 08:27:17 +05:30
hasuniea
282f53bf09 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3 2016-08-15 21:00:23 +05:30
hasuniea
c269f35ef2 fixing getAllActivity H2 issue 2016-08-15 21:00:15 +05:30
harshanl
d628699e8b Fixed repeating task operations. 2016-08-15 20:58:04 +05:30
mharindu
af286b8aaf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-15 20:31:00 +05:30
mharindu
7346313d27 Modified scope management service 2016-08-15 20:30:45 +05:30
harshanl
2bf6f562df Fixed repeating task operations. 2016-08-15 20:17:20 +05:30
kamidu
28760d2bee Enable advanced search for devices 2016-08-15 18:05:10 +05:30
dilanua
b37687cb58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-15 17:56:19 +05:30
dilanua
8cb26b3264 Fixing no api resource found issue: changing user credentials 2016-08-15 17:55:46 +05:30
ayyoob
a7c201363c logged exception trace 2016-08-15 15:20:37 +05:30
ayyoob
442c2b86da fixed formatting issues 2016-08-15 15:19:18 +05:30
ayyoob
892d5cee20 avoided lazy inialization 2016-08-15 15:13:39 +05:30
harshanl
a7d7c689e8 Removed unsupported roleName parameter from device API 2016-08-15 13:59:30 +05:30
harshanl
671ba46fae Removed unnecessary properties from EnrollmentInfo object 2016-08-15 13:44:10 +05:30
harshanl
d401741d9b Fixed EMM-1492 2016-08-15 13:43:54 +05:30
Ace
e5a4c0f795 Adding role add/update/delete related changes 2016-08-15 11:37:57 +05:30
ayyoob
e45ba68a90 changing the context of device-types api 2016-08-13 10:54:32 +05:30
ayyoob
3b56668af0 merged with upstream 2016-08-13 10:47:18 +05:30
ayyoob
c04edef151 Added Certificate Configuration 2016-08-13 10:38:09 +05:30
dilanua
fcff1f0854 Fixing user menu reg exp issue 2016-08-12 20:00:46 +05:30
dilanua
106051a0a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 17:57:49 +05:30
dilanua
e07991174d Adding user password change UI 2016-08-12 17:57:28 +05:30
kamidu
83cbd56b03 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 17:41:33 +05:30
kamidu
0be419d6cc Fix ui issues in device view section 2016-08-12 17:41:27 +05:30
dilanua
f71106d011 Fixing issues on Password Reset UI 2016-08-12 15:01:51 +05:30
dilanua
0836b2c99e Fixing user create page QR-generation issues 2016-08-12 14:46:17 +05:30
kamidu
42b6882cc1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 14:32:12 +05:30
dilanua
73b4abc46b Updating user remove UI 2016-08-12 14:24:38 +05:30
dilanua
4acfde1511 Adding user edit UI and fixes 2016-08-12 14:08:46 +05:30
kamidu
3219ac2101 Fixing the notification listing ui 2016-08-12 14:04:16 +05:30
dilanua
312f9d3f26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 13:50:00 +05:30
dilanua
280c5e496d Adding user edit UI and fixes 2016-08-12 13:49:38 +05:30
Ace
d8c6720857 Removing previous query 2016-08-12 13:44:26 +05:30
Ace
74b7af7be7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 13:40:57 +05:30
Ace
aa01c7a52e Adding query improvements to activities retrieval query 2016-08-12 13:40:49 +05:30
madhawap
ecfe94235f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 12:46:27 +05:30
madhawap
c6cc5e8df3 fixes to role updating endpoint 2016-08-12 12:45:58 +05:30
ayyoob
3edc68d204 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com 2016-08-12 12:27:35 +05:30
ayyoob
217f541991 added certificate units 2016-08-12 12:27:14 +05:30
dilanua
b9efedfdbd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 11:27:01 +05:30
dilanua
632202899a Fixing issues in bulk user invitations 2016-08-12 11:25:43 +05:30
harshanl
c448d915d8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 11:09:10 +05:30
ayyoob
058f9e4cfa merged with origin 2016-08-12 10:52:56 +05:30
ayyoob
6f5d6abea3 updated device type label to defaul device type name 2016-08-11 23:41:52 +05:30
kamidu
9fde8c0442 Resolving conflicts 2016-08-11 19:08:12 +05:30
kamidu
120fe530ac Fix the device view related issues 2016-08-11 19:05:03 +05:30
dilanua
d7eed8bc1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-11 18:43:16 +05:30
dilanua
0945c8f547 Adding user create UI 2016-08-11 18:42:53 +05:30
harshanl
e80c2f4050 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-11 17:27:10 +05:30
hasuniea
ed5e954194 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-11 16:06:43 +05:30
hasuniea
349c3bdb63 fixing App Version not updating in portal after being initially set 2016-08-11 15:56:03 +05:30
dilanua
390d929e70 Adding policy priority UI 2016-08-11 15:49:45 +05:30
dilanua
352643a421 Changing deactivate-policy api method to PUT 2016-08-11 15:31:28 +05:30
harshanl
34e97aeeae Removed device search using roleName parameter. 2016-08-11 14:03:09 +05:30
Ace
e1c4305e73 Adding fixes to Activities retrival query 2016-08-11 13:00:14 +05:30
mharindu
f5609cc8ff Adding carbon 4.4.7 migration changes 2016-08-11 12:19:05 +05:30
Ace
71709a800f Adding group by function when retrieving operations 2016-08-11 11:13:04 +05:30
dilanua
4549452634 Updating getAllPolicies UI function with icon key 2016-08-11 11:04:34 +05:30
prabathabey
4c3211b079 Fixing issues in acitivity retrieval 2016-08-10 19:40:51 +05:30
dilanua
6e2249419d Updating policy edit base UI 2016-08-10 18:50:20 +05:30
dilanua
0521f1a9dd Updating policy view Base UI 2016-08-10 18:33:28 +05:30
harshanl
8fa311e119 Removed unnecessary properties from EnrollmentInfo object 2016-08-10 18:25:35 +05:30
prabathabey
90889824e3 Further improving the performance of activity info retrieval 2016-08-10 17:52:22 +05:30
prabathabey
c161d7b659 Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities 2016-08-10 15:01:11 +05:30
prabathabey
213836541f Fixing missing columns returned in the query that returns the list of acitivities 2016-08-10 14:54:31 +05:30
prabathabey
3abe837de3 Improving retrieval of activities 2016-08-10 14:30:13 +05:30
prabathabey
fc5021a0d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-10 14:24:33 +05:30
prabathabey
c7730adbcb Improving the retrieval of activities 2016-08-10 14:24:21 +05:30
harshanl
eb801696bf Fixed EMM-1492 2016-08-10 12:55:58 +05:30
harshanl
f82ce82648 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-10 11:14:53 +05:30
harshanl
08ff70bb3c Refactored CertMgt component 2016-08-10 11:14:46 +05:30
Rasika Perera
c01db9c773 Replaced emm specific unit implementation with old generalized cdmf unit 2016-08-10 08:40:48 +05:30
Rasika Perera
bb526513e8 Removed enrollment url calculation 2016-08-10 08:33:28 +05:30
mharindu
55acb7e7d3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-09 19:08:24 +05:30
mharindu
bd41e4f4fb Implemented scope based authorization in device-mgt UI module 2016-08-09 19:08:07 +05:30
madhawap
d0d101297f changes to removeCertificate endpoint, fix for the jira EMM-1490 2016-08-09 11:27:04 +05:30
madhawap
f12d2a5d69 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-09 11:17:01 +05:30
madhawap
324e7fd4c6 changes to removeCertificate endpoint, fix for the jira EMM-1490 2016-08-09 11:16:37 +05:30
Ace
aa7d3385ce Adding missed role-listing changes 2016-08-09 08:10:51 +05:30
Ace
c693a11d7c Fixing user,device,role listing pages 2016-08-09 07:56:56 +05:30
mharindu
5bdb4630af Fixed conflicts and merged 2016-08-08 19:38:49 +05:30
mharindu
734aaa8c9e Fixed null pointer exception 2016-08-08 19:24:57 +05:30
mharindu
886e2e08f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-08-08 18:49:40 +05:30
hasuniea
48543862c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-08 18:28:49 +05:30
dilanua
952905c60d Adding Policy Edit UI 2016-08-08 18:26:50 +05:30
mharindu
2e79dd290e Modified scopes 2016-08-08 18:24:44 +05:30
hasuniea
1b07b18678 adding security fixes 2016-08-08 18:05:12 +05:30
dilanua
fa0891d9a2 Adding Policy View UI 2016-08-08 14:23:11 +05:30
mharindu
acf6d7ecd7 Fixed conflicts and merged 2016-08-08 10:42:30 +05:30
dilanua
13126fe398 Adding policy create UI 2016-08-07 20:25:23 +05:30
dilanua
87cdfa209e Updating policy management 2016-08-06 17:13:58 +05:30
harshanl
f1c1c67656 Removed unused policy.mgt module from device core bundle 2016-08-05 11:34:11 +05:30
harshanl
657e4864fb Added MSSQL, PostgreSQL and Oracle db support for Notification feature. 2016-08-04 20:40:40 +05:30
harshanl
35ea88b9de Fixed EMM-1476. 2016-08-04 20:39:31 +05:30
mharindu
ed4c762bfd Refactored scopes 2016-08-04 17:46:46 +05:30
ayyoob
a7074e2e4e refactored general configuration 2016-08-03 17:23:16 +05:30
Prabath Abeysekara
cc90bef42b Merge pull request #318 from Securepoint/master 
Minor bug fixies and code improvements
 2016-08-03 14:12:24 +05:30
mharindu
eb5216091e Fixed conflicts and merged 2016-08-03 12:36:56 +05:30
madhawap
5bd879545b fix for the iOS device operations blocker 2016-08-02 19:45:39 +05:30
madhawap
2e71c21378 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-02 19:04:54 +05:30
madhawap
d315e739e4 fix for the iOS device operations blocker 2016-08-02 19:04:28 +05:30
kamidu
23fe8b1fdb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-02 18:51:55 +05:30
kamidu
160d8c2feb Fix the policy create wizard ui issues 2016-08-02 18:51:31 +05:30
dilanua
2ec9f68135 Removing the deprecation of operation.js as it seems to have one dependancy to plugins 2016-08-02 18:47:14 +05:30
Rasika Perera
b8bf855378 Calculating enrollment url when generalConfig.host config exists 2016-08-02 15:48:04 +05:30
inoshperera
2e8df6a16a Merge pull request #322 from charithag/master 
Fix issues in sql statements
 2016-08-02 14:33:30 +05:30
charitha
efcd5272d2 Fix issues in sql statements 2016-08-02 14:31:12 +05:30
harshanl
01e2408ece Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-02 13:48:49 +05:30
mharindu
34f1d9ee38 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-08-02 11:03:29 +05:30
kamidu
9510554f67 Fix the notification view internal server error issue 2016-08-02 00:05:23 +05:30
dilanua
c7f4bba8bf Deprecating operation.js module from UI 2016-08-01 22:45:30 +05:30
dilanua
e125871de0 Adding business-controllers to UI Modules 2016-08-01 22:42:53 +05:30
harshanl
06f72c014e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-01 20:29:51 +05:30
harshanl
6cc1bb088c Fixed EMM-1447, EMM-1424 2016-08-01 20:29:21 +05:30
dilanua
ec7f8ccd1f disabling testing info logs at token-protected-service-invokers.js 2016-08-01 20:28:39 +05:30
dilanua
89cebcdb9e Updating UI oauth module with suppressed warnings for verified, but unresolved variables and functions 2016-08-01 19:28:05 +05:30
dilanua
39b14c9bc5 Adding conf-reader to UI modules 2016-08-01 19:06:04 +05:30
dilanua
bbff93adcc Updating token-handler-utils with suppressed warnings for java packg imports 2016-08-01 18:50:47 +05:30
mharindu
ccdcea0109 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-08-01 12:27:25 +05:30
dilanua
303f16e747 Deprecating obsolete UI functions - device.js 2016-07-31 11:15:40 +05:30
dilanua
bc4192280c Updating OAuth UI Module 2016-07-30 20:38:32 +05:30
dilanua
020f35cb4e Updating OAuth UI Module 2016-07-30 19:47:34 +05:30
dilanua
7017f6e32b Updating OAuth module dependants 2016-07-30 13:52:44 +05:30
dilanua
032b5d129a Adding OAUTH module to UI 2016-07-29 16:48:20 +05:30
dilanua
b86be8375c Refactoring OAuth utilities at UI Layer 2016-07-29 15:41:43 +05:30
dilanua
70074e2f3e Refactoring OAuth utilities at UI Layer 2016-07-29 15:37:27 +05:30
dilanua
76385a1c9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-29 15:15:21 +05:30
dilanua
a4c5aa5951 Refactoring OAuth utilities at UI Layer 2016-07-29 15:15:02 +05:30
Milan Perera
59b862dfc7 Merge pull request #321 from ayyoob/com 
few fixes in JWT Client
 2016-07-29 15:00:52 +05:30
dilanua
f7509f698d Removing obsolete UI modules 2016-07-29 14:51:37 +05:30
dilanua
2efdc30177 Refactoring OAuth utilities at UI Layer 2016-07-29 14:44:16 +05:30
mharindu
84090fb16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-29 12:39:05 +05:30
ayyoob
c71e5ead00 few fixes in JWT Client 2016-07-29 12:05:23 +05:30
ayyoob
b57db836d3 removed error message 2016-07-28 16:16:52 +05:30
Milan Perera
c49dc435e1 Merge pull request #319 from ayyoob/transport 
Updated grant type implementation
 2016-07-28 14:14:03 +05:30
dilanua
4b39a877ad Updating oauth token handlers 2016-07-28 13:49:27 +05:30
ayyoob
d5e756c205 Updated Grant Type Implementation 2016-07-27 14:43:44 +05:30
dilanua
1172e759ca Deprecating serverAdress.js 2016-07-27 06:50:06 +05:30
prabathabey
5ed3174a28 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 23:37:48 +05:30
prabathabey
5adfab9f8a Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API 2016-07-26 23:37:42 +05:30
Ace
07b12fe4ea Bug fixes 2016-07-26 22:03:14 +05:30
Ace
0d94a293a4 Adding notification and fixing QR code 2016-07-26 20:57:38 +05:30
prabathabey
c63818b78f Avoiding multiple device data getting retrieved upon the same id 2016-07-26 19:31:44 +05:30
prabathabey
e27905792f Code cleanup 2016-07-26 19:14:43 +05:30
prabathabey
5bc7cf7c30 Simplifying operation management related implementations 2016-07-26 18:32:00 +05:30
dilanua
8550bcb145 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 17:36:14 +05:30
dilanua
d2ec81b12b Refactoring oauth token handling functions and dependants 2016-07-26 17:35:50 +05:30
Ace
1ed0481ec3 Changing nav-bar base-unit implementation 2016-07-26 16:59:57 +05:30
mharindu
6e742ee6ac Added scope beans 2016-07-26 16:40:04 +05:30
mharindu
564c2b280e Fixed conflicts and merged 2016-07-26 16:38:51 +05:30
Chatura Dilan
046cd6586c Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-07-26 12:00:17 +05:30
Chatura Dilan
7af8ecc686 Added userstore for role listing 2016-07-26 11:59:10 +05:30
dilanua
34edbce1a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 11:35:17 +05:30
dilanua
c228f03481 Refactoring oauth token handling functions and dependants 2016-07-26 11:34:52 +05:30
prabathabey
89634a9c38 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 11:28:43 +05:30
prabathabey
bd1322e801 Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl 2016-07-26 11:28:31 +05:30
dilanua
2e5d046fbf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 11:15:29 +05:30
dilanua
b72d099641 Refactoring oauth token handling functions 2016-07-26 11:14:46 +05:30
hasuniea
70f23b0919 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 10:22:42 +05:30
hasuniea
a02f7a5db1 fixing formatting issue 2016-07-26 10:21:25 +05:30
dilanua
d05c6e2170 Deprecating /api/token.jag (unused) 2016-07-25 22:23:22 +05:30
mharindu
3457bba4a3 Adding Annotation reading fix for device-mgt-extensions 2016-07-25 19:21:08 +05:30
dilanua
87dbb5f9e1 Refactoring ui token handling functions 2016-07-25 15:32:39 +05:30
dilanua
7facff4b58 Updating ui init logic 2016-07-25 15:28:41 +05:30
mharindu
19275634a1 Fixed webapp name resolving issue 2016-07-25 12:04:30 +05:30
dilanua
c57c75945c Deprecating invoker-request-wrapper (unused) 2016-07-25 10:11:39 +05:30
dilanua
00f98f5cce Updating base ui app config reader 2016-07-25 05:50:49 +05:30
dilanua
d04cb54ae8 Refactoring base ui app config reader 2016-07-24 21:34:22 +05:30
dilanua
c12630e65c Refactoring base ui app config reader 2016-07-24 21:20:51 +05:30
dilanua
1916c4df5f Refactoring cdmf product page layout 2016-07-24 20:35:52 +05:30
dilanua
7d9cde3cfb Refactoring Navigation Bar 2016-07-24 12:46:40 +05:30
dilanua
99aca9b90a Updating user-listing 2016-07-23 20:23:21 +05:30
dilanua
bbce1a3d8a Refactoring user-listing front-end logic 2016-07-22 19:07:33 +05:30
dilanua
8f81f2bb01 Refactoring data-tables-invoker-api 2016-07-22 18:23:02 +05:30
dilanua
225b1ddc45 Refactoring device-mgt-props 2016-07-22 17:08:55 +05:30
mharindu
3331604699 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-22 16:42:00 +05:30
mharindu
827567733c Fixed scope update issue in API update 2016-07-22 16:41:40 +05:30
dilanua
7e7549437b Refactoring user module 2016-07-22 15:31:00 +05:30
dilanua
24d846a328 Refactoring user-create page and related modules 2016-07-22 15:25:33 +05:30
dilanua
b636738be3 Fixing issue: user-list not getting updated upon user-removal 2016-07-22 11:54:35 +05:30
madhawap
86fdc85d13 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-22 10:59:34 +05:30
madhawap
d79de070f1 fix to iOS device enrolment 2016-07-22 10:58:50 +05:30
ayyoob
250ce1f77c added device mgt grant types 2016-07-21 20:14:43 +05:30
mharindu
b3d309583d Fixed issues in scope service 2016-07-21 20:13:38 +05:30
dilanua
da6ff6e7fa Refactoring user-listing page 2016-07-21 18:04:51 +05:30
dilanua
177b7cf3df Refactoring data-tables-extended-unit 2016-07-21 17:58:59 +05:30
Ace
c8b37207fc Fixing context issue in service-invoker 2016-07-21 15:03:17 +05:30
mharindu
b8f2457046 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-21 14:32:26 +05:30
dilanua
31b62e6336 Adding jaggery.conf url mapping for data-tables-invoker-api 2016-07-21 12:54:39 +05:30
mharindu
7f1e2fdf0b Implemented scope management service 2016-07-21 12:43:21 +05:30
Ace
b8635db485 Adding changes to common modules to accomodate ui restructuring 2016-07-21 07:42:20 +05:30
mharindu
bdec8880bb Fixed conflicts and merged 2016-07-18 20:22:27 +05:30
mharindu
9932f061fb Fixed webapp name resolving issue 2016-07-18 20:09:16 +05:30
mharindu
186432e1df Fixed webapp name resolving issue 2016-07-18 20:08:51 +05:30
Dulitha Wijewantha
03f323d6e2 Fixed a bug where getBoolean wasn't used 2016-07-18 12:29:58 +05:30
Ace
ca8859c80a Fixing broken build due to new javax.xml imports 2016-07-18 09:09:29 +05:30
Timo Briddigkeit
ed07774552 Fixed literal string comparison. 
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");

A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
 2016-07-15 16:25:31 +02:00
mharindu
80f737822e Fixed enrollment device mapping issue 2016-07-15 19:45:04 +05:30
Prabath Abeysekara
fbb09a7f58 Merge pull request #316 from xenobyte/master 
Fixed predictable pseudorandom number generator
 2016-07-15 13:17:23 +05:30
Timo Briddigkeit
0ac4752b2b Fixed null pointer dereference 2016-07-15 09:47:08 +02:00
Timo Briddigkeit
0ea2c458e7 instanceof will return false for null references, the null check is not needed. 2016-07-15 09:39:50 +02:00
Timo Briddigkeit
90910518d6 Fixed null pointer dereferences 2016-07-15 09:26:27 +02:00
Ace
15ae91d1c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-15 11:59:42 +05:30
Ace
ca10ad53bb Adding emm apis as common modules 2016-07-15 11:59:15 +05:30
prabathabey
40b43a8b97 DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it 2016-07-14 01:24:00 +05:30
Timo Briddigkeit
b674304087 Made constants real constant using final 2016-07-13 15:57:12 +02:00
Timo Briddigkeit
ee5b077e6a Fixed various XML External Entity (XXE) attack vulnerabilities 2016-07-13 15:02:11 +02:00
Timo Briddigkeit
09020ccb9f Fixed predictable pseudorandom number generator 2016-07-13 14:35:55 +02:00
mharindu
99664b23c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-13 11:05:35 +05:30
Dilan U. Ariyaratne
ab5aa3e31c Merge pull request #315 from madhawap/master 
Added missing end-point to the permissions.xml
 2016-07-12 10:28:38 +05:30
madhawap
0b338a1d25 Added missing end-point to the permissions.xml 2016-07-12 10:24:05 +05:30
mharindu
789086a667 Changed context paths 2016-07-12 01:31:35 +05:30
mharindu
0f904e21d8 Fixed conflicts and merged 2016-07-11 22:12:15 +05:30
Chatura Dilan
4ec11e8c08 [maven-release-plugin] prepare for next development iteration 2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543 [maven-release-plugin] prepare release v1.1.1 2016-07-08 19:09:55 +05:30
mharindu
79a6da82f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-08 18:39:10 +05:30
mharindu
c7eef634ac Added send-invitation endpoint 2016-07-08 18:38:00 +05:30
dilanua
c61ef1c98e Fixing issues of GET /compliance-data API 2016-07-08 18:01:10 +05:30
Ace
58666bc4b0 Adding device name url param for device search 2016-07-08 14:57:43 +05:30
madhawap
c3cbc5b4fb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-08 14:29:53 +05:30
madhawap
0b1e4ad86b Updated permissions.xml according to new end-points 2016-07-08 14:29:29 +05:30
Ace
d58fb57f4e Enabling device search for multiple params 2016-07-08 10:09:46 +05:30
madhawap
e52fed0b2d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-07 19:51:57 +05:30
madhawap
34354c032e Added end-point to get devices enrolled under a specific user 2016-07-07 19:46:22 +05:30
prabathabey
68fbfaf346 Merge branch 'certmgt-postgresql' 2016-07-07 14:10:48 +05:30
prabathabey
ce2a801934 Fixing https://wso2.org/jira/browse/EMM-1448 which fixes issues while persisting certificates when PostgreSQL is used as the underlying certificate management repository database 2016-07-07 14:10:03 +05:30
prabathabey
6edfad5fb7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-07 13:10:30 +05:30
prabathabey
9aa54f2ead Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information 2016-07-07 13:10:19 +05:30
Dilan U. Ariyaratne
73551590b9 Merge pull request #313 from madhawap/master 
Added end point to get Compliance Data Of a Device
 2016-07-07 11:16:09 +05:30
madhawap
09e2d2ecaf Removing the internal status code added to the compliance data wrapper 2016-07-07 11:14:43 +05:30
madhawap
68b7d304a0 Added end point to get Compliance Data Of a Device 2016-07-06 18:40:49 +05:30
prabathabey
0125310440 Prepending the url template configured for updating notifications with a '/' 2016-07-05 15:39:50 +05:30
prabathabey
78057b2992 Adding an API to return the list of device types registered in the underlying device management platform 2016-07-05 15:09:11 +05:30
mharindu
d3982c9797 Modified API definitions 2016-07-04 19:26:15 +05:30
mharindu
cc5f677165 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-04 18:01:55 +05:30
mharindu
aa6085ac8c Added scopes to APIs 2016-07-04 18:01:42 +05:30
hasuniea
282ac72249 adding SCEPManagerService to scep manager compenent 2016-07-04 17:58:14 +05:30
hasuniea
bbbbb28795 removing unused packages 2016-07-04 16:51:36 +05:30
hasuniea
911d5b5257 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-04 16:46:23 +05:30
hasuniea
bf58c0bec3 add package changes to appAuthenticatorFrameworkServiceComponent.java 2016-07-04 16:45:36 +05:30
mharindu
ff82accb48 added scopes to notification API 2016-07-04 14:11:51 +05:30
mharindu
60659ce15b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-04 14:09:44 +05:30
mharindu
fe28bc25f1 Refactored scopes 2016-07-04 14:06:30 +05:30
madhawap
c17dda082d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-04 13:38:55 +05:30
madhawap
2136ebbeee changes to 'updateNotificationStatus' swagger annotations 2016-07-04 13:38:32 +05:30
hasuniea
646e8b68d8 remove unwanted package 2016-07-04 12:40:48 +05:30
hasuniea
54498f41cd modifying scep utils 2016-07-04 12:24:28 +05:30
mharindu
ac75ff1d71 Fixed conflict and merged 2016-07-03 15:09:05 +05:30
mharindu
49623a4693 Implemented scope based authorization 2016-07-03 15:03:47 +05:30
Chatura Dilan
2befefc967 Added OS build date 2016-07-01 15:45:59 +05:30
madhawap
b55a164457 added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations 2016-06-30 20:38:04 +05:30
madhawap
dbf938416b added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations 2016-06-30 20:24:01 +05:30
prabathabey
49ce42b797 Code cleanup 2016-06-30 18:19:11 +05:30
prabathabey
be7e63c390 merging rest-api-improvements branch to master 2016-06-30 16:40:15 +05:30
Chatura Dilan
23f5ca2ca5 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-06-30 15:12:01 +05:30
prabathabey
ed5d611c35 Code cleanup 2016-06-29 18:05:09 +05:30
prabathabey
f33ac36bfa Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-29 17:49:48 +05:30
prabathabey
37852051ff Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs 2016-06-29 17:49:34 +05:30
Chatura Dilan
24b462f4f4 Added is-active field to the Application 2016-06-29 17:41:45 +05:30
mharindu
59028f9f09 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-06-28 17:23:47 +05:30
mharindu
5de4993319 Fixed URL tampering issue 2016-06-28 17:23:39 +05:30
Ace
cf887a2e93 Merging emm module changes to devicemgt iot app 2016-06-28 17:00:02 +05:30
Chatura Dilan
f100853031 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-06-28 16:59:14 +05:30
dilanua
d34f29ab46 Fixing device types not retrieving issue 2016-06-28 16:50:53 +05:30
Chatura Dilan
bb6d2f2012 Fixed user search 2016-06-28 16:47:16 +05:30
madhawap
d9b35c29cd swagger annotation fix to policy 'apply-changes' end point 2016-06-28 15:04:04 +05:30
madhawap
88feb5a852 Add Pagination to Notification end points 2016-06-28 13:15:06 +05:30
prabathabey
624e7df688 Improving HTTP status code handling and the resource implementations 2016-06-27 16:28:49 +05:30
prabathabey
a23f44e682 Improving AcitivityManagement API implementation with proper error handling, etc 2016-06-27 15:04:15 +05:30
prabathabey
ad6b95ff62 Code cleanup 2016-06-27 14:45:43 +05:30
prabathabey
a46bd9194b Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-27 14:20:55 +05:30
prabathabey
4236744d39 Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc 2016-06-27 14:20:38 +05:30
Dilan U. Ariyaratne
a278b788d6 Merge pull request #308 from madhawap/rest-api-improvements 
added priorities end-point to PolicyManagement
 2016-06-27 11:45:17 +05:30
madhawap
b50e007897 added /priorities end-point to PolicyManagement 2016-06-27 11:22:42 +05:30
madhawap
9c215c4ac9 added /priorities end-point to PolicyManagement 2016-06-27 10:51:09 +05:30
Ruwan
6ce7f8c65a Merge pull request #307 from ayyoob/transport 
Few changes added after testing with the cluster
 2016-06-27 09:39:17 +05:30
ayyoob
ba6e202442 Few changes added after testing with the cluster 2016-06-27 00:12:46 +05:30
inoshperera
50009c7ac5 adding apply policy end point 2016-06-24 16:13:50 +05:30
inoshperera
16edca2aea fixing ios enrollment issue by fetching the identity certificate from the header. 2016-06-24 13:57:48 +05:30
madhawap
ee11bde8b0 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-24 12:21:53 +05:30
madhawap
235d690f1e Implemented 'offset' and 'limit' parameters to the 'operation' api 2016-06-24 12:19:32 +05:30
prabathabey
0c54753b34 Cleaning up UserManagementService API implementation 2016-06-22 15:31:55 +05:30
prabathabey
f1eca17991 Code cleanup 2016-06-22 14:57:12 +05:30
prabathabey
9a7286a84b Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device' 2016-06-22 14:52:59 +05:30
prabathabey
3813856be8 Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device' 2016-06-22 14:52:19 +05:30
prabathabey
aeb4ad3295 Merging rest-api-improvements branch to master 2016-06-21 15:52:35 +05:30
geethkokila
c07914eb36 Adding the activity count for the activty paginantion 2016-06-21 12:56:57 +05:30
geethkokila
a67f432993 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-20 15:41:59 +05:30
geethkokila
236eb90ce2 Fixing the limit and offset for activity 2016-06-20 15:41:53 +05:30
madhawap
f2ab923df5 fix related to http status code in 'getDevices' endpoint 2016-06-20 12:17:59 +05:30
ayyoob
ebebca8573 Added support for push notification for xmpp, mqtt and few changes to the after testing 2016-06-20 02:33:59 +05:30
ayyoob
0c2de7965f Added device scope validation 2016-06-20 02:33:17 +05:30
madhawap
ea56d4ced3 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-17 17:37:23 +05:30
madhawap
015ca0575e added 'updatedTimeStamp' to the Activity get response 2016-06-17 17:36:50 +05:30
ayyoob
1373e995fb added support to load device type configuration in base ui 2016-06-17 17:21:39 +05:30
dilanua
1513c6cf8a Adding isActive property to PolicyWrapper 2016-06-17 12:05:35 +05:30
madhawap
7cdb7dcee1 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-17 10:14:21 +05:30
dilanua
0eed97e84c Adding API for getting device types 2016-06-15 14:21:31 +05:30
madhawap
b3f95d19c1 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam 2016-06-15 12:05:44 +05:30
inoshperera
96eb71314b Merge pull request #297 from madhawap/rest-api-improvements 
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
 2016-06-14 18:49:01 +05:30
madhawap
d7b860b955 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-14 18:09:16 +05:30
madhawap
59119f9167 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam 2016-06-14 18:08:43 +05:30
ayyoob
7b2c04152f changed the UI calls from tomcat to apimgt gateway 2016-06-14 15:49:34 +05:30
Ace
7b62d2769e Changing response code returned when adding user 2016-06-14 15:28:59 +05:30
madhawap
3d416da6fe add changes to 'since' QueryParam and 'if-modified-since' HeaderParam 2016-06-14 12:03:14 +05:30
geethkokila
626142a59b Fixing the isssue in retrieving the device info 2016-06-14 10:47:07 +05:30
Ace
016414c076 Bug fixes for role search 2016-06-13 15:43:21 +05:30
geethkokila
d6501cbf8c Fixing the device search issues 2016-06-13 10:15:26 +05:30
hasuniea
629a0103d9 renaming scep web app 2016-06-10 09:39:39 +05:30
hasuniea
81aae9716d fixing certmgt issue 2016-06-09 14:16:02 +05:30
hasuniea
ec3d032bc5 fixinf code issues 2016-06-09 10:07:01 +05:30
hasuniea
6471055c3f add refactored stuff 2016-06-09 10:00:35 +05:30
ayyoob
b94eed267c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-06-08 22:41:04 +05:30
ayyoob
52e84273d1 added profile check before publishing apis 2016-06-08 22:38:49 +05:30
Shabirmean
adec5cc303 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-06-08 12:01:32 +05:30
Sahan Kariyawasam
35f43a60e7 Added Dashboard server url property 2016-06-07 19:18:03 +05:30
geethkokila
1fabb0eee3 Fixing the database syncing issue 2016-06-07 12:55:15 +05:30
Shabirmean
a55dc9bce8 Adding necessary imports for the Certificate generation from CSR 2016-06-07 09:29:54 +05:30
Shabirmean
4380f7e242 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-06-06 19:13:56 +05:30
mharindu
de72cc21c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-06-06 15:52:57 +05:30
mharindu
3858920d72 Changed HTTPS Url 2016-06-06 15:52:22 +05:30
ayyoob
bb051deebc added https url for jaggery app deployment server 2016-06-06 13:55:05 +05:30
ayyoob
c5a997b1bf added missing imports 2016-06-06 10:42:31 +05:30
mharindu
a80ca2d696 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-06-06 09:10:07 +05:30
GPrathap
efb71d472a changing sso default state 2016-06-05 23:21:39 +05:30
GPrathap
e23044d59d fixing jira:IOTS-195 2016-06-05 23:15:54 +05:30
mharindu
f7c653b61c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-04 11:33:37 +05:30
mharindu
9eb2f5df86 Fixed foriegn key violation issue when getting pending operations 2016-06-04 11:33:22 +05:30
madhawap
f80603a365 Fixes to if-modified-since in activity provider 2016-06-03 22:19:40 +05:30
Ace
4609888ad1 Fixes to ifmodified-since in activity provider 2016-06-03 21:03:29 +05:30
ayyoob
23ee3e25e7 updated the timestamp 2016-06-03 19:38:24 +05:30
geethkokila
42ce71da2c Fixing the spelling mistake 2016-06-03 18:06:33 +05:30
geethkokila
6aea69ae44 Fixing the duplicate issue 2016-06-03 11:40:00 +05:30
geethkokila
efa74030b4 Fixing response duplicate issue 2016-06-03 10:25:22 +05:30
prabathabey
8819c6e36b Adding support for 'If-Modified-Since' header and 'since' query filter 2016-06-03 04:35:22 +05:30
inoshperera
d71f0c6e6d Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-03 01:46:03 +05:30
inoshperera
037acbe5bb fixing platform configuration appearing twice issue. 2016-06-03 01:43:21 +05:30
prabathabey
3c21583db6 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-02 23:45:04 +05:30
prabathabey
1a29a9f58f Further fixing retrieving application list with device info 2016-06-02 23:44:46 +05:30
geethkokila
ae887d6842 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-02 23:10:18 +05:30
geethkokila
a04300b3b6 Fixing the activity Id issue 2016-06-02 23:09:55 +05:30