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

4048 Commits

Author SHA1 Message Date
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
charitha
3bce479b4b Fix for https://github.com/wso2/product-iots/issues/1305 2017-08-28 18:57:37 +05:30
WSO2 Builder
709015ea6d [WSO2 Release] [Jenkins #2586] [Release 3.0.78] prepare for next development iteration 2017-08-28 12:46:49 +00:00
WSO2 Builder
22b43af120 [WSO2 Release] [Jenkins #2586] [Release 3.0.78] prepare release v3.0.78 2017-08-28 12:45:25 +00:00
Milan Perera
672b556937 Merge pull request #916 from menakaj/master 
Fixes product-iots#745
 2017-08-28 18:13:27 +05:30
Menaka Jayawardena
7c88653bd9 Fixes /wso2/product-iots#745 2017-08-28 18:09:46 +05:30
WSO2 Builder
897f0451e3 [WSO2 Release] [Jenkins #2584] [Release 3.0.77] prepare for next development iteration 2017-08-28 09:50:17 +00:00
WSO2 Builder
e810157df4 [WSO2 Release] [Jenkins #2584] [Release 3.0.77] prepare release v3.0.77 2017-08-28 09:48:52 +00:00
amalhub
a7e213c9fb Fix issue: https://github.com/wso2/product-iots/issues/1133 2017-08-28 15:12:24 +05:30
WSO2 Builder
6921656997 [WSO2 Release] [Jenkins #2577] [Release 3.0.76] prepare for next development iteration 2017-08-23 11:54:15 +00:00
WSO2 Builder
29af5cfdbb [WSO2 Release] [Jenkins #2577] [Release 3.0.76] prepare release v3.0.76 2017-08-23 11:52:51 +00:00
Harshan Liyanage
8621fb8d90 Updated the theme for adding extra space in error message icon related to wso2/product-iots#1307 2017-08-23 16:34:38 +05:30
WSO2 Builder
8c02393f2f [WSO2 Release] [Jenkins #2574] [Release 3.0.75] prepare for next development iteration 2017-08-22 11:38:57 +00:00
WSO2 Builder
9ef8dbda65 [WSO2 Release] [Jenkins #2574] [Release 3.0.75] prepare release v3.0.75 2017-08-22 11:37:33 +00:00