Commit Graph

1360 Commits

Author SHA1 Message Date
dilanua
7027a3553a Adding temporary development code bits for dashboard analytics feature 2016-04-24 08:24:43 +05:30
dilanua
2f2e8f391a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-23 22:52:25 +05:30
dilanua
c3bc22519a Adding temporary development code bits for dashboard analytics feature 2016-04-23 22:51:58 +05:30
ayyoob
5e1ad22480 few changes on download api 2016-04-23 20:30:14 +05:30
ayyoob
1c0807a513 added userstore null check for permission scope validator 2016-04-23 00:07:12 +05:30
ayyoob
9f98f538de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-22 20:59:23 +05:30
ayyoob
b99d10e075 few changes invoker util to support file downloading 2016-04-22 20:57:22 +05:30
dilanua
274aa0ecd3 Adding temporary development code bits for cdmf-product dashboard feature 2016-04-22 10:48:42 +05:30
dilanua
a888cf39c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-21 13:32:58 +05:30
Ruwan
c6fbc8f1fe Merge pull request #216 from GPrathap/master
fixed some bugs which caused while enabling SSO in IoT Server
2016-04-20 23:48:48 +05:30
GPrathap
84492d70ac added constants for authentications types 2016-04-20 22:10:04 +05:30
GPrathap
55a95cca86 bug fixes 2016-04-20 22:08:30 +05:30
Rasika Perera
8e7052e012 adding JSON strigify on payload if contentType is json 2016-04-20 22:03:01 +05:30
Rasika Perera
69e38b3c98 adding JSON strigify on payload if contentType is json 2016-04-20 22:02:31 +05:30
Rasika Perera
6ec5b7a85a Reading Http Method from Features 2016-04-20 13:42:25 +05:30
Rasika Perera
2d44ec234b Now operations are auto generated and supports query params, path params and form params. 2016-04-20 13:38:36 +05:30
Rasika Perera
bb33b4ea12 Parameterizing Content-Type and Accept headers. 2016-04-20 13:37:42 +05:30
charithag
a5a1529853 Fix issues in device listing page and device details page 2016-04-19 14:54:37 +05:30
Charitha Goonetilleke
05858da548 Fix formatting 2016-04-18 18:31:15 +05:30
charithag
c0e4c6b461 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-18 17:59:59 +05:30
ayyoob
64bd0fc061 removed fix for web app publishing start up issue when synapse gateway is used 2016-04-18 17:16:51 +05:30
charithag
6d8c3e5315 Fix default permission issues 2016-04-18 16:44:03 +05:30
charithag
516155dae5 Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins 2016-04-18 16:39:35 +05:30
ayyoob
12db341d33 few changes on web app publisher after testing 2016-04-18 03:00:06 +05:30
ayyoob
d3418462d9 few changes in api manager application registration 2016-04-17 12:18:49 +05:30
ayyoob
9d4defaa01 check whether the subscriber exist before creating 2016-04-15 23:10:11 +05:30
ayyoob
afe965e787 adding code review changes on JWT and API App registration 2016-04-14 19:55:55 +05:30
dilanua
3daa42ca5d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-11 12:10:21 +05:30
charithag
ab4b61401c Fixing UI and implementation issues occurred after restructuring. 2016-04-08 16:19:15 +05:30
charithag
4a72c789f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-08 16:14:17 +05:30
charithag
0133cddc68 Fixing UI and implementation issues occurred after restructuring. 2016-04-08 16:12:37 +05:30
dilanua
c7af1a1e23 Adding temporary development code bits of dashboard analytics feature 2016-04-08 15:22:36 +05:30
dilanua
ce8d4b53a2 Adding temporary development code bits of dashboard analytics feature 2016-04-08 15:10:01 +05:30
Lakshman
993a387e7c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-08 11:26:58 +05:30
charithag
3dc23c5708 Fixing UI and implementation issues occurred after restructuring. 2016-04-07 20:41:10 +05:30
charithag
06a7fd2f1a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-07 11:56:14 +05:30
charithag
905f9ae4c1 Fixing UI issues occured after restructuring. 2016-04-07 11:55:48 +05:30
Kasun Delgolla
4e57e5bc85 Committing restructuring mdm-admin + UI merging style fixes 2016-04-07 10:42:56 +05:30
Lakshman
551aaf172b formatting change 2016-04-06 19:32:41 +05:30
Lakshman
7174d000e0 override hash and equals function in Device to avoid duplicates in collections 2016-04-06 19:05:11 +05:30
Ruwan
a192bfa85c Merge pull request #207 from rasika90/master
Adding uuf template app into cdmf-base-ui
2016-04-01 19:29:58 +05:30
Rasika Perera
3e34aeeff4 Fixing "Cannot write to cached file" issue 2016-04-01 18:00:22 +05:30
Rasika Perera
5911c873f3 Adding uuf template app 2016-04-01 15:06:32 +05:30
Kasun Delgolla
04de876265 Merge pull request #206 from charithag/master
Restructure group related UIs
2016-04-01 13:53:46 +05:30
charithag
99d004b6a6 Restructure group related UIs 2016-04-01 13:30:44 +05:30
Prabath Abeysekara
30e5666750 Merge pull request #205 from charithag/master
Refactor group management
2016-04-01 12:57:20 +05:30
geethkokila
d6923a1343 Fixing the issue in single condition 2016-04-01 00:25:09 +05:30
inosh-perera
9661502524 fixing issue with certificate delete 2016-03-31 20:08:20 +05:30
mharindu
afbfaf4c1d Fixed for EMM-1305 2016-03-31 19:33:19 +05:30
mharindu
a3741bda7e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-31 19:32:10 +05:30
mharindu
a2a1e8115d Fixed conflicts and merged 2016-03-31 18:45:52 +05:30
mharindu
72591eff44 Fixed modify enrollment bug 2016-03-31 18:44:55 +05:30
inosh-perera
f0fd86fcf7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-31 18:16:09 +05:30
inosh-perera
7cd1722829 making certificates searchable 2016-03-31 18:15:15 +05:30
geethkokila
7318502697 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-31 18:07:55 +05:30
geethkokila
e60a383f4d Adding fixes to the device search 2016-03-31 18:07:05 +05:30
charithag
f6d224a623 Refactor group management 2016-03-31 17:50:29 +05:30
charithag
d22570dadb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-31 16:57:21 +05:30
charithag
bf58342d81 Refactor group management 2016-03-31 16:27:53 +05:30
Prabath Abeysekara
f1081f7029 Merge pull request #204 from ayyoob/merge-latest
Merged device type multitenant implementation.
2016-03-31 16:27:35 +05:30
ayyoob
733884cba7 added web app tenant authorisation for tenant for non managed api scenario 2016-03-31 15:10:37 +05:30
ayyoob
3a3e9cc649 changed analytics components to released version 2016-03-31 05:55:03 +05:30
ayyoob
1b4a9227d8 merged web app publisher code and refactored jwt client extension to adhere to new artefact name 2016-03-31 04:24:30 +05:30
geethkokila
73a82f743f Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes 2016-03-30 23:56:44 +05:30
ayyoob
83057acd9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest 2016-03-30 23:42:47 +05:30
inosh-perera
41ba2f4f0a adding database changes 2016-03-30 19:08:42 +05:30
geethkokila
fbc7c0807c Skipping the validation of task operations 2016-03-30 14:10:17 +05:30
ayyoob
fc725fa767 removed analytics 2016-03-30 13:45:39 +05:30
ayyoob
81ae512f13 Merge pull request #6 from ayyoob/merge-devicetype
merge device type
2016-03-30 12:20:02 +05:30
ayyoob
026d4ef018 removed analytics 2016-03-30 12:17:46 +05:30
charithag
40f863fd57 Fix bundle imports for java 8 2016-03-30 10:00:56 +05:30
charithag
0a8e00fd1e Merged with upstream and resolved conflicts. 2016-03-30 02:00:47 +05:30
charithag
3e4ccf6337 Add missing features and component from IoTS-1.0.0-M4 2016-03-30 01:44:04 +05:30
geethkokila
888971ae39 Fixing the oracl and postgres sql datasources and removing the start and end from the search context 2016-03-29 22:46:09 +05:30
charithag
2f0a3388a6 Implemented missing methods in group management. 2016-03-29 18:01:21 +05:30
geethkokila
aa63b5f592 Fixing the application memory usage and adding location based search 2016-03-29 17:48:36 +05:30
charithag
3fd141acdf Add missing parts and test to group management. 2016-03-29 17:07:56 +05:30
charithag
d1ee1fd578 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-29 12:41:48 +05:30
charithag
fa2f61f48a Add missing parts in group management 2016-03-29 12:41:38 +05:30
ayyoob
284a6645f0 import required packages 2016-03-29 12:07:58 +05:30
ayyoob
4554aadd82 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-29 11:42:14 +05:30
ayyoob
c45895685b Added device type multi tenancy capability. 2016-03-29 11:40:58 +05:30
ayyoob
021378df3b added org.wso2.carbon import package 2016-03-28 23:05:47 +05:30
ayyoob
e06565728e removed duplicate imports and improper imports 2016-03-28 20:46:38 +05:30
charithag
062a843ca2 Fix for https://wso2.org/jira/browse/IOTS-99 2016-03-28 13:28:49 +05:30
prabathabey
ffbc0904a6 Fixing build failures caused by missing package imports 2016-03-27 21:51:45 +05:30
prabathabey
22e579ff15 Fixing build failures causde by missing references to certain packages 2016-03-27 21:17:05 +05:30
prabathabey
3a7ef33c16 Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup 2016-03-27 16:58:11 +05:30
prabathabey
284ca1b8e8 Removing obsolete source structures 2016-03-27 16:08:22 +05:30
prabathabey
12c4ba10af Code cleanup 2016-03-27 16:04:15 +05:30
prabathabey
36161f6288 Merging extended device management functionalities 2016-03-27 16:02:40 +05:30
prabathabey
5e7985dae6 merging group-mgt implementation 2016-03-27 16:01:06 +05:30
prabathabey
b584131160 Fixing build failures in device.mgt.analytics.data.publisher bundle 2016-03-27 13:18:18 +05:30
prabathabey
85ecae22e0 Renaming backend-oauth-authenticator module to org.wso2.carbon.identity.authenticator.backend.oauth 2016-03-27 13:06:35 +05:30
prabathabey
3fa17c12a7 merging jwt client extension component 2016-03-27 13:02:35 +05:30
prabathabey
43926b64b4 Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher 2016-03-27 13:01:26 +05:30
prabathabey
1a43cf6a55 Fixing build faliure caused by not adding a package-import upon org.wso2.carbon.base 2016-03-27 03:06:39 +05:30
prabathabey
5dcd9dfe4a Merging device analytics feature impl to master 2016-03-27 00:23:37 +05:30
prabathabey
e537e2d841 Adding device.mgt base ui framework 2016-03-25 14:46:19 +05:30
geethkokila
e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0 2016-03-24 11:41:52 +05:30
geethkokila
3a3df04331 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-21 10:33:49 +05:30
geethkokila
41191d6df0 Adding the search feature to device mgt plugin 2016-03-21 10:33:35 +05:30
inosh-perera
ef117ffa74 adding mutual SLL authentication and certificate management DAOs 2016-03-17 14:14:59 +05:30
geethkokila
1826c9ee49 Doing a partial commit for pull 2016-03-14 12:02:36 +05:30
geethkokila
be890c2e9a Doing a partial commit 2016-03-14 11:55:25 +05:30
geethkokila
7a809c1c01 Doing a partial commit 2016-03-14 11:48:43 +05:30
prabathabey
3726a57d96 Making email-sender a separate component and code cleanup 2016-03-13 00:51:54 +05:30
prabathabey
0b31042aa2 More improvements to the email sending functionality 2016-03-12 15:42:08 +05:30
prabathabey
535c74a962 Improving email sender functionality 2016-03-12 12:46:36 +05:30
Kamidu Sachith
5fb94ebe0f Code refractoring and Formatting 2016-02-12 20:56:30 +05:30
Prabath Abeysekara
a6905b52b1 Merge pull request #160 from hasuniea/master
Refactored certificateGenerator
2016-02-12 13:47:46 +05:30
hasuniea
4bafb72bb4 refcatored certificate Generator 2016-02-05 11:48:31 +05:30
Dileesha Rajapakse
8ac485d66d Fixed Pagination issues in Device and Operation Oracle DAO classes 2016-02-02 17:53:47 +05:30
Dileesha Rajapakse
9204ed900d Fixed Pagination issues in Oracle DAO classes 2016-02-02 16:37:26 +05:30
Kamidu Sachith
dda94437ee code clean up and refactoring 2016-01-28 18:58:40 +05:30
Kamidu Sachith
370badf9d3 Preventing infromation leakage 2016-01-28 18:58:24 +05:30
geethkokila
e0e0a57c11 [maven-release-plugin] prepare for next development iteration 2016-01-05 18:15:38 +05:30
geethkokila
cebb88e712 [maven-release-plugin] prepare release v1.0.3 2016-01-05 18:15:28 +05:30
geethkokila
e66d291947 [maven-release-plugin] prepare for next development iteration 2015-12-30 14:19:05 +05:30
geethkokila
f416a73e75 [maven-release-plugin] prepare release v1.0.2 2015-12-30 14:18:57 +05:30
geethkokila
d0a2c5521c Commenting this due to policy compliance warn will block the device 2015-12-24 11:09:32 +05:30
geethkokila
185a59fbd4 [maven-release-plugin] prepare for next development iteration 2015-12-23 22:39:29 +05:30
geethkokila
b3580d754b [maven-release-plugin] prepare release v1.0.1 2015-12-23 22:39:20 +05:30
prabathabey
1fe9371558 Fixing https://wso2.org/jira/browse/EMM-1133 2015-12-23 21:41:10 +05:30
harshanl
402b843e5d Updated task schedule service to fix EMM-1145, EMM-1100 2015-12-23 19:35:50 +05:30
prabathabey
cbee88c7d0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-23 18:14:42 +05:30
prabathabey
77c4c34858 Fixing https://wso2.org/jira/browse/EMM-1133 2015-12-23 18:13:39 +05:30
harshanl
8d4c09c20f Fixed EMM-1139 2015-12-23 17:10:12 +05:30
prabathabey
e04a60104d Improve logging in RemoteDCRClient 2015-12-23 16:55:35 +05:30
harshanl
9a7093a0f7 Fixed EMM-1146 issue 2015-12-23 15:29:45 +05:30
prabathabey
ed2fa14952 Fixing https://wso2.org/jira/browse/EMM-1135 2015-12-22 23:51:46 +05:30
prabathabey
7a27e88551 Changing the log levels configured in log4j.properties files used as part of test configurations 2015-12-22 22:43:26 +05:30
inosh-perera
6d7f024e8e fixing java 8 build brake due to missing null check 2015-12-22 19:23:52 +05:30
geethkokila
4e9255fbc9 [maven-release-plugin] prepare for next development iteration 2015-12-22 08:28:42 +05:30
geethkokila
ceb60adb34 [maven-release-plugin] prepare release v1.0.0 2015-12-22 08:28:33 +05:30
harshanl
d1cb7a3df2 Merge branch 'hasuniea-master' 2015-12-22 07:40:55 +05:30
hasuniea
1b51ad0228 refactored csr request authentication 2015-12-22 06:58:48 +05:30
prabathabey
8578ff60ca Fixing the issue where client type is not honoured in dynamic client registration service 2015-12-22 06:15:55 +05:30
Dilshan Edirisuriya
094423e0b9 Fixing EMM-1129 2015-12-21 23:11:29 +05:30
prabathabey
2b0e1eecab Committing logic that stores BST within request metadata 2015-12-21 22:50:30 +05:30
prabathabey
7e65b837d1 Committing logic that stores BST within request metadata 2015-12-21 22:48:47 +05:30
harshanl
bb9e07b742 Fixed BSTValidator 2015-12-21 21:41:34 +05:30
prabathabey
ed8242fc66 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 20:22:14 +05:30
prabathabey
a7b447b7db Adding BST authenticator 2015-12-21 20:21:51 +05:30
Kamidu Sachith
6b2c3289dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 17:39:08 +05:30
Kamidu Sachith
c6e2c01caa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 16:45:52 +05:30
Kamidu Sachith
2d23eb86eb Improve runtime performance 2015-12-21 16:38:42 +05:30
pasinduj
8628e5e523 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 15:03:46 +05:30
pasinduj
c7b53f7110 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 14:44:23 +05:30
harshanl
a61fe6171a Refactored pagination code 2015-12-21 14:22:09 +05:30