Commit Graph

1738 Commits

Author SHA1 Message Date
Kamidu Sachith
7b544f3545 Fix the disable failier of the authenticator 2015-12-18 15:26:26 +05:30
hasuniea
f176f73067 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 12:46:54 +05:30
Prabath Abeysekara
8204ceec05 Merge pull request #92 from dilee/master
Fixed EMM-1103
2015-12-18 11:27:09 +05:30
hasuniea
8d6ab7160f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 17:05:31 +05:30
Dileesha Rajapakse
eb680da572 Fixed EMM-1103 2015-12-17 14:57:28 +05:30
harshanl
91ece82eca Updated operation DAO to sort data in DESC order of timestamp. 2015-12-17 12:52:42 +05:30
pasinduj
3899e8779f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 11:50:21 +05:30
hasuniea
a251b5d84e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 10:37:11 +05:30
harshanl
d4b6ba5e36 Added pagination support for operation management apis. 2015-12-17 10:32:06 +05:30
pasinduj
ddefa19e0f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 09:41:19 +05:30
Kasun Delgolla
d5f87f4dc1 Committing policy compliance monitoring issue 2015-12-16 14:38:32 +05:30
hasuniea
eaca364b0e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-14 10:12:45 +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
geethkokila
93a295f8a7 Fixing the dynamic imports 2015-12-10 18:25:45 +05:30
harshanl
8a698b1b81 Removed staging repo 2015-12-10 17:32:23 +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
harshanl
20a03c42fc Merged with master 2015-12-10 16:52:35 +05:30
harshanl
89e6f0786d Refactored dynamic-client module to use remote services. 2015-12-10 16:50:33 +05:30
Harshan Liyanage
e4390f77e3 Merge pull request #61 from dilee/master
Fixed syntax errors in sequence creation
2015-12-10 15:32:48 +05:30
Dileesha Rajapakse
96366de4dd Fixed syntax errors in sequence creation 2015-12-10 15:30:17 +05:30
pasinduj
e986518ce1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 11:45:35 +05:30
pasinduj
4656a9eae7 modified all dbscripts removing a foriegn key 2015-12-10 11:43:44 +05:30
geethkokila
4acd3411b4 Changing the identity version 2015-12-10 11:19:15 +05:30
hasuniea
1d578bc7c1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 10:02:19 +05:30
pasinduj
a9a502ac74 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 09:15:17 +05:30
geethkokila
5e40035c4b Fixing the build failure - forgot to commit to this file 2015-12-09 20:26:08 +05:30
geethkokila
49ae3298f4 Fixing the build failure due to neethi bundle being plugged in to web app lib folder 2015-12-09 20:06:28 +05:30
geethkokila
ba7acabb04 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-09 20:03:07 +05:30
geethkokila
865f5a500e Fixing the build failure due to neethi bundle being plugged in to web app lib folder 2015-12-09 20:02:58 +05:30
Geeth
4c5adfc237 Merge pull request #55 from Kamidu/master
Handle dependency in dynamic client registration
2015-12-09 16:11:15 +05:30
Kamidu Sachith
6f57200864 Hanlde dependancy in dynamic client registration by removing recursive dependancy 2015-12-09 14:40:33 +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
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