Commit Graph

264 Commits

Author SHA1 Message Date
charithag
516155dae5 Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins 2016-04-18 16:39:35 +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
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
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
pasinduj
08387e178d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 09:37:21 +05:30
Dileesha Rajapakse
9e5891a728 Fixed EMM-1116 2015-12-18 15:34:50 +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
Dileesha Rajapakse
8c1d418e44 Refactored oracle DB script 2015-11-12 19:16:21 +05:30
Dileesha Rajapakse
123ea228ad Refactored Enrolment DAO class 2015-11-12 10:30:45 +05:30
Dileesha Rajapakse
1975821446 Refactored Device and Application DAO classes 2015-11-11 18:47:02 +05:30
harshanl
026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870 2015-11-10 18:17:34 +05:30
Dileesha Rajapakse
b7e4e90358 Refactored mssql DB script 2015-11-05 10:42:11 +05:30
Dileesha Rajapakse
11c6b94368 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-05 10:11:12 +05:30
geethkokila
30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url 2015-11-03 16:24:49 +05:30
Dileesha Rajapakse
fca2e515b0 Refactored oracle DB script 2015-11-03 16:00:30 +05:30
Dileesha Rajapakse
473c06f347 Refactored oracle DB script 2015-11-03 13:56:02 +05:30
Dileesha Rajapakse
67ecf0daa0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 09:52:24 +05:30
geethkokila
feab85796f Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation 2015-11-02 19:44:52 +05:30
Dileesha Rajapakse
d6a30daac1 Resolved merge conflicts 2015-10-30 12:29:57 +05:30
mharindu
d2b8224f31 Changed the VARCHAR size of application identifier 2015-10-30 11:28:57 +05:30
prabathabey
27f293b09f Fixing merge conflicts 2015-10-29 14:19:47 +05:30
prabathabey
5ec27d989f Removing unnecessary INSERT statements found in device management schema 2015-10-29 14:02:21 +05:30
Dileesha Rajapakse
aeb4455e2d Fixed merge conflicts 2015-10-29 12:43:59 +05:30
Dileesha Rajapakse
abe49b57d0 Refactored CDM sql scripts 2015-10-29 12:33:38 +05:30
Dileesha Rajapakse
935455f700 Refactored postgresql.sql DB script 2015-10-29 11:46:49 +05:30
prabathabey
fb3e7f4c33 Fixing issues encountered in CDM-F core database schema 2015-10-29 10:49:19 +05:30
Dileesha Rajapakse
1b62efebc5 Renamed SQL Table 'DM_ENROLMENT_OPERATION_MAPPING' to 'DM_ENROLMENT_OP_MAPPING' 2015-10-29 10:36:55 +05:30
Dileesha Rajapakse
13d9672b74 Fixed merge conflicts 2015-10-29 09:45:26 +05:30
prabathabey
0282cff5b3 Adding missing auto_increment declaration in DEVICE_TYPE table config and script clean up 2015-10-28 22:39:47 +05:30
Dileesha Rajapakse
86935ac16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-28 20:59:56 +05:30
prabathabey
79cc441c71 Renaming postgres.sql to postgresql.sql 2015-10-28 20:42:43 +05:30
Dileesha Rajapakse
ab969c7369 Refactored postgresql DB Script 2015-10-28 18:31:02 +05:30
Dileesha Rajapakse
d7dc46d3a7 Refactored DB Scripts 2015-10-28 15:44:49 +05:30
Dileesha Rajapakse
ac73155147 Refactored DB Scripts 2015-10-28 14:27:00 +05:30
Dileesha Rajapakse
b55c5bc793 Refactored mysql DB Script 2015-10-26 17:52:19 +05:30
Dileesha Rajapakse
323357d613 Refactored mysql DB Script 2015-10-22 15:24:35 +05:30
harshanl
340a690995 Added sql script 2015-10-20 10:11:42 +05:30
geethkokila
d52df2474e Fixing policy descriptions 2015-10-15 13:01:53 +05:30
harshanl
9ae6099d2b Fixed nitification table 2015-09-07 18:47:11 +05:30
harshanl
bbec523a47 Added notification mechanism 2015-09-03 00:19:58 +05:30
geethkokila
458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases 2015-08-31 19:31:13 +05:30