Commit Graph

2111 Commits

Author SHA1 Message Date
Milan Perera
fb9c824e40 Merge pull request #241 from ayyoob/transport
Few fixes after testing
2016-05-12 20:26:56 +05:30
inoshperera
97db3e42d6 Merge pull request #242 from madhawap/master
Added swagger annotations to the interfaces
2016-05-12 20:24:42 +05:30
inosh-perera
5597c752ac Adding sawgger annotations to admin Jax-rs apis. 2016-05-12 20:17:20 +05:30
Madhawa
783d5e1746 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
added swagger annotation to the interfaces
2016-05-12 20:17:09 +05:30
Madhawa
b407797ab0 added swagger annotation to the interfaces 2016-05-12 20:16:52 +05:30
ayyoob
42dde2c8eb updated property 2016-05-12 19:17:31 +05:30
ayyoob
df473e4284 revert back 2016-05-12 13:49:32 +05:30
ayyoob
34f1f4dfe2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-05-12 13:41:08 +05:30
inoshperera
cdb91924e2 Merge pull request #240 from madhawap/master
Interfaces for the existing api classes in order to add swagger definitions
2016-05-12 11:37:43 +05:30
Madhawa
36c3a057dc created interfaces for the api classes in order add swagger definitions 2016-05-12 11:25:20 +05:30
inosh-perera
db5dafa9e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-12 10:38:07 +05:30
inosh-perera
67b210fe86 adding mutual ssl support in clustered setup 2016-05-12 10:37:58 +05:30
Madhawa
f5915cbf5d created interfaces for the api classes in order add swagger definitions 2016-05-12 10:32:49 +05:30
Madhawa
46e0c4ea8b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Created interfaces for the api classes in order to add swagger definitions.
2016-05-12 09:52:33 +05:30
Madhawa
7b04d9f0b0 created interfaces for the api classes in order add swagger definitions 2016-05-12 09:51:43 +05:30
ayyoob
ac587c3353 fixes after testing 2016-05-12 02:42:29 +05:30
dilanua
bb3bcdfd2d Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature 2016-05-11 20:01:02 +05:30
charitha
18957b0110 Add required jagerry modules for the app 2016-05-11 19:30:55 +05:30
charitha
0c8f1ce770 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-11 16:54:06 +05:30
dilanua
e151bca0c7 Adding device-identification attribute for database views in dashboard analytics feature 2016-05-11 16:25:00 +05:30
charitha
73222e347b Fixed https://wso2.org/jira/browse/IOTS-104 2016-05-11 15:59:35 +05:30
hasuniea
a675c02350 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-11 15:23:39 +05:30
dilanua
14c07846b2 Adding mssql support to dashboard analytics feature 2016-05-11 14:21:13 +05:30
prabathabey
285c870d6a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-11 12:40:28 +05:30
charitha
6edc2b239f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-11 12:39:50 +05:30
prabathabey
bc894f2517 Adding Swagger-annotation dependency to carbon-device-mgt 2016-05-11 12:38:15 +05:30
dilanua
754195bee6 Adding mssql support to dashboard analytics feature 2016-05-11 12:01:39 +05:30
hasuniea
c98a162174 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-11 11:36:12 +05:30
Dilan U. Ariyaratne
c9eed309aa Merge pull request #238 from dilee/master
Fixed errors in MSSQL DB script
2016-05-11 11:08:14 +05:30
Dileesha Rajapakse
e055519d4c Fixed errors in MSSQL DB script 2016-05-11 11:02:43 +05:30
mharindu
b58e2b13c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-11 10:50:46 +05:30
mharindu
5ad8d2938e Fixed issues of publishing APIs to synapse gateway 2016-05-11 10:50:32 +05:30
Ruwan
93b1d618b6 Merge pull request #237 from charithag/master
Enable group analytics
2016-05-10 21:45:39 +05:30
charitha
576a7d83ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-10 21:33:46 +05:30
charitha
7ff993a7b7 Enable group analytics 2016-05-10 21:31:51 +05:30
dilanua
4cabe359a0 Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature 2016-05-10 18:53:41 +05:30
dilanua
0534cd0a7e Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature 2016-05-10 18:52:44 +05:30
dilanua
adec59e934 Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature 2016-05-10 15:26:20 +05:30
Prabath Abeysekara
400f2bb7b4 Merge pull request #236 from dilee/master
Fixed issues in Oracle DB script
2016-05-10 15:01:51 +05:30
Dileesha Rajapakse
cb5736854a Fixed issues in Oracle DB script 2016-05-10 14:58:02 +05:30
dilanua
2a9e2a47e8 Adding inter-mediate code improvements to dashboard analytics feature 2016-05-10 07:26:49 +05:30
Geeth
c1edc9e444 Merge pull request #235 from dilee/master
Fixed errors in PostgreSQL script
2016-05-09 14:40:03 +05:30
Dileesha Rajapakse
de08e96646 Fixed errors in PostgreSQL script 2016-05-09 14:35:45 +05:30
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
hasuniea
ddc87d6726 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-09 11:12:57 +05:30
ayyoob
c165156dcd remove imports 2016-05-09 01:05:08 +05:30
dilanua
a23e578537 Adding inter-mediate development code bits for dashboard analytics feature 2016-05-08 17:43:05 +05:30
dilanua
17e958d838 Adding inter-mediate development code bits for dashboard analytics feature 2016-05-08 17:42:01 +05:30