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,687 Commits 31 Branches 461 Tags 183 MiB
5c207897ad
Commit Graph

2940 Commits

Author SHA1 Message Date
charitha
d65557e03e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 14:55:41 +05:30
charitha
e6e39532b7 Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements 2017-01-06 14:55:26 +05:30
Rasika Perera
3472090d1b Merge pull request #513 from ruwany/wip 
Fixing device listing issue
 2017-01-06 14:16:47 +05:30
Rasika Perera
8706636b51 Merge pull request #511 from ayyoob/release-2.0.x 
Made Policy Monitoring for device type to be multitenance & Added default values for push notification dynamic configuration
 2017-01-06 14:15:21 +05:30
Ace
6a69d8cf4b merging with upstream 2017-01-06 13:27:33 +05:30
Ace
b83479b214 Fixing device listing issue 2017-01-06 13:20:56 +05:30
inoshperera
e6a70b2394 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 11:35:34 +05:30
inoshperera
11d2ecac10 removing basic auth headers from API definitions. 2017-01-06 11:34:48 +05:30
Milan Perera
637c014866 Refactored scope strings 2017-01-06 10:15:21 +05:30
Milan Perera
157ef998a6 Resolved conflicts and merged 2017-01-06 09:22:49 +05:30
Milan Perera
e0ee2fc1e5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 09:19:12 +05:30
ayyoob
20c3940ca4 made MonitoringTask to get config from device management service 2017-01-05 22:06:11 +05:30
ayyoob
09a148d476 disabled ui and capp deployers 2017-01-05 18:05:58 +05:30
ayyoob
b20a2e0997 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-05 17:51:34 +05:30
ayyoob
c69513e0f5 removed tenant domain from the web.xml 2017-01-05 17:51:23 +05:30
Chatura Dilan
e0627bf748 Merge pull request #509 from rasika/release-2.0.x 
Fixing https://wso2.org/jira/browse/IOTS-362
 2017-01-05 16:49:29 +05:30
GPrathap
5d1435c7bc renamed permission string 2017-01-05 16:47:53 +05:30
Rasika Perera
25a35dcf20 Changing title [WSO2 IoT] into [WSO2 IoT Server] 2017-01-05 16:43:48 +05:30
Rasika Perera
7612f064fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-05 15:19:25 +05:30
Maninda
0a6ef8daf7 Added some security fixes for issues reported by FindBugs 2017-01-05 14:51:13 +05:30
Maninda
00a5a07373 Fixed some security issues found after running FindBugs security scan. 2017-01-05 14:28:30 +05:30
Milan Perera
f3409adc21 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-05 12:41:22 +05:30
Milan Perera
2a4a636eb4 Resolved conflicts and merged 2017-01-05 12:41:08 +05:30
Milan Perera
d13dadff08 Renamed prefix of scopes 2017-01-05 12:35:02 +05:30
GPrathap
0bd7b90e9a added scope annotation 2017-01-05 12:26:07 +05:30
ayyoob
db2ddc7bed policy manager refactored to support tenancy 2017-01-05 12:24:41 +05:30
ayyoob
9995f4293e Default values set for push notification dynamic configuration 2017-01-05 12:24:04 +05:30
Milan Perera
7b8a7c0b52 Merge pull request #1 from GPrathap/release-2.0.x 
removed setting APIs secured as default.
 2017-01-05 11:58:52 +05:30
Maninda
0fb5a577b8 Fixed some issues found in FindBugs security analysis. 2017-01-05 11:47:09 +05:30
ayyoob
f511dc2bce device type deployer for UI and plugin 2017-01-05 11:23:27 +05:30
Rasika Perera
235b41c9df config.json [usernameLength] moved to [userValidationConfig][usernameLength] 2017-01-04 22:28:13 +05:30
Rasika Perera
2a7e62f857 config.json [apimgt-gateway] renamed to [gatewayEnabled] 2017-01-04 22:15:01 +05:30
Rasika Perera
e5062abcc2 Removed unneccesary configs 2017-01-04 20:00:18 +05:30
inoshperera
148c8046fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-04 16:57:12 +05:30
inoshperera
c4a2ba0cea adding http api publisher for Android agent to work out of the box 2017-01-04 16:54:46 +05:30
charitha
f6f99ed06a Fixed following issues: 
https://wso2.org/jira/browse/IOTS-271
 2017-01-04 15:09:36 +05:30
Milan Perera
b860be0150 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-04 10:34:57 +05:30
geethkokila
65cb12b5ac Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2017-01-03 14:13:49 +05:30
charitha
295921b289 Fixed following issues: 
https://wso2.org/jira/browse/IOTS-218
https://wso2.org/jira/browse/IOTS-236
https://wso2.org/jira/browse/IOTS-263
https://wso2.org/jira/browse/IOTS-173
 2017-01-03 11:35:08 +05:30
Milan Perera
02d75b757c Fixed conflicts and merged 2017-01-03 10:37:46 +05:30
GPrathap
f508bcfd0e corrected method name 2017-01-01 22:03:50 +05:30
GPrathap
4c9578ebe2 resized buffer size to 0 for each scope 2017-01-01 21:53:53 +05:30
GPrathap
649879f998 removed setting APIs secured as default. 
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
 2017-01-01 21:13:53 +05:30
WSO2 Builder
6aea6195e9 [maven-release-plugin] prepare for next development iteration 2016-12-23 19:20:14 +00:00
WSO2 Builder
3db5b289ac [maven-release-plugin] prepare release v2.0.5 2016-12-23 19:18:26 +00:00
Rasika Perera
acb2c38799 Fixing user is not authorized to view devices 2016-12-24 00:42:04 +05:30
WSO2 Builder
ed47094964 [maven-release-plugin] prepare for next development iteration 2016-12-23 07:05:25 +00:00
WSO2 Builder
8d409a7248 [maven-release-plugin] prepare release v2.0.4 2016-12-23 07:00:40 +00:00
charitha
1a93868424 Fixed https://wso2.org/jira/browse/IOTS-335 2016-12-23 12:19:57 +05:30
charitha
61d1710614 Fixed https://wso2.org/jira/browse/IOTS-341 2016-12-23 11:12:42 +05:30
Ace
674048ab27 Coorecting version import ranges 2016-12-23 09:57:47 +05:30
Rasika Perera
d001cf2ee1 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-23 08:22:43 +05:30
Rasika Perera
fea128d29e Fixing grid-view cropped on group view 2016-12-23 08:22:12 +05:30
Ace
d6770c261a updating appm dependencies to relased version 2016-12-22 23:04:15 +05:30
Ayyoob Hamza
4960fd0d05 Merge pull request #499 from charithag/release-2.0.x-IOTS-342 
Fixed https://wso2.org/jira/browse/IOTS-342
 2016-12-22 19:56:45 +05:30
charitha
a625ccecf0 Fixed https://wso2.org/jira/browse/IOTS-342 2016-12-22 19:53:12 +05:30
Ruwan
46c3b015fa Merge pull request #498 from charithag/release-2.0.x-email-invites 
Release 2.0.x email invites
 2016-12-22 18:41:22 +05:30
charitha
58a9ea80c7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-22 18:39:26 +05:30
Charitha Goonetilleke
5318601df0 Add license header 2016-12-22 18:37:31 +05:30
charitha
2b1d46f45f Finalized enrollment invitations 2016-12-22 18:30:07 +05:30
Charitha Goonetilleke
af8902f392 Merge pull request #497 from rasika/release-2.0.x 
Removing device-view button
 2016-12-22 16:14:08 +05:30
Rasika Perera
b0d32a140e Adding context for anchor links 2016-12-22 16:12:04 +05:30
Rasika Perera
ad92a5278e Adding on-image anchor links instead of separate btn for device-view 2016-12-22 15:59:10 +05:30
Rasika Perera
6f7d87a590 Merge pull request #496 from madhawap/release-2.0.x 
Task operation config related changes
 2016-12-22 14:01:09 +05:30
madhawap
d486ad14fd Task operation config related changes 2016-12-22 13:47:39 +05:30
Ace
64da9479a1 Bumping identity dependencies 2016-12-22 12:32:24 +05:30
Ruwan
7619eabc87 Merge pull request #495 from rasika/release-2.0.x 
IOTS-325: Fixing cannot delete a policy associated with a group
 2016-12-22 11:01:08 +05:30
Ace
1d2a5dc9ef Updating identity/auth-saml dependencies to latest 2016-12-22 10:58:59 +05:30
Rasika Perera
4cd2b94303 IOTS-325: Fixing cannot delete a policy associated with a group 2016-12-22 10:58:54 +05:30
Geeth
6eb8beaa2a Merge pull request #493 from Supun94/release-2.0.x 
Support for Device Management Policy Merging
 2016-12-22 10:33:21 +05:30
charitha
795ccb740c Add backend support for enrollment invitations 2016-12-20 23:46:55 +05:30
geethkokila
83b9fd46cd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-20 16:59:03 +05:30
Rasika Perera
a633547d19 IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext 2016-12-20 13:03:19 +05:30
geethkokila
1b4857b7fd Fixing conflicts 2016-12-20 11:19:58 +05:30
geethkokila
51c46095a4 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-20 10:44:55 +05:30
Supun94
a831dc6a9a Changing cdm-config file 2016-12-19 16:19:36 +05:30
Supun94
3d6f5ee64d Changing policy compliance view 2016-12-19 16:19:36 +05:30
Supun94
09572a9977 Removed redundant classes 2016-12-19 16:19:36 +05:30
Supun94
89410dfae4 Changing getEffectiveFeatures method 2016-12-19 16:19:36 +05:30
Supun94
d82a70f841 Changing simple policy decision point 2016-12-19 16:19:36 +05:30
Supun94
2751d4b856 Code refactoring 2016-12-19 16:19:36 +05:30
Supun94
eb1575126f Minor refactoring on policy merging 2016-12-19 16:19:36 +05:30
Supun94
451b2fd1dc Minor refactoring on policy evaluation 2016-12-19 16:19:36 +05:30
Supun94
02fb952cc0 Minor refactoring on policy decision point 2016-12-19 16:19:36 +05:30
Supun94
35f3fcc8f9 Changed policy evaluation point 2016-12-19 16:19:36 +05:30
Supun94
62acc2ebf2 Adding merged policy evaluation service component 2016-12-19 16:19:36 +05:30
Supun94
6565e14051 Adding simple policy evaluation decision point 2016-12-19 16:19:36 +05:30
Supun94
936e71a743 Adding configurations for different policy evaluation service components 2016-12-19 16:19:36 +05:30
Supun94
272ba7b012 Changed getEffectiveFeatures method 2016-12-19 16:19:36 +05:30
Supun94
367fa927b0 Changed policy decision point package structure 2016-12-19 16:19:36 +05:30
Supun94
652d776672 Adding effective policy details 2016-12-19 16:19:36 +05:30
Supun94
5a1c73b119 Adding cdmf effective policy unit 2016-12-19 16:19:36 +05:30
Supun94
2847ff2095 Adding cdmf effective policy page 2016-12-19 16:19:36 +05:30
Supun94
33b79dcbba Adding effective policy service 2016-12-19 16:19:36 +05:30
Supun94
c91da9219d fixed policy conflicts 2016-12-19 16:19:36 +05:30
Supun94
cc5d9012c1 Created simple evaluation point 2016-12-19 16:19:36 +05:30
Supun94
21bc812281 Minor refactoring on Policy Eval service comp 2016-12-19 16:19:36 +05:30
charitha
7acbc5cd0b Moved qr modal to device mgt core 2016-12-19 15:25:06 +05:30
geethkokila
8ca28fa1fd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-19 13:47:27 +05:30
Charitha Goonetilleke
f4b3313ad7 Merge pull request #491 from DimalChandrasiri/release-2.0.x 
UI update on email invites
 2016-12-19 13:42:43 +05:30
Charitha Goonetilleke
8216ea3a79 Merge pull request #488 from madawas/IOTS-296 
Fixing generic policy saving issues
 2016-12-19 13:41:39 +05:30
Rasika Perera
1465c56822 Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4" 
This reverts commit f9b6939cb7.
 2016-12-19 12:39:56 +05:30
Ace
47d8baccf7 upgrading to latest version of identity 2016-12-19 11:38:03 +05:30
Imesh Chandrasiri
765f97f5a0 email invite sender changes 2016-12-19 11:27:01 +05:30
Imesh Chandrasiri
e696b5bd0c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-19 11:02:57 +05:30
geethkokila
8e2432c47b Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-19 10:04:18 +05:30
geethkokila
200740eca6 Partial commit for the git update 2016-12-19 09:58:19 +05:30
WSO2 Builder
f9b6939cb7 [WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4 2016-12-19 09:06:04 +05:30
Rasika Perera
42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4" 
This reverts commit 78b9052c37.
 2016-12-19 08:45:19 +05:30
Harshan Liyanage
a2a03a523e Refactored RoleMgtServiceImpl. 2016-12-16 19:46:14 +05:30
Harshan Liyanage
de2f85de2e IOTS-337:Fixed permission remove issue when updating role permissions. 2016-12-16 19:30:41 +05:30
WSO2 Builder
78b9052c37 [WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4 2016-12-16 17:03:06 +05:30
Imesh Chandrasiri
f70be13bf2 Common unit for email invite modal for devices screens 2016-12-16 14:53:51 +05:30
Megala
d4e9c43ff1 Fixing race condition in creating and subscribing application in api-manager side 2016-12-16 14:13:40 +05:30
Madawa Soysa
5b1a68280c Moving codemirror to a lib unit 
This commit moves the codemirror library and modes to a lib unit and reuse the unit when necessary.
 2016-12-16 10:17:59 +05:30
Madawa Soysa
0f291d5d04 Fixing generic policy saving issues 
This commit changes the generic policy mode to application/json and add generic policy add/edit/view units.
 2016-12-15 11:29:14 +05:30
geethkokila
2b7d5fd66b Fixing the null pointer issue in policy manager 2016-12-15 10:57:48 +05:30
Vishanth
1714328db0 datasource access for multi tenancy 2016-12-15 10:32:26 +05:30
amalhub
7e90fde461 IOTS-292: Adding new filter configs 2016-12-14 15:23:59 +05:30
amalhub
0bd298e6d7 IOTS-292: Code refactoring 2016-12-14 15:23:48 +05:30
amalhub
871970002a IOTS-292: Adding android cert verification for gateway handler 2016-12-14 15:23:36 +05:30
amalhub
610163d705 IOTS-292: Adding IOS synapse config for gatway change 2016-12-14 15:23:24 +05:30
amalhub
d00817268e IOTS-292: Adding the api-mgt handler for gateway change 2016-12-14 15:23:04 +05:30
amalhub
fe2b6b5993 IOTS-292: Adding verification services needed for gataway handler 2016-12-14 15:20:26 +05:30
Milan Perera
bcbf61a886 Fixed conflicts 2016-12-14 08:50:17 +05:30
Milan Perera
36ee55f493 Implemented permission-scope mapping for IoTs 2016-12-14 08:45:42 +05:30
Rasika Perera
9f615916d0 Fixing analyticsEnabled and groupingEnabled not working 2016-12-11 14:56:31 +05:30
Rasika Perera
1bee155d9a Fixing formatting issue 2016-12-09 19:06:00 +05:30
Rasika Perera
91437ff81c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-09 18:39:39 +05:30
Rasika Perera
c284732192 Displaying SSO auth failure messages 2016-12-09 18:22:09 +05:30
Rasika Perera
9fd6145605 Fixing SSO issue 2016-12-09 17:34:56 +05:30
Milan Perera
dd353e1bfb Commiting permission-scope mapping improvements 2016-12-08 20:30:49 +05:30
WSO2 Builder
a59edee410 [maven-release-plugin] prepare for next development iteration 2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b [maven-release-plugin] prepare release v2.0.3 2016-12-08 14:37:11 +00:00
charitha
d8881244fd Fix issue in task operation 2016-12-08 20:03:54 +05:30
charitha
0a7f8ac22c Update error pages and CsrfGuard property file. 2016-12-08 19:41:43 +05:30
charitha
78dfddbbed Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x 2016-12-08 18:58:47 +05:30
madhawap
fa171ef079 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-08 17:38:24 +05:30
madhawap
d62a9c8b83 resolving conflicts 2016-12-08 17:38:12 +05:30
Madawa Soysa
ea1371a008 Fixing generic policy payload 2016-12-08 17:31:50 +05:30
madhawap
b889f6e384 adding separate tasks for each device type 2016-12-08 17:21:07 +05:30
charitha
0b3183e3be Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x 2016-12-08 17:19:27 +05:30
charitha
312098b1de Fix issues in generic policy editor 2016-12-08 17:19:12 +05:30
Hasunie
9a1c12d730 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-08 15:59:30 +05:30
Hasunie
60d1281949 fixing windows device name issue 2016-12-08 15:58:32 +05:30
geethkokila
b9d104e9b2 Fixing the certificate mgt issue 2016-12-08 14:38:42 +05:30
geethkokila
87b2fb3603 Fixing the login issue 2016-12-08 14:28:33 +05:30
geethkokila
9def8aa609 Fixing the login issue 2016-12-08 14:08:46 +05:30
geethkokila
a0615d3d63 Merge branch 'release-2.0.x' into merge-master 2016-12-08 12:36:53 +05:30
geethkokila
d911281ad1 Merging master branch with release-2.0.x 2016-12-08 12:34:50 +05:30
Madawa Soysa
630a1105a9 IOTS-296: Refactoring generic policy unit code 
This code is refactored to use the device type specific operation mod functions (payload generation etc.)  in the device type plugins.
 2016-12-08 10:29:12 +05:30
Ruwan
a0c842c6c6 Merge pull request #473 from charithag/release-2.0.x 
Update the way we are checking existence of policy operations.
 2016-12-07 14:52:47 +05:30
Rasika Perera
6edbb8330f Merge pull request #472 from rasika/release-2.0.x 
Fixing enrollment broken issue
 2016-12-07 14:45:13 +05:30
charitha
4b5c69d2d7 Update the way we are checking existence of policy operations. 2016-12-07 14:40:56 +05:30
Rasika Perera
641cc58bbf Fixing enrollment broken issue 2016-12-07 14:37:10 +05:30
Imesh Chandrasiri
da2fd787c4 Fix for datatable icon not showing issue 2016-12-07 12:50:23 +05:30
Ruwan
f2f304ccc4 Merge pull request #470 from rasika/release-2.0.x 
Fixing device identifier is null and Throwing exception when device not found
 2016-12-07 12:15:17 +05:30
Rasika Perera
4e0730f50c Fixing device identifier is null issue 2016-12-07 12:06:22 +05:30
Rasika Perera
289987db8e Throwing exception on getDevice when device is not found 2016-12-07 12:05:48 +05:30
Hasunie
40d8488466 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-07 09:08:10 +05:30
Ruwan
4bda6d89cb Merge pull request #469 from menakaj/release-2.0.x 
Android sense stabilization
 2016-12-07 08:55:22 +05:30
Hasunie
b9e0b099a1 fixing device update issue 2016-12-07 08:37:00 +05:30
charitha
7368b2cf64 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-06 19:09:24 +05:30
charitha
8348002f66 Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x 2016-12-06 19:07:21 +05:30
Charitha Goonetilleke
e137644677 Merge pull request #467 from madawas/IOTS-296 
IOTS-296: Genaralizing policy view UI
 2016-12-06 19:06:19 +05:30
charitha
161fe62a08 Fix for https://wso2.org/jira/browse/IOTS-323 2016-12-06 18:59:43 +05:30
Ace
34225bd9da fixing operations loading spinner and other ui issues 2016-12-06 17:13:56 +05:30
Menaka Jayawardena
84a0b398fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-06 14:44:05 +05:30
Menaka Jayawardena
ca2a79a001 Added entries for portal app in config files. 2016-12-06 14:43:05 +05:30
Ace
872bd88c6e Merging with upstream 2016-12-06 13:34:48 +05:30
Ace
8cc0ba56c1 Adding changes to descriptor 2016-12-06 13:29:59 +05:30
Madawa Soysa
de95c99ea7 IOTS-296: Genaralizing policy view UI 
This commit inclued the generic policy view UI unit
 2016-12-06 12:17:46 +05:30
Hasunie
631ea6e80f Merge pull request #465 from harshanL/release-2.0.x 
Added security filters to devicemgt jaggery app
 2016-12-06 12:12:14 +05:30
Harshan Liyanage
24c0966dce Merge pull request #462 from madawas/IOTS-322 
IOTS-322: Infroming users when device types are not installed
 2016-12-06 12:06:21 +05:30
Harshan Liyanage
b4eb86e985 Added security filters to devicemgt jaggery app 2016-12-06 11:54:31 +05:30
Rasika Perera
e8d8373d46 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-06 11:36:18 +05:30
Rasika Perera
4c1fb558d3 Fixing sso infinite redirection 2016-12-06 10:50:46 +05:30
Madawa Soysa
1d1f399477 IOTS-322: Infroming users when device types are not installed 
Currently policy platfom selection page is empty if no device types are installed. This will add an meaningful message to user if no device types are added.

This commit resolves IOTS-322
 2016-12-05 16:59:25 +05:30
Imesh Chandrasiri
f8d03e992e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-05 14:35:59 +05:30
Imesh Chandrasiri
09fa48c4c2 Removed fade-edge class from template markups for better listing readability 2016-12-05 14:35:36 +05:30
Charitha Goonetilleke
22990087a0 Merge pull request #459 from GPrathap/release-2.0.x 
removed hardcoded validity period while creating application in APIM
 2016-12-05 12:50:33 +05:30
charitha
78d0172d5d Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x 2016-12-05 12:35:58 +05:30
charitha
ee5459dc79 Fix for https://wso2.org/jira/browse/IOTS-321 2016-12-05 12:35:33 +05:30
Rasika Perera
2cfff85ee2 Merge pull request #458 from ruwany/release-2.0.x 
Adding content-type to descriptor
 2016-12-05 10:51:22 +05:30
Ace
7eaee141e0 Adding content-type to descriptor 2016-12-05 10:34:11 +05:30
GPrathap
7807ed77da removed hardcoded validity period while creating application in APIM 2016-12-05 09:50:10 +05:30
GPrathap
6e69fc8e84 changed application creation endpoint 2016-12-05 09:48:26 +05:30
Madawa Soysa
5c356914e8 IOTS-296: Commenting and refactoring 2016-12-02 16:52:05 +05:30
WSO2 Builder
228b24ca79 [maven-release-plugin] prepare for next development iteration 2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55 [maven-release-plugin] prepare release v2.0.2 2016-12-01 12:10:10 +00:00
charitha
a8fff3736a Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 17:12:24 +05:30
charitha
1c8e4b8de7 Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
 2016-12-01 17:12:10 +05:30
Charitha Goonetilleke
67a73189e1 Merge pull request #456 from rasika/IoTS-1.0.0 
Fixing iOS UI issues
 2016-12-01 17:03:21 +05:30
Rasika Perera
bec0f58e38 Adding semi-colon on context variable on service invoker Js 2016-12-01 16:50:06 +05:30
Rasika Perera
884bbe66b5 Adding iOS enrollment path into config.json 2016-12-01 16:50:06 +05:30
Rasika Perera
098ae372f7 Adding new css class for device type view image 2016-12-01 16:50:06 +05:30
charitha
3b97b3296e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 16:47:05 +05:30
Megala
ed325ee576 Adding dashboard feature 2016-12-01 16:41:35 +05:30
Chatura Dilan
82d865b104 Merge pull request #453 from madhawap/release-2.0.x 
Seperate out task operations
 2016-12-01 16:39:29 +05:30
geethkokila
fbfbed7060 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 16:36:23 +05:30