Ace
|
6d9f2f92a4
|
Making API publish destination configurable
|
2016-05-15 01:12:45 +05:30 |
|
ayyoob
|
b3075cf1bc
|
removing application related roles
|
2016-05-14 00:10:39 +05:30 |
|
ayyoob
|
51d46213c2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
2016-05-13 15:03:11 +05:30 |
|
charitha
|
973e1ce40f
|
Fix issues in group api
|
2016-05-13 13:52:35 +05:30 |
|
charitha
|
0a838923cb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java
|
2016-05-13 12:43:53 +05:30 |
|
Madhawa Perera
|
43648e4692
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 08:07:44 +05:30 |
|
Madhawa Perera
|
b5741b420c
|
Adding swagger annotations to beans
|
2016-05-13 08:07:28 +05:30 |
|
prabathabey
|
71180e686e
|
Improving swagger annotations
|
2016-05-13 07:39:09 +05:30 |
|
prabathabey
|
a0dbb25824
|
Fixing code conflicts and improving swagger annotations
|
2016-05-13 07:12:03 +05:30 |
|
Madhawa Perera
|
e75afb8020
|
Adding swagger annotations to beans
|
2016-05-13 07:07:55 +05:30 |
|
ayyoob
|
48912a05bb
|
merged with upstream
|
2016-05-13 05:23:19 +05:30 |
|
prabathabey
|
9e4b4d2205
|
Improving swagger annotations
|
2016-05-13 04:02:42 +05:30 |
|
ayyoob
|
bee9a106cc
|
removed method and type from feature
|
2016-05-13 02:53:08 +05:30 |
|
Madhawa Perera
|
94aacb1625
|
Adding swagger annotations to beans
|
2016-05-13 02:38:10 +05:30 |
|
Madhawa Perera
|
fca80273bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 01:39:43 +05:30 |
|
Madhawa Perera
|
5d1bf67630
|
Adding swagger annotations to beans
|
2016-05-13 01:31:33 +05:30 |
|
inosh-perera
|
b2383617e1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-13 01:30:22 +05:30 |
|
inosh-perera
|
0cf0ec6e77
|
adding swagger annotations to APIs
|
2016-05-13 01:30:17 +05:30 |
|
Madhawa Perera
|
6227e93d2f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 01:25:44 +05:30 |
|
Madhawa Perera
|
087adafeb7
|
Adding swagger annotations to beans
|
2016-05-13 01:25:29 +05:30 |
|
geethkokila
|
ccea046240
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-13 01:10:10 +05:30 |
|
geethkokila
|
4e4e660fa1
|
Adding the swagger documentation to the activity id resource
|
2016-05-13 01:09:56 +05:30 |
|
Madhawa Perera
|
26c10f84ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 00:34:54 +05:30 |
|
Madhawa Perera
|
66c12a8b1c
|
Adding swagger annotations to beans
|
2016-05-13 00:34:38 +05:30 |
|
geethkokila
|
3bec779e0b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-13 00:27:27 +05:30 |
|
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
2016-05-13 00:25:13 +05:30 |
|
inosh-perera
|
797c7a02d0
|
adding swagger annotation to beans
|
2016-05-13 00:24:59 +05:30 |
|
Madhawa
|
07c5362104
|
Adding swagger annotations to beans and some modifications to api interfaces
|
2016-05-12 23:11:23 +05:30 |
|
inosh-perera
|
c945d63038
|
fixing issues in swagger dependancy
|
2016-05-12 23:01:21 +05:30 |
|
Madhawa
|
85f485df4c
|
Few changes to interfaces with swagger annotations
|
2016-05-12 22:19:17 +05:30 |
|
Madhawa
|
b6e7827920
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-12 22:12:35 +05:30 |
|
Madhawa
|
fffc7f3205
|
Adding swagger annotations to beans
|
2016-05-12 22:12:23 +05:30 |
|
Hasunie
|
17f3a10ec4
|
Merge pull request #243 from hasuniea/master
added annotation for ConfigurationEntry
|
2016-05-12 22:04:56 +05:30 |
|
ayyoob
|
ec7727e8bf
|
removed method and type from features
|
2016-05-12 22:01:48 +05:30 |
|
hasuniea
|
e633d28013
|
added annotation for ConfigurationEntry
|
2016-05-12 22:00:09 +05:30 |
|
Madhawa
|
ae13f7f889
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-12 21:58:34 +05:30 |
|
Madhawa
|
707da02c7e
|
Adding swagger annotations to beans
|
2016-05-12 21:58:23 +05:30 |
|
Kasun Delgolla
|
da1a60615c
|
Merge pull request #239 from charithag/master
Fixed https://wso2.org/jira/browse/IOTS-104
|
2016-05-12 21:49:13 +05:30 |
|
hasuniea
|
e4dfe63548
|
code conflicts
|
2016-05-12 21:15:53 +05:30 |
|
hasuniea
|
1267db52ce
|
added swagger annotations for TenantConfiguration
|
2016-05-12 21:11:51 +05:30 |
|
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
|
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 |
|