Commit Graph

346 Commits

Author SHA1 Message Date
dilanua
13c5fe3d1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-09 12:33:34 +05:30
dilanua
0ab4035b37 Adding H2, MySQL Support for dashboard analytics feature 2016-05-09 12:33:11 +05:30
Kasun Delgolla
4cb7b86f4c Fixing SQL errors 2016-05-09 12:20:43 +05:30
ayyoob
c165156dcd remove imports 2016-05-09 01:05:08 +05:30
ayyoob
5f302fce63 removed unused code and resolved host issues 2016-05-04 01:19:56 +05:30
geethkokila
e4b400a5e7 Disabling device analytics publishing by default 2016-05-02 10:45:10 +05:30
geethkokila
3396a5066d Adding changes for the updated time of device info and device location 2016-04-29 22:30:07 +05:30
geethkokila
5a77e08fd5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 17:57:05 +05:30
dilanua
2a55c50ad1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 13:58:58 +05:30
dilanua
2b62eac4f5 Adding temporary development code bits for dashboard analytics feature 2016-04-27 13:58:53 +05:30
geethkokila
4029c86da4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 10:26:51 +05:30
geethkokila
2fb42518b6 Adding the changes for the device group with policy. 2016-04-27 10:26:47 +05:30
prabathabey
95d3b97c5f Code cleanup 2016-04-26 15:59:22 +05:30
geethkokila
f1aeb1a846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-24 08:38:28 +05:30
geethkokila
37e431d6a0 Adding the h2.sql for resolving conflicts 2016-04-24 08:33:57 +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
Prabath Abeysekara
8ced6cf38e Merge pull request #211 from charithag/master
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
2016-04-19 13:36:37 +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
afe965e787 adding code review changes on JWT and API App registration 2016-04-14 19:55:55 +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
Kasun Delgolla
4e57e5bc85 Committing restructuring mdm-admin + UI merging style fixes 2016-04-07 10:42:56 +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
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
ayyoob
562ced1be7 Added api application extension feature 2016-03-31 00:10:40 +05:30
ayyoob
7632d4e929 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest 2016-03-30 22:03:48 +05:30
inosh-perera
41ba2f4f0a adding database changes 2016-03-30 19:08:42 +05:30
ayyoob
81ae512f13 Merge pull request #6 from ayyoob/merge-devicetype
merge device type
2016-03-30 12:20:02 +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
geethkokila
aa63b5f592 Fixing the application memory usage and adding location based search 2016-03-29 17:48:36 +05:30
charithag
fa2f61f48a Add missing parts in group management 2016-03-29 12:41:38 +05:30
ayyoob
c45895685b Added device type multi tenancy capability. 2016-03-29 11:40:58 +05:30
prabathabey
38f3b037eb Code cleanup 2016-03-27 21:17:33 +05:30
prabathabey
099613da73 Merging device.mgt.ui features 2016-03-27 17:29:26 +05:30
prabathabey
e9954dab4b merging device.mgt.ui feature 2016-03-27 17:11:31 +05:30
prabathabey
284ca1b8e8 Removing obsolete source structures 2016-03-27 16:08:22 +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
5dcd9dfe4a Merging device analytics feature impl to master 2016-03-27 00:23:37 +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
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
3772d54ea1 Adding an entry to p2.inf to be able to copy them to a preferred location in the product distribution 2016-03-12 16:07:08 +05:30
prabathabey
0b31042aa2 More improvements to the email sending functionality 2016-03-12 15:42:08 +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
Dileesha Rajapakse
edec1452b2 Fixed EMM-1171 2016-01-05 14:16:36 +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
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
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
prabathabey
30cd44a7fb Fixing name of the BSTAuthenticator 2015-12-22 03:48:21 +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
pasinduj
8628e5e523 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 15:03:46 +05:30
harshanl
42a8df75e6 Changed default oauth validator type to local 2015-12-21 15:01:18 +05:30
pasinduj
c7b53f7110 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 14:44:23 +05:30
prabathabey
67e1bfb012 Making attribute names schema compliant and code cleanup 2015-12-21 12:23:59 +05:30
prabathabey
0cdc139a0b Adding updated webapp authenticator config 2015-12-21 11:57:50 +05:30
pasinduj
08387e178d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 09:37:21 +05:30
prabathabey
337afa5da2 Revert "Further optimizing webapp authenticator valve implementation"
This reverts commit 262e53ddcc.
2015-12-19 13:27:45 +05:30
prabathabey
262e53ddcc Further optimizing webapp authenticator valve implementation 2015-12-19 13:09:31 +05:30
Dileesha Rajapakse
9e5891a728 Fixed EMM-1116 2015-12-18 15:34:50 +05:30
pasinduj
9a50455a29 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-14 08:57:36 +05:30
harshanl
00cf61c44c Fixed EMM-1069 and refactore DCR services 2015-12-11 20:04:22 +05:30
pasinduj
7be1de1b85 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-11 11:30:41 +05:30
harshanl
08ebd7f881 Added DCR proxy endpoint & refactored code. 2015-12-11 11:10:53 +05:30
pasinduj
5ac2447080 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 17:00:35 +05:30
pasinduj
bb010bde28 modified oracle db script to remove a foriegn key 2015-12-10 16:59:03 +05:30
Dileesha Rajapakse
96366de4dd Fixed syntax errors in sequence creation 2015-12-10 15:30:17 +05:30
pasinduj
4656a9eae7 modified all dbscripts removing a foriegn key 2015-12-10 11:43:44 +05:30
pasinduj
6e94a084a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-09 10:18:10 +05:30
pasinduj
6ed2710550 revert mysql edited lines 2015-12-09 10:15:43 +05:30
pasinduj
1a7b888102 modified dbscript added missing comma 2015-12-08 16:13:35 +05:30
pasinduj
f49f13501f modified dbscripts removing policy ID forigen key from one table 2015-12-08 15:35:01 +05:30
pasinduj
3154582abe remove policy id foriegn key from one table 2015-12-08 13:26:51 +05:30
pasinduj
a390df68ec modified dbscripts to remove foriegn key reference 2015-12-08 11:42:04 +05:30
Dileesha Rajapakse
799ece6b36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-07 18:12:58 +05:30
geethkokila
b3e2c856a9 Fixing the end point for invititaion 2015-12-07 14:42:21 +05:30
Dileesha Rajapakse
699d92f7bd Added DM_DEVICE_CERTIFICATE Table into SQL Scripts 2015-12-07 13:57:38 +05:30
inosh-perera
d4403c6d87 adding new table to h2 script 2015-12-03 10:16:10 +05:30
Kamidu Sachith
53064516d3 Fix for the Jira Issue EMM-989 2015-11-26 16:02:16 +05:30
Kamidu Sachith
8573a284e0 Enable Domain name in the invitation main 2015-11-26 11:39:11 +05:30
manoj
a04658af14 App Manager integration 2015-11-19 10:21:59 +05:30
manoj
79c268cb41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-19 10:18:01 +05:30
Dileesha Rajapakse
2a30a4a144 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-18 22:05:46 +05:30
Dileesha Rajapakse
767ea70436 Refactored CommandOperation DAO class 2015-11-18 22:05:15 +05:30
geethkokila
5772ca4a35 Removing the unique key 2015-11-18 21:08:57 +05:30
geethkokila
6b9dc0d6a5 Removing the unnessary unique key 2015-11-17 16:46:04 +05:30
manoj
dbf8d13ced Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 16:15:24 +05:30
manoj
20db31c2a9 Add app manager features 2015-11-17 16:14:51 +05:30
Dileesha Rajapakse
6f0276ab2f Modified Application Mapping DAO classes 2015-11-16 11:39:52 +05:30