Commit Graph

1502 Commits

Author SHA1 Message Date
pasinduj
6ed2710550 revert mysql edited lines 2015-12-09 10:15:43 +05:30
Kasun Delgolla
c0a5015349 Merge pull request #51 from dilee/master
Added DM_DEVICE_CERTIFICATE Table into SQL Scripts
2015-12-09 10:14:05 +05:30
Dileesha Rajapakse
15a4cfdfd6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-09 10:00:30 +05:30
pasinduj
461049447f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-09 09:41:56 +05:30
harshanl
bdbbca5a18 For triggring the build 2015-12-08 20:59:08 +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
81911bace0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-08 13:26:35 +05:30
pasinduj
a390df68ec modified dbscripts to remove foriegn key reference 2015-12-08 11:42:04 +05:30
Dileesha Rajapakse
22b9719e93 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-08 07:51:39 +05:30
harshanl
92af749276 Fixed build break 2015-12-07 20:53:07 +05:30
harshanl
740124136b Refactored backend oauth authenticator component and added logic to validate OAuth token from local & remote servers. 2015-12-07 20:25:47 +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
hasuniea
17c6cf6498 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-07 09:34:38 +05:30
harshanl
830612b293 Merge branch 'pasindujw-master' 2015-12-03 20:20:43 +05:30
harshanl
5b9c44655d Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master 2015-12-03 20:20:26 +05:30
harshanl
30e8dc885c Fixed EMM-1034 2015-12-03 20:13:10 +05:30
pasinduj
9c7ebdafdb modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference 2015-12-03 18:30:45 +05:30
inosh-perera
b5a6280c8d refactoring comments 2015-12-03 11:28:12 +05:30
hasuniea
0c791e408f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-03 10:43:22 +05:30
inosh-perera
d4403c6d87 adding new table to h2 script 2015-12-03 10:16:10 +05:30
inosh-perera
ff6e316406 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-02 07:55:58 +05:30
inosh-perera
3b1a3073f5 certificate persistance and ritrival from the database 2015-12-02 07:55:35 +05:30
hasuniea
ead5990309 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-01 17:24:49 +05:30
harshanl
73906f7cda Fixed EMM-1003 2015-11-30 22:20:33 +05:30
harshanl
d95a198ad6 Fixed EMM-1001 2015-11-30 19:56:47 +05:30
hasuniea
a99737ea07 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-27 10:10:35 +05:30
Kasun Delgolla
d779022123 Merge pull request #48 from Kamidu/master
Fix for the Jira Issue EMM-989 and EMM-988
2015-11-26 16:16:30 +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
hasuniea
8d14de91d8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-23 12:24:16 +05:30
manoj
cd33b2bb4e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-20 22:14:27 +05:30
manoj
e1dc3d2ea3 add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation 2015-11-20 22:14:18 +05:30
geethkokila
fe04f5b51e Adding the source control management id 2015-11-20 19:51:45 +05:30
manoj
99f82e4817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-20 12:52:32 +05:30
harshanl
b4d17b888b fixed secondary user-store related issues & multi-tenancy issues 2015-11-20 00:43:01 +05:30
geethkokila
c1eea6894d Fixing the feature remove from the policy 2015-11-19 14:45:08 +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
Geeth
18682291e7 Merge pull request #47 from dilee/master
Fixed Postgresql Related Issues
2015-11-18 22:27:22 +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
hasuniea
30acecda8c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-18 14:38:03 +05:30
Geeth
a91e3056c7 Merge pull request #46 from dilee/master
Refactored Enrollment DAO class
2015-11-17 20:10:37 +05:30
Dileesha Rajapakse
8bd9295f81 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 19:28:40 +05:30
Dileesha Rajapakse
f3cfb79bac Refactored Operation DAO classes 2015-11-17 19:28:32 +05:30