Commit Graph

2787 Commits

Author SHA1 Message Date
Rasika Perera
d826ba81d0 UI improvement for Datatables 2017-01-06 20:27:24 +05:30
Rasika Perera
b4a649bdfa Merge pull request #516 from milanperera/release-2.0.x
Improved permission-scope mapping capabilities
2017-01-06 19:02:12 +05:30
Rasika Perera
1c1da1f5cd Merge pull request #517 from rasika/release-2.0.x
Fixing CDMF version in footer
2017-01-06 16:57:16 +05:30
Rasika Perera
ab28d596e7 Fixing CDMF version in footer 2017-01-06 16:56:20 +05:30
Milan Perera
d51ee711fc Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 16:46:56 +05:30
Rasika Perera
79e98a592b Merge pull request #515 from rasika/release-2.0.x
Replaced [EMM] with [IoT Server]
2017-01-06 16:46:44 +05:30
Milan Perera
228848075c Fixed conflicts and merged 2017-01-06 16:46:42 +05:30
Rasika Perera
e501724c3c Replaced [EMM] with [IoT Server] 2017-01-06 16:26:59 +05:30
Rasika Perera
7af63522f2 Fixed quick startup guide doc url 2017-01-06 16:14:24 +05:30
Milan Perera
42a587904f Fixed issues in permission-scope mapping 2017-01-06 16:10:52 +05:30
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
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