Commit Graph

3623 Commits

Author SHA1 Message Date
ayyoob
e74b4e23c4 removed apim dependency from cdmf 2017-01-24 19:32:59 +05:30
ayyoob
5927064435 apim seperation 2017-01-18 01:48:07 +05:30
ayyoob
4128e2d355 pointed to gateway node 2017-01-17 15:51:30 +05:30
ayyoob
8a883ccd41 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-16 18:29:40 +05:30
ayyoob
2a538ff959 fixed multi tenant login issue 2017-01-16 16:07:36 +05:30
Maninda
8aed7c67a9 Added devicemgt web app configs to secure web app 2017-01-16 15:00:03 +05:30
Maninda
4fbab80782 Added security filters to jaggery.conf 2017-01-16 14:40:33 +05:30
Ayyoob Hamza
810bd1d2ad Merge pull request #547 from Vishanth/release-2.0.x
fixing sql scripts to support multi tenancy
2017-01-16 13:20:23 +05:30
Vishanth
f45528147c fixing sql scripts to support multi tenancy 2017-01-16 13:13:58 +05:30
Rasika Perera
2206e258d1 Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles 2017-01-16 09:37:52 +05:30
Rasika Perera
857df46edf Merge pull request #545 from wso2/release-2.0.7
Release 2.0.7
2017-01-14 17:52:33 +05:30
WSO2 Builder
585b9bde4d [maven-release-plugin] prepare for next development iteration 2017-01-14 01:50:45 +00:00
WSO2 Builder
d206148841 [maven-release-plugin] prepare release v2.0.7 2017-01-14 01:46:41 +00:00
Rasika Perera
b9c1141f79 Added missing utility module import 2017-01-14 07:11:26 +05:30
Rasika Perera
24a7179c4b Merge pull request #544 from geethkokila/release-2.0.x
Adding support for identifying the device type from the url
2017-01-13 22:41:07 +05:30
Rasika Perera
0227d5ccbb Fixing https://wso2.org/jira/browse/IOTS-381 2017-01-13 18:00:36 +05:30
Rasika Perera
4549a34083 changed [fw-ok] with [fw-success] 2017-01-13 17:50:18 +05:30
geethkokila
bf8ab0da11 Adding support for identifying the device type from the url 2017-01-13 16:23:47 +05:30
Rasika Perera
625124da38 Merge pull request #543 from ayyoob/release-2.0.x
Moved the traffic through the gateway and fixed cluster issues
2017-01-13 08:49:57 +05:30
ayyoob
44d09e09ea few changes after testing the gateway 2017-01-13 04:49:17 +05:30
ayyoob
671d931d3e merged with origin after resolving conflicts 2017-01-12 23:24:35 +05:30
ayyoob
5b3a8091ec fixed Null pointer exception 2017-01-12 23:18:54 +05:30
Rasika Perera
864020f20e Adding ability to add deviceType level scopes 2017-01-12 22:42:44 +05:30
Rasika Perera
f57de670ea Adding devices:update into /devices scopes list 2017-01-12 22:42:44 +05:30
Rasika Perera
e11d2244f5 Fixing scope annotation /enrollment-invite 2017-01-12 22:42:44 +05:30
Rasika Perera
63cb0e1fde Adding swagger annotations and scope for /effective-policy 2017-01-12 22:42:44 +05:30
Rasika Perera
3cc176c121 Fixing permission for certificates:verify 2017-01-12 22:42:43 +05:30
Rasika Perera
09aae93fc1 Adding perm:admin:certificates:verify scope 2017-01-12 22:42:43 +05:30
Rasika Perera
e2ecd3c12b Merge pull request #542 from milanperera/release-2.0.x
Changed logs to warn
2017-01-12 20:52:37 +05:30
Milan Perera
6abf65695d Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 20:27:15 +05:30
Milan Perera
d9ea6af775 Changed logs to warn 2017-01-12 20:26:46 +05:30
ayyoob
d4ec0705e7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 19:09:12 +05:30
ayyoob
cdd144237f removed unused parameter 2017-01-12 19:09:01 +05:30
Ayyoob Hamza
91f8ac1341 Merge pull request #541 from milanperera/release-2.0.x
Fixed NPE occurred due to scope mapping
2017-01-12 19:08:14 +05:30
Milan Perera
311fe7810f Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 19:02:30 +05:30
Milan Perera
21c50c9a55 Fixed NPE occurred due to scope mapping 2017-01-12 19:01:57 +05:30
ayyoob
2fbaf31b93 fixed permission and assigned environment variables for url context 2017-01-12 18:13:43 +05:30
ayyoob
93ae646c50 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 11:13:49 +05:30
ayyoob
de957bec29 few changes after testing the cluster 2017-01-12 11:12:28 +05:30
Rasika Perera
e05600607a Merge pull request #540 from madawas/release-2.0.x
Refactoring policy view and edit units
2017-01-11 22:39:53 +05:30
Rasika Perera
c7d489cf2c Merge pull request #538 from madawas/IOTS-377
IOTS-377 : Fixing VFA icon not visible issue
2017-01-11 22:33:45 +05:30
Rasika Perera
9bd409e502 Merge pull request #536 from DimalChandrasiri/release-2.0.x
Updating font wso2 to version 1.2.1
2017-01-11 21:26:03 +05:30
Madawa Soysa
a28458cf13 Refactoring policy view and edit units
Refactored the units policy.view and policy.edit to be consistant with policy.create unit. Related to IOTS-296
2017-01-11 18:34:03 +05:30
Rasika Perera
bb7286c2d5 Merge pull request #539 from milanperera/release-2.0.x
Fixed permissions adding issue
2017-01-11 14:45:24 +05:30
Milan Perera
f25e82f4ec Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-11 14:42:08 +05:30
Milan Perera
98ea97d890 Fixed permissions adding issue 2017-01-11 14:41:54 +05:30
Imesh Chandrasiri
957224b905 Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x 2017-01-11 14:40:48 +05:30
Imesh Chandrasiri
d686a9ea57 Updating font wso2 to version 1.2.1 - Commit 2 2017-01-11 14:39:59 +05:30
Madawa Soysa
8a7d0bb3aa IOTS-377 : Fixing VFA icon not visible issue
Fixes IOTS-377
2017-01-11 14:03:12 +05:30
Rasika Perera
83868303dd Merge branch 'release-2.0.x' into release-2.0.x 2017-01-11 13:26:53 +05:30