Commit Graph

2124 Commits

Author SHA1 Message Date
mharindu
659cdcc50c Implemented extended scope validator and improved webapp publisher to support Synapse 2016-05-16 11:47:04 +05:30
mharindu
f2ac5c5cad Implemented extended scope validator and improved webapp publisher to support Synapse 2016-05-16 11:46:30 +05:30
Ruwan
8f0840e3df Merge pull request #254 from ayyoob/transport
updated authentication in api
2016-05-15 20:07:02 +05:30
ayyoob
168033b19d updated authentication in api 2016-05-15 17:46:13 +05:30
sumedharubasinghe
ee29c5e9a8 Merge pull request #253 from charithag/master
Bug fixes
2016-05-15 13:15:35 +05:30
charitha
685c52a453 Bug fixes 2016-05-15 13:13:30 +05:30
Ruwan
080fd5ac97 Merge pull request #252 from ruwany/master
changing profile name
2016-05-15 01:36:45 +05:30
Ace
cbc505c459 changing profile name 2016-05-15 01:35:57 +05:30
Ruwan
e46ca67aa3 Merge pull request #251 from ruwany/master
Making device Type API deployment location configurable
2016-05-15 01:19:53 +05:30
Ace
4517a7f1aa Making API publish destination configurable and other changes 2016-05-15 01:15:11 +05:30
Ace
6d9f2f92a4 Making API publish destination configurable 2016-05-15 01:12:45 +05:30
Milan Perera
3bef5155e0 Merge pull request #250 from ayyoob/transport
removed method and type from feature definition
2016-05-14 11:36:35 +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
sumedharubasinghe
448178f88f Merge pull request #249 from charithag/master
Add required jagerry modules for the app
2016-05-13 14:25:44 +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
inoshperera
2512826c63 Merge pull request #248 from madhawap/master
Added swagger annotations to beans
2016-05-13 08:09:54 +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
inoshperera
bdc4fb5073 Merge pull request #247 from madhawap/master
Added swagger annotations to beans
2016-05-13 07:10:25 +05:30
Madhawa Perera
c531577535 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
2016-05-13 07:08:11 +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
inoshperera
29093586e7 Merge pull request #246 from madhawap/master
Added swagger annotations to beans
2016-05-13 02:48:14 +05:30
Madhawa Perera
a76f8dfb8d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Added swagger annotations to beans
2016-05-13 02:38:22 +05:30
Madhawa Perera
94aacb1625 Adding swagger annotations to beans 2016-05-13 02:38:10 +05:30
inoshperera
50b5661a74 Merge pull request #245 from madhawap/master
Added swagger annotations to beans
2016-05-13 01:57:46 +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
inoshperera
0de8646a55 Merge pull request #244 from madhawap/master
Few changes to interfaces with swagger annotations
2016-05-13 01:00:20 +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
mharindu
ed1eb217ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-12 23:03:15 +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