Commit Graph

4465 Commits

Author SHA1 Message Date
Sameera Wickramasekara
53dfe5aa0d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-29 09:57:40 +05:30
Sameera Wickramasekara
5c9ad2a3d2 Add second set of tests 2017-09-29 09:57:33 +05:30
WSO2 Builder
0a436c34a1 [WSO2 Release] [Jenkins #2688] [Release 3.0.123] prepare for next development iteration 2017-09-28 22:20:56 +05:30
WSO2 Builder
45cb90e868 [WSO2 Release] [Jenkins #2688] [Release 3.0.123] prepare release v3.0.123 2017-09-28 22:20:41 +05:30
megala21
461361ba2d Refactoring 2017-09-28 21:07:21 +05:30
megala21
ca8f98e131 Merge remote-tracking branch 'upstream/master' 2017-09-28 20:55:39 +05:30
megala21
444bccecfb Refactoring 2017-09-28 20:55:06 +05:30
Pasindu
b5f6212392 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-28 19:28:58 +05:30
Pasindu
1450af6af9 Replace possible constants 2017-09-28 19:20:01 +05:30
WSO2 Builder
e68fb80835 [WSO2 Release] [Jenkins #2686] [Release 3.0.122] prepare for next development iteration 2017-09-28 19:07:59 +05:30
WSO2 Builder
f580d6e371 [WSO2 Release] [Jenkins #2686] [Release 3.0.122] prepare release v3.0.122 2017-09-28 19:07:45 +05:30
sinthuja
32878c3ad7 Merge branch 'wso2-master' into origin-wso2-master
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java
2017-09-28 18:20:26 +05:30
Pasindu
931b4ee05b Removed unwated lines 2017-09-28 18:11:09 +05:30
WSO2 Builder
c5aab7e88d [WSO2 Release] [Jenkins #2684] [Release 3.0.121] prepare for next development iteration 2017-09-28 12:35:40 +00:00
WSO2 Builder
956f8518c8 [WSO2 Release] [Jenkins #2684] [Release 3.0.121] prepare release v3.0.121 2017-09-28 12:35:27 +00:00
Pasindu
4d5cd82f5d Adding unit tests to GeoServiceProviderService 2017-09-28 17:53:20 +05:30
Ace
7447e04a66 Merging with upstream 2017-09-28 17:48:08 +05:30
Ace
bed56a60db Adding Integration tests for core and fixing bugs 2017-09-28 17:41:34 +05:30
Harshan Liyanage
f1f207c5db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-28 17:32:57 +05:30
Harshan Liyanage
08ca9f45c5 Added unit tests to DeviceManagementProviderService class. 2017-09-28 17:32:45 +05:30
sinthuja
be4b15737e Adding the class comments. 2017-09-28 17:32:40 +05:30
sinthuja
09bbb35a24 Cleaning up code. 2017-09-28 17:30:07 +05:30
sinthuja
7832956439 Merge branch 'wso2-master' into origin-wso2-master 2017-09-28 17:22:23 +05:30
sinthuja
b9b3c4ff43 Adding more testcases for non existing device Ids. 2017-09-28 17:20:29 +05:30
sinthuja
f42b760884 Adding more testcases. 2017-09-28 17:16:29 +05:30
GDLMadushanka
61286b667e refactoring test cases 2017-09-28 17:15:45 +05:30
sinthuja
122ae96376 Adding more testcasses. 2017-09-28 16:32:34 +05:30
GDLMadushanka
6b197596c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-28 16:25:45 +05:30
GDLMadushanka
3d32828572 bsic test cases finished 2017-09-28 16:24:37 +05:30
Sameera Wickramasekara
a9fd6b3f1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-28 16:03:09 +05:30
Sameera Wickramasekara
a570f1c965 CertificateManagementService Test cases added 2017-09-28 16:02:56 +05:30
WSO2 Builder
9a16b13719 [WSO2 Release] [Jenkins #2681] [Release 3.0.120] prepare for next development iteration 2017-09-28 15:08:21 +05:30
WSO2 Builder
57a2359e69 [WSO2 Release] [Jenkins #2681] [Release 3.0.120] prepare release v3.0.120 2017-09-28 15:08:08 +05:30
WSO2 Builder
b56b2142d7 Merge commit '36aeef1b8955f9c7bd065a2a3a06848fd7fe4cb4' into d21e4347-196e-44a4-aa5e-1db5df67bba2 2017-09-28 14:48:26 +05:30
WSO2 Builder
36aeef1b89 [WSO2 Release] [Jenkins #2680] [Release 3.0.119] prepare for next development iteration 2017-09-28 14:39:50 +05:30
WSO2 Builder
1d36b677f2 [WSO2 Release] [Jenkins #2680] [Release 3.0.119] prepare release v3.0.119 2017-09-28 14:39:36 +05:30
megala21
80f7d45372 Merge remote-tracking branch 'upstream/master' 2017-09-28 14:37:19 +05:30
Megala Uthayakumar
2b70c4e642 Merge pull request #990 from Nirothipan/master
Adding test cases for NotificationManagementServiceImpl class
2017-09-28 14:23:08 +05:30
Nirothipan
3b475a5305 making required changes 2017-09-28 14:20:46 +05:30
Nirothipan
042cf02788 making required changes 2017-09-28 14:19:11 +05:30
sinthuja
a875915617 Merge branch 'wso2-master' into origin-wso2-master 2017-09-28 14:18:49 +05:30
sinthuja
f055ac1a7a Moving the init methods to BaseDeviceManagementTest 2017-09-28 14:14:50 +05:30
megala21
910f3d30ae Merge remote-tracking branch 'upstream/master' 2017-09-28 14:10:32 +05:30
Geeth
0f4e941586 Merge pull request #994 from madawas/unit-tests
Unit tests for DeviceTaskManagerService
2017-09-28 14:07:02 +05:30
Nirothipan
b6d7c0dc0a correcting minor spelling mistake 2017-09-28 14:05:46 +05:30
Nirothipan
768e39fecf adding more tests for notificationmanagementserviceImpl 2017-09-28 14:00:50 +05:30
Nirothipan
4b0cab79cb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-28 13:50:55 +05:30
Madawa Soysa
c143032710 Unit tests for DeviceTaskManagerService 2017-09-28 13:39:09 +05:30
WSO2 Builder
e103266d80 [WSO2 Release] [Jenkins #2678] [Release 3.0.118] prepare for next development iteration 2017-09-28 13:37:48 +05:30
WSO2 Builder
0ade074013 [WSO2 Release] [Jenkins #2678] [Release 3.0.118] prepare release v3.0.118 2017-09-28 13:37:33 +05:30
Megala Uthayakumar
5351e729ff Merge pull request #992 from sinthuja/origin-wso2-master
Adding more testcases and fixing an intermittent issue in testcase.
2017-09-28 12:57:27 +05:30
Ace
b880e1fe70 Removing intermittently failing test 2017-09-28 12:54:22 +05:30
sinthuja
4dd9f5f662 Merge branch 'wso2-master' into origin-wso2-master 2017-09-28 12:50:07 +05:30
sinthuja
de99b854cc removing unused testcase. 2017-09-28 12:48:05 +05:30
sinthuja
ba03bccd4c Adding more testcases and fixes. 2017-09-28 12:46:03 +05:30
Nirothipan
de428e7651 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-28 12:42:42 +05:30
Ace
367a285d62 Resolving conflicts 2017-09-28 12:38:43 +05:30
Ace
e472810955 Adding unit test coverage for devicemgt-core DeviceManagement module 2017-09-28 12:29:41 +05:30
megala21
ef39440124 Merge remote-tracking branch 'upstream/master' 2017-09-28 12:25:57 +05:30
megala21
e63012955c Adding test cases for plugin manager 2017-09-28 12:25:49 +05:30
sinthuja
8278264733 Adding more operation management testcases. 2017-09-28 12:11:07 +05:30
Nirothipan
b33289a81b adding test cases for NotificationManagementServiceImpl 2017-09-28 11:51:13 +05:30
Nirothipan
250a5f81c4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-28 11:09:58 +05:30
Nirothipan
80a706117a making required changes 2017-09-28 11:08:05 +05:30
Nirothipan
35c5a06520 making required changes 2017-09-28 11:06:46 +05:30
sinthuja
560fc06683 Merge pull request #988 from Megala21/master
Adding test cases for device management extensions
2017-09-28 10:30:38 +05:30
megala21
8c4f55b7ec Merge remote-tracking branch 'upstream/master' 2017-09-28 10:06:24 +05:30
megala21
03fa53fdef Reverting the removed file 2017-09-27 21:09:35 +05:30
megala21
eff3efb72c Refactoring 2017-09-27 20:51:19 +05:30
Nirothipan
473986965c adding second set of test cases for notificationManagementServiceImpl class 2017-09-27 20:38:29 +05:30
WSO2 Builder
8b09a67ac4 [WSO2 Release] [Jenkins #2672] [Release 3.0.117] prepare for next development iteration 2017-09-27 17:30:46 +05:30
WSO2 Builder
f741b6e80c [WSO2 Release] [Jenkins #2672] [Release 3.0.117] prepare release v3.0.117 2017-09-27 17:30:29 +05:30
GDLMadushanka
cd3bb2a5aa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-27 17:15:20 +05:30
GDLMadushanka
83a9ed533e Test cases for DeviceAccessAuthorizationService 2017-09-27 17:14:37 +05:30
megala21
6637c63c6b Merge remote-tracking branch 'upstream/master' 2017-09-27 17:12:04 +05:30
megala21
55eb6f5328 Adding test cases for DeviceTypeGeneratorService 2017-09-27 17:11:45 +05:30
WSO2 Builder
6dfd40d342 Merge commit 'b79f13ab954d8dccc01de69f2b8a8ad29bbc3514' into 9f3b77ec-1728-4417-a88b-74541c1d3cae 2017-09-27 17:08:06 +05:30
sinthuja
b4984c4414 Merge branch 'wso2-master' into origin-wso2-master 2017-09-27 17:07:51 +05:30
Megala Uthayakumar
f94c7f1916 Merge pull request #987 from sinthuja/origin-wso2-master
Adding more unit testcases for operation management.
2017-09-27 17:06:34 +05:30
sinthuja
161d69850f Adding more testcases on operation management. 2017-09-27 17:02:37 +05:30
WSO2 Builder
b79f13ab95 [WSO2 Release] [Jenkins #2671] [Release 3.0.116] prepare for next development iteration 2017-09-27 16:56:16 +05:30
WSO2 Builder
a907c0a48a [WSO2 Release] [Jenkins #2671] [Release 3.0.116] prepare release v3.0.116 2017-09-27 16:56:00 +05:30
sinthuja
ce23e30403 Removing unused import. 2017-09-27 16:50:57 +05:30
sinthuja
888d49dac1 Fixing code formatting. 2017-09-27 16:50:24 +05:30
sinthuja
e57fe2bf37 Adding more testcases. 2017-09-27 16:47:52 +05:30
megala21
2dabd4cfe0 Merge remote-tracking branch 'upstream/master' 2017-09-27 16:28:10 +05:30
megala21
13f6bc602d Adding a common test class to run the beforesuite methods 2017-09-27 16:27:42 +05:30
WSO2 Builder
e43764dce7 [WSO2 Release] [Jenkins #2670] [Release 3.0.115] prepare for next development iteration 2017-09-27 16:18:33 +05:30
WSO2 Builder
1df0b1a8d3 [WSO2 Release] [Jenkins #2670] [Release 3.0.115] prepare release v3.0.115 2017-09-27 16:18:18 +05:30
Geeth
d29e6b65c8 Merge pull request #986 from charithag/master
Add additional test cases for grouping
2017-09-27 15:51:37 +05:30
Nirothipan
046fad6bdb making required changes 2017-09-27 15:49:11 +05:30
charitha
8a6c208b01 Add additional test cases for grouping 2017-09-27 15:46:07 +05:30
Nirothipan
a6eb95e2e8 NotificationManagemet testcase 2017-09-27 15:37:57 +05:30
sinthuja
dc58a388d6 Adding more testcases for the operation management. 2017-09-27 15:36:17 +05:30
sinthuja
fc6af884f6 Merge pull request #984 from menakaj/master
Test cases for Permission management.
2017-09-27 15:05:32 +05:30
Menaka Jayawardena
c7779b63c0 String constants were changed to static final. 2017-09-27 15:04:11 +05:30
Menaka Jayawardena
ebe2a7bd6b Moved dependency versioning to parent pom and fixed the test failure. 2017-09-27 14:56:43 +05:30
megala21
a0f1d13964 Merge remote-tracking branch 'upstream/master' 2017-09-27 14:53:04 +05:30
sinthuja
e4a732dbc6 Merge branch 'wso2-master' into origin-wso2-master 2017-09-27 14:49:50 +05:30
megala21
4d9357876d Adding license test cases 2017-09-27 14:49:14 +05:30
sinthuja
9f502c022f Cleaning up the unused methods on the operation mgmt. 2017-09-27 14:27:29 +05:30
Menaka Jayawardena
52b4b46e7c Minor code formatting. 2017-09-27 14:02:11 +05:30
Menaka Jayawardena
b1aba20200 Test cases for Permission management. 2017-09-27 13:59:16 +05:30
charitha
77817dc6d8 Add test cases for grouping 2017-09-27 10:52:44 +05:30
sinthuja
1b5bd81a6d Adding more operation mgt test cases. 2017-09-27 00:30:02 +05:30
megala21
9b76760c4a Adding initial DeviceTypeManager test cases 2017-09-26 23:29:57 +05:30
sinthuja
87b160cf19 Adding more operation mgt test cases. 2017-09-26 22:55:52 +05:30
sinthuja
0aab7c2e3d Fixing the test failure. 2017-09-26 17:28:18 +05:30
GDLMadushanka
4e49da00d7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-26 16:00:33 +05:30
sinthuja
ab1ef219ed Removing unnecessary extension. 2017-09-26 15:53:16 +05:30
sinthuja
e643565316 Fixing the test case failures. 2017-09-26 15:50:01 +05:30
sinthuja
41b5210c55 Merge branch 'wso2-master' into origin-wso2-master 2017-09-26 13:54:06 +05:30
sinthuja
f4700adc3b Fixing issues in the device management repository tests. 2017-09-26 13:41:32 +05:30
sinthuja
f9bc4d04ad Adding first set of operation management testcases. 2017-09-26 13:29:45 +05:30
GDLMadushanka
edf57cbb14 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-26 11:30:57 +05:30
GDLMadushanka
e0c255dbfa Add test class 2017-09-26 11:30:27 +05:30
sinthuja
25b75f3c2a Merge pull request #979 from Megala21/master
Adding unit test cases for DeviceTypeManager
2017-09-26 09:54:30 +05:30
megala21
22db015699 Fixing issues as per the comments 2017-09-26 09:50:02 +05:30
megala21
2c9369dae0 Refactoring 2017-09-25 23:30:24 +05:30
megala21
627e9a9a10 Adding unit test cases for DeviceTypeManager 2017-09-25 23:19:14 +05:30
WSO2 Builder
68e1b324e6 [WSO2 Release] [Jenkins #2662] [Release 3.0.114] prepare for next development iteration 2017-09-25 16:37:47 +05:30
WSO2 Builder
e5c2322c60 [WSO2 Release] [Jenkins #2662] [Release 3.0.114] prepare release v3.0.114 2017-09-25 16:37:34 +05:30
sinthuja
cb92f6ef65 Adding more tests for operation manager. 2017-09-25 16:02:11 +05:30
sinthuja
3463d79ae1 Add operation test case for operation manager. 2017-09-25 15:31:51 +05:30
WSO2 Builder
c200316d2e [WSO2 Release] [Jenkins #2659] [Release 3.0.113] prepare for next development iteration 2017-09-22 09:51:23 +05:30
WSO2 Builder
11512e1d6f [WSO2 Release] [Jenkins #2659] [Release 3.0.113] prepare release v3.0.113 2017-09-22 09:51:08 +05:30
megala21
635f40ce2f Refactoring 2017-09-22 09:22:40 +05:30
megala21
270037a727 Refactoring 2017-09-22 01:36:18 +05:30
megala21
57830eb064 Finalizing the unit test report generation and fixing the maven warnings in build 2017-09-22 01:34:44 +05:30
megala21
ddbc82ad15 Adding jacoc unit code coverage generation 2017-09-22 00:58:16 +05:30
WSO2 Builder
08578abb1e [WSO2 Release] [Jenkins #2657] [Release 3.0.112] prepare for next development iteration 2017-09-21 15:23:32 +05:30
WSO2 Builder
dfa0ca3073 [WSO2 Release] [Jenkins #2657] [Release 3.0.112] prepare release v3.0.112 2017-09-21 15:23:18 +05:30
Ace
d74aadae20 Tidying up the topic browser view 2017-09-21 14:42:00 +05:30
Ace
7601decaaf removing un-necessary new line 2017-09-21 11:13:57 +05:30
WSO2 Builder
ff7eaa75e2 [WSO2 Release] [Jenkins #2655] [Release 3.0.111] prepare for next development iteration 2017-09-19 07:55:23 +05:30
WSO2 Builder
f1b3e82b79 [WSO2 Release] [Jenkins #2655] [Release 3.0.111] prepare release v3.0.111 2017-09-19 07:55:11 +05:30
WSO2 Builder
0a5a66b8b6 [WSO2 Release] [Jenkins #2653] [Release 3.0.110] prepare for next development iteration 2017-09-18 13:26:54 +00:00
WSO2 Builder
dba13d3e7a [WSO2 Release] [Jenkins #2653] [Release 3.0.110] prepare release v3.0.110 2017-09-18 13:26:40 +00:00
Harshan Liyanage
455f56405b Merge pull request #968 from sameeragunarathne/master
fixes https://github.com/wso2/product-iots/issues/1417
2017-09-18 18:38:08 +05:30
WSO2 Builder
4bd92624b0 [WSO2 Release] [Jenkins #2651] [Release 3.0.109] prepare for next development iteration 2017-09-18 09:59:34 +00:00
WSO2 Builder
d7c5ff79c7 [WSO2 Release] [Jenkins #2651] [Release 3.0.109] prepare release v3.0.109 2017-09-18 09:59:21 +00:00
sameera910409
2938eaf93d fixes https://github.com/wso2/product-iots/issues/1417 2017-09-18 14:15:05 +05:30
geethkokila
a7e41faa19 Adding descriptive error message 2017-09-17 17:55:34 +05:30
geethkokila
fe30a05b81 Adding the API to retrieve device information 2017-09-16 21:19:35 +05:30
WSO2 Builder
f537b1bbad [WSO2 Release] [Jenkins #2649] [Release 3.0.108] prepare for next development iteration 2017-09-15 11:47:39 +00:00
WSO2 Builder
37215a8816 [WSO2 Release] [Jenkins #2649] [Release 3.0.108] prepare release v3.0.108 2017-09-15 11:47:26 +00:00
Sameera Wickramasekara
fcd322cb21 Update operation status header on click 2017-09-15 15:38:36 +05:30
WSO2 Builder
6f9aaa20ac [WSO2 Release] [Jenkins #2647] [Release 3.0.107] prepare for next development iteration 2017-09-14 07:16:19 +00:00
WSO2 Builder
1b4c21bbd0 [WSO2 Release] [Jenkins #2647] [Release 3.0.107] prepare release v3.0.107 2017-09-14 07:16:04 +00:00
Harshan Liyanage
46761ed76d Resolved wso2/product-iots#1348 2017-09-13 14:23:08 +05:30
WSO2 Builder
6b4d11c1e4 [WSO2 Release] [Jenkins #2641] [Release 3.0.106] prepare for next development iteration 2017-09-04 07:28:36 +00:00
WSO2 Builder
a08b7e829e [WSO2 Release] [Jenkins #2641] [Release 3.0.106] prepare release v3.0.106 2017-09-04 07:27:12 +00:00
WSO2 Builder
ecf839f51c Merge commit 'ce84e9dde5066267f3d2b28e6acb3ab0e10e144d' into d4480bc7-b9fb-4da0-9ebe-c0ec82cf1b48 2017-09-04 07:06:20 +00:00
Ruwan
cb14a39e78 Merge pull request #947 from harshanL/master
Fix for wso2/product-iots#1035
2017-09-04 12:37:37 +05:30
Harshan Liyanage
fbc72a3c63 Minor refactoring related to wso2/product-iots#1035 2017-09-04 12:31:41 +05:30
WSO2 Builder
ce84e9dde5 [WSO2 Release] [Jenkins #2640] [Release 3.0.105] prepare for next development iteration 2017-09-04 06:55:18 +00:00
WSO2 Builder
15ac007fb6 [WSO2 Release] [Jenkins #2640] [Release 3.0.105] prepare release v3.0.105 2017-09-04 06:53:54 +00:00
Harshan Liyanage
e7b65b0136 Minor refactoring related to wso2/product-iots#1035 2017-09-04 12:07:05 +05:30
geethkokila
7e5501def1 Adding the certificate caching to improve performance 2017-09-04 11:57:38 +05:30
Harshan Liyanage
5906546dfb Minor refactoring related to wso2/product-iots#1035 2017-09-04 11:56:56 +05:30
Harshan Liyanage
a3aa259437 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-04 10:06:40 +05:30
WSO2 Builder
a4c29e496b [WSO2 Release] [Jenkins #2635] [Release 3.0.104] prepare for next development iteration 2017-09-01 15:27:10 +00:00
WSO2 Builder
074d2f95e7 [WSO2 Release] [Jenkins #2635] [Release 3.0.104] prepare release v3.0.104 2017-09-01 15:25:46 +00:00
Harshan Liyanage
66d237cf61 Fixed merge conflicts. 2017-09-01 20:44:08 +05:30
Harshan Liyanage
79abb6ef86 Fixed merge conflicts. 2017-09-01 20:40:42 +05:30
Harshan Liyanage
bbbd199cf7 Resolved wso2/product-iots#1035 2017-09-01 20:30:37 +05:30
Pasindu
3ce0e36e21 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-01 17:58:10 +05:30
Pasindu
54b69747ce Fixes issue in modal displaying group name 2017-09-01 17:57:11 +05:30
WSO2 Builder
f310f42856 [WSO2 Release] [Jenkins #2633] [Release 3.0.103] prepare for next development iteration 2017-09-01 11:41:26 +00:00
WSO2 Builder
9b85bc5e1b [WSO2 Release] [Jenkins #2633] [Release 3.0.103] prepare release v3.0.103 2017-09-01 11:40:02 +00:00
Pasindu
0684257a6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-01 17:01:28 +05:30
sinthuja
a9c5188e0d Adding the specific imports. 2017-09-01 16:51:28 +05:30
WSO2 Builder
0e71daac2d Merge commit '88823569479ecd1dcbb00a4603c4ce878f29aa95' into c7e7e55b-2abf-4888-be5c-8aced62d2a18 2017-09-01 11:20:46 +00:00
sinthuja
e6b8af986b Adding the specific imports. 2017-09-01 16:48:50 +05:30
Pasindu
8000124f8c Fixes validation of role when creating new user 2017-09-01 16:48:30 +05:30
sinthuja
bb5afb07b7 Adding the class back which I mistaken deleted. 2017-09-01 16:47:33 +05:30
sinthuja
c4c30f5856 Fixing imports. 2017-09-01 16:45:23 +05:30
WSO2 Builder
8882356947 [WSO2 Release] [Jenkins #2632] [Release 3.0.102] prepare for next development iteration 2017-09-01 11:06:09 +00:00
WSO2 Builder
080cd54fef [WSO2 Release] [Jenkins #2632] [Release 3.0.102] prepare release v3.0.102 2017-09-01 11:04:45 +00:00
sinthuja
a1d6065c75 Sending email only when the mail transport is enabled. 2017-09-01 16:11:59 +05:30
sinthuja
3edc71f04d Merge branch 'wso2-master' 2017-09-01 16:08:51 +05:30
sinthuja
77c02fae46 Merge pull request #943 from Nirothipan/master
Fixing User create form error when creating a new user. #1360
2017-09-01 16:04:02 +05:30
Pasindu
f8f82e66db Fix validate error display issue 2017-09-01 15:51:57 +05:30
Nirothipan
dc9eac3ac8 fixing product-iots#1360 2017-09-01 15:51:54 +05:30
Pasindu
1581775aa6 Fixes validation issue in create group 2017-09-01 15:38:28 +05:30
sinthuja
61ac576d6c Fixing https://github.com/wso2/product-iots/issues/1376. 2017-09-01 15:34:34 +05:30
WSO2 Builder
4eec53f51c [WSO2 Release] [Jenkins #2630] [Release 3.0.101] prepare for next development iteration 2017-09-01 10:00:51 +00:00
WSO2 Builder
dbcc5c2935 [WSO2 Release] [Jenkins #2630] [Release 3.0.101] prepare release v3.0.101 2017-09-01 10:00:37 +00:00
amalhub
5fc833332a Resolves: https://github.com/wso2/product-iots/issues/1302 2017-09-01 15:27:06 +05:30
WSO2 Builder
0107012262 [WSO2 Release] [Jenkins #2628] [Release 3.0.100] prepare for next development iteration 2017-09-01 08:30:33 +00:00
WSO2 Builder
26e87c1865 [WSO2 Release] [Jenkins #2628] [Release 3.0.100] prepare release v3.0.100 2017-09-01 08:29:09 +00:00
sameeragunarathne
6cbedc2ed5 Merge pull request #941 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/1374.
2017-09-01 13:55:29 +05:30
sinthuja
c53e027701 Fixing https://github.com/wso2/product-iots/issues/1374. 2017-09-01 13:02:13 +05:30
WSO2 Builder
5d6fb21dd5 [WSO2 Release] [Jenkins #2625] [Release 3.0.99] prepare for next development iteration 2017-08-31 14:38:28 +00:00
WSO2 Builder
65725501b8 [WSO2 Release] [Jenkins #2625] [Release 3.0.99] prepare release v3.0.99 2017-08-31 14:37:04 +00:00
Menaka Jayawardena
54b616985e Added check for updating admin user by typing the url + code formatting. 2017-08-31 19:30:40 +05:30
Menaka Jayawardena
21b0ed284b Removed hardcoded admin user name. 2017-08-31 19:30:40 +05:30
Menaka Jayawardena
b04bb5f1f1 Disabled edit button for admin role. 2017-08-31 19:30:40 +05:30
WSO2 Builder
7cf67b4be5 [WSO2 Release] [Jenkins #2623] [Release 3.0.98] prepare for next development iteration 2017-08-31 13:27:02 +00:00
WSO2 Builder
1d894b5d7d [WSO2 Release] [Jenkins #2623] [Release 3.0.98] prepare release v3.0.98 2017-08-31 13:26:49 +00:00
sameeragunarathne
57db0fffbf Merge pull request #940 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/354.
2017-08-31 18:22:24 +05:30
sinthuja
c308147357 Fixing https://github.com/wso2/product-iots/issues/354. 2017-08-31 18:13:42 +05:30
WSO2 Builder
0a1197f4b1 [WSO2 Release] [Jenkins #2621] [Release 3.0.97] prepare for next development iteration 2017-08-31 12:16:54 +00:00
WSO2 Builder
1184da01eb [WSO2 Release] [Jenkins #2621] [Release 3.0.97] prepare release v3.0.97 2017-08-31 12:16:40 +00:00
Kamidu Sachith Punchihewa
8d880c50bd Merge pull request #939 from harshanL/master
Fixes for product-iots#1367 and product-iots#1285
2017-08-31 17:13:41 +05:30
sinthuja
ccda9b009c Merge pull request #938 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/353.
2017-08-31 17:01:30 +05:30
Harshan Liyanage
b87d3898f6 Fixes for wso2/product-iots#1285 2017-08-31 16:59:43 +05:30
Harshan Liyanage
5996e6841b Added null check to resolve wso2/product-iots#1367 2017-08-31 16:56:53 +05:30
sinthuja
ddb8f4e9b3 Fixing https://github.com/wso2/product-iots/issues/353. 2017-08-31 16:53:57 +05:30
WSO2 Builder
cd0195b7e7 [WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare for next development iteration 2017-08-31 11:03:33 +00:00
WSO2 Builder
565fa83984 [WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare release v3.0.96 2017-08-31 11:03:20 +00:00
WSO2 Builder
afaee46693 Merge commit '3308898268f59b076e8baeec34fcb2766f4d9b81' into 5fe78a3a-1bdc-490d-a4ee-fefb5b48e31b 2017-08-31 10:22:35 +00:00
WSO2 Builder
3308898268 [WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare for next development iteration 2017-08-31 10:12:37 +00:00
WSO2 Builder
bedac61574 [WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare release v3.0.95 2017-08-31 10:11:13 +00:00
sinthuja
e6ff84918e Merge branch 'wso2-master'
# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/IntegrationClientServiceImpl.java
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java
2017-08-31 15:38:00 +05:30
sinthuja
465d801f42 Fixing https://github.com/wso2/product-iots/issues/1356. 2017-08-31 15:34:33 +05:30
amalhub
308a2809ef Resolves: https://github.com/wso2/product-iots/issues/1161 2017-08-31 15:20:05 +05:30
WSO2 Builder
04eeb40649 [WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare for next development iteration 2017-08-31 08:45:03 +00:00
WSO2 Builder
9ee9b39fda [WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare release v3.0.94 2017-08-31 08:43:39 +00:00
WSO2 Builder
be3c7fc065 Merge commit 'ef63b2858c32817010a4f359b61cf861444f2ff3' into 2415c4fb-5619-4064-8917-b37679ac65e8 2017-08-31 08:19:55 +00:00
Charitha Goonetilleke
0f7e488d2b Merge pull request #934 from ruwany/master
Adding fix for https://github.com/wso2/product-iots/issues/667
2017-08-31 13:44:35 +05:30
WSO2 Builder
ef63b2858c [WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare for next development iteration 2017-08-31 08:04:50 +00:00
WSO2 Builder
23f72681b0 [WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare release v3.0.93 2017-08-31 08:03:26 +00:00
Ace
77152ca0a5 Adding fix for https://github.com/wso2/product-iots/issues/667 2017-08-31 12:49:57 +05:30
Menaka Jayawardena
8cac8a3bdc Added edit buttons for User and policy views. 2017-08-31 12:04:27 +05:30
Menaka Jayawardena
29086834eb Added tooltips for policy listing page. 2017-08-31 12:04:27 +05:30
WSO2 Builder
9324cc0668 [WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare for next development iteration 2017-08-30 13:15:18 +00:00
WSO2 Builder
98302eea71 [WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare release v3.0.92 2017-08-30 13:15:04 +00:00
WSO2 Builder
e03cd7650e Merge commit '04c4c961677ca7942aab73065376db57bf63d61d' into 6f2f9911-e57e-4379-83c0-4c6f6fb151ab 2017-08-30 18:19:30 +05:30
Geeth
00bebe5049 Merge pull request #932 from harshanL/master
Resolved wso2/product-iots#1358
2017-08-30 18:02:58 +05:30
WSO2 Builder
04c4c96167 [WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare for next development iteration 2017-08-30 17:58:44 +05:30
WSO2 Builder
585a4bf9a7 [WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare release v3.0.91 2017-08-30 17:58:30 +05:30
Menaka Jayawardena
9f2603a126 Bring the roles select list in-front of the modal and set colors of selected roles. 2017-08-30 17:47:13 +05:30
sinthuja
749f1ccdcf Merge pull request #931 from Nirothipan/master
Fixes for [MDM-367] Proper "Error" message is not given when trying to invite a user without having the email transport properly configured. #504
2017-08-30 17:40:05 +05:30
Harshan Liyanage
00c7dd0c63 Resolved wso2/product-iots#1358 2017-08-30 17:07:10 +05:30
Nirothipan
46921ac277 Resolving conflicts 2017-08-30 17:06:48 +05:30
WSO2 Builder
10d2388e8a [WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare for next development iteration 2017-08-30 11:24:43 +00:00
WSO2 Builder
3b920b82a9 [WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare release v3.0.90 2017-08-30 11:23:57 +00:00
Nirothipan
955fe4b4b5 checking message 2017-08-30 16:50:26 +05:30
Harshan Liyanage
ec78ba09f2 Merge pull request #924 from GDLMadushanka/master
Logging errors in devmgt and groupmgt services
2017-08-30 16:33:21 +05:30
GDLMadushanka
10a80fecf8 Refactoring 2017-08-30 16:29:08 +05:30
Nirothipan
9d3b2ebf42 fixes for product-iots #504 2017-08-30 16:20:32 +05:30
WSO2 Builder
be565626c4 [WSO2 Release] [Jenkins #2607] [Release 3.0.89] prepare for next development iteration 2017-08-30 15:30:26 +05:30
WSO2 Builder
8ee37f75e3 [WSO2 Release] [Jenkins #2607] [Release 3.0.89] prepare release v3.0.89 2017-08-30 15:30:12 +05:30
WSO2 Builder
34e8341c5e Merge commit '43cef091c593e47e67de0d80e958d970380a1dbc' into 35fc241c-ca48-4d6d-8da9-b9d2c41070d6 2017-08-30 15:05:11 +05:30
WSO2 Builder
43cef091c5 [WSO2 Release] [Jenkins #2606] [Release 3.0.88] prepare for next development iteration 2017-08-30 14:51:43 +05:30
WSO2 Builder
2f77cc99d8 [WSO2 Release] [Jenkins #2606] [Release 3.0.88] prepare release v3.0.88 2017-08-30 14:51:29 +05:30
Harshan Liyanage
28cc62b405 Merge pull request #929 from amalhub/master
Resolves: https://github.com/wso2/product-iots/issues/1008
2017-08-30 14:45:27 +05:30
amalhub
eed54aaf9f Resolves: https://github.com/wso2/product-iots/issues/1008 2017-08-30 14:32:21 +05:30
Ruwan
72956afd5a Merge pull request #928 from sinthuja/master
Fixing the issue in resetting the password for the email user
2017-08-30 14:32:07 +05:30
sinthuja
f08ade1a40 Fixing the issue in resetting the password for the email user - https://github.com/wso2/product-iots/issues/609. 2017-08-30 14:27:29 +05:30
WSO2 Builder
bad400f17f [WSO2 Release] [Jenkins #2604] [Release 3.0.87] prepare for next development iteration 2017-08-30 07:08:18 +00:00
WSO2 Builder
c8ce7837e4 [WSO2 Release] [Jenkins #2604] [Release 3.0.87] prepare release v3.0.87 2017-08-30 07:06:53 +00:00
amalhub
84ad02156b Resolves: https://github.com/wso2/product-iots/issues/1339, https://github.com/wso2/product-iots/issues/1300 2017-08-30 12:20:51 +05:30
GDLMadushanka
92d6624bbf refactoring error/debug logs 2017-08-30 11:33:39 +05:30
WSO2 Builder
721b059de7 [WSO2 Release] [Jenkins #2601] [Release 3.0.86] prepare for next development iteration 2017-08-29 13:04:12 +00:00
WSO2 Builder
a070585e89 [WSO2 Release] [Jenkins #2601] [Release 3.0.86] prepare release v3.0.86 2017-08-29 13:02:48 +00:00
Harshan Liyanage
4067a86ee9 Merge pull request #925 from menakaj/master
Fixes wso2/product-iots#755
2017-08-29 18:23:59 +05:30
Menaka Jayawardena
ba8e70320e Added tooltips for Role listing. 2017-08-29 18:18:43 +05:30
WSO2 Builder
c037770528 [WSO2 Release] [Jenkins #2599] [Release 3.0.85] prepare for next development iteration 2017-08-29 12:03:10 +00:00
WSO2 Builder
9ed6a6bb42 [WSO2 Release] [Jenkins #2599] [Release 3.0.85] prepare release v3.0.85 2017-08-29 12:02:57 +00:00
Madawa Soysa
62141db52e Merge pull request #922 from menakaj/master
Redirecting to listing pages after creating and editing Roles, Users, Policies and Groups.
2017-08-29 17:08:12 +05:30
Menaka Jayawardena
a32cf89757 Fixed formatting issues. 2017-08-29 17:06:12 +05:30
Menaka Jayawardena
adce200842 Typo fix in policy create js. 2017-08-29 15:39:36 +05:30
Menaka Jayawardena
85b437a0f0 Redirect to Policy Listing page after editing a policy. 2017-08-29 15:35:44 +05:30
Menaka Jayawardena
c754b64653 Redirect to Role Listing page after editing a Role. 2017-08-29 15:23:27 +05:30
Menaka Jayawardena
80a08a2744 Redirect to Group Listing page after creating a Group. 2017-08-29 15:17:36 +05:30
Menaka Jayawardena
d8a8f6adf7 Restructured the setTimeout function. 2017-08-29 15:13:39 +05:30
Menaka Jayawardena
e238cfd2f9 Redirect to user listing after editing the user. 2017-08-29 15:12:27 +05:30
Menaka Jayawardena
bf789b91f3 Added user creation success modal. 2017-08-29 14:58:24 +05:30
Menaka Jayawardena
9ee5056967 Redirect to Permission listing after creating permission. 2017-08-29 14:52:57 +05:30
WSO2 Builder
463b843b8b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare for next development iteration 2017-08-29 08:55:49 +00:00
WSO2 Builder
aed8496a2b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare release v3.0.84 2017-08-29 08:54:25 +00:00
GDLMadushanka
78d60b1a92 Refactoring 2017-08-29 14:15:26 +05:30
GDLMadushanka
d7220d39af logging errors in devmgt service and groupmgt service 2017-08-29 14:12:17 +05:30
WSO2 Builder
0c6eab198c Merge commit '68a49d7e666f0b4895de3b6048d599c579bf9429' into d6a2ef64-9f2a-4574-b4e9-d995eb90a0c9 2017-08-29 08:33:49 +00:00
Harshan Liyanage
2d8139cc18 Changed the group related messages which resolves wso2/product-iots#984 2017-08-29 13:57:19 +05:30
WSO2 Builder
68a49d7e66 [WSO2 Release] [Jenkins #2596] [Release 3.0.83] prepare for next development iteration 2017-08-29 08:22:43 +00:00
WSO2 Builder
3c319811ef [WSO2 Release] [Jenkins #2596] [Release 3.0.83] prepare release v3.0.83 2017-08-29 08:21:19 +00:00
Menaka Jayawardena
815d92bd27 Removed repeated 'be' in policy create. 2017-08-29 13:25:08 +05:30
Milan Perera
eda93ad6aa Merge pull request #921 from menakaj/master
Set redirection to policy listing page after creating policy.
2017-08-29 13:18:45 +05:30
Menaka Jayawardena
31448ec07c Set redirection to policy listing page after creating policy. 2017-08-29 13:14:33 +05:30
WSO2 Builder
2d6393a2c5 [WSO2 Release] [Jenkins #2594] [Release 3.0.82] prepare for next development iteration 2017-08-29 07:09:44 +00:00
WSO2 Builder
887102d822 [WSO2 Release] [Jenkins #2594] [Release 3.0.82] prepare release v3.0.82 2017-08-29 07:08:20 +00:00
WSO2 Builder
778528e9c8 Merge commit 'f4cef3817a30c433bc0d3d79c7ba37fe6d175864' into f88e4078-c010-415b-8eca-acfe71205eb5 2017-08-29 06:48:43 +00:00
Dileesha Rajapakse
c23809b362 Corrected typos in config files 2017-08-29 12:13:39 +05:30
Dileesha Rajapakse
3ff16ee6d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-29 12:09:51 +05:30
Dileesha Rajapakse
3cdb3439eb Fixing product-iots#1236
Fixed https://github.com/wso2/product-iots/issues/1236
2017-08-29 12:09:38 +05:30
WSO2 Builder
f4cef3817a [WSO2 Release] [Jenkins #2593] [Release 3.0.81] prepare for next development iteration 2017-08-29 06:36:31 +00:00
WSO2 Builder
02cc2a37c1 [WSO2 Release] [Jenkins #2593] [Release 3.0.81] prepare release v3.0.81 2017-08-29 06:35:07 +00:00
Harshan Liyanage
0cca31dd06 Updated config.json file which resolves wso2/product-iots#1293 2017-08-29 11:57:52 +05:30
WSO2 Builder
8b3feec052 [WSO2 Release] [Jenkins #2590] [Release 3.0.80] prepare for next development iteration 2017-08-28 16:43:58 +00:00
WSO2 Builder
87ac798344 [WSO2 Release] [Jenkins #2590] [Release 3.0.80] prepare release v3.0.80 2017-08-28 16:42:34 +00:00
Ruwan
08a46cbf89 Merge pull request #917 from charithag/master
Fix for wso2/product-iots#1305
2017-08-28 21:57:35 +05:30
WSO2 Builder
8c7d23a754 [WSO2 Release] [Jenkins #2588] [Release 3.0.79] prepare for next development iteration 2017-08-28 15:37:51 +00:00
WSO2 Builder
c0735b5842 [WSO2 Release] [Jenkins #2588] [Release 3.0.79] prepare release v3.0.79 2017-08-28 15:36:27 +00:00
Ruwan
d6dbe5ed8a Merge pull request #918 from menakaj/master
Fixes wso2/product-iots#743
2017-08-28 21:05:47 +05:30
Menaka Jayawardena
7f93ebedb2 Fixes wso2/product-iots#743 2017-08-28 21:03:22 +05:30
charitha
b9abacfc61 Revert automatic reformatting 2017-08-28 19:18:26 +05:30
charitha
7b266fc64e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-28 19:09:42 +05:30