Ruwan
|
a8af722199
|
Merge pull request #264 from charithag/master
Fix for IOTS-155 & IOTS-164
|
9 years ago |
charitha
|
075b5a8901
|
Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
|
9 years ago |
sumedharubasinghe
|
6a69a3a895
|
Merge pull request #261 from charithag/master
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
9 years ago |
|
sumedharubasinghe
|
2f6c1dfbdd
|
Merge pull request #263 from ayyoob/transport
few fixes in JWT client after testing with multi tenancy
|
9 years ago |
ayyoob
|
c0240c5cbc
|
few fixes in JWT client after testing with multi tenancy
|
9 years ago |
|
Ruwan
|
361e938d72
|
Merge pull request #262 from rasika90/master
Fixing IOTS-117 Domain needs to be marked as a mandatory field
|
9 years ago |
|
charitha
|
aadf87e5d9
|
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
9 years ago |
Rasika Perera
|
be970bfc9d
|
Fixing IOTS-117 Domain needs to be marked as a mandatory field
|
9 years ago |
|
Ruwan
|
3d870786ae
|
Merge pull request #260 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
|
9 years ago |
|
charitha
|
6dc0a9dd38
|
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
|
9 years ago |
|
Ruwan
|
da4016499e
|
Merge pull request #259 from charithag/master
Fix for IOTS-50, IOTS-112 & IOTS-161
|
9 years ago |
|
charitha
|
ddc47cd862
|
Fix for https://wso2.org/jira/browse/IOTS-161
|
9 years ago |
|
charitha
|
0ccaa9fe81
|
Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
|
9 years ago |
dilanua
|
d5950afe7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
dilanua
|
c90f4471a8
|
Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
|
9 years ago |
|
Ruwan
|
270aaad575
|
Merge pull request #258 from charithag/master
Fixed script error
|
9 years ago |
|
charitha
|
63fa672bb3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
charitha
|
9480c71522
|
Fixed script error
|
9 years ago |
|
sumedharubasinghe
|
4266532638
|
Merge pull request #257 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110
|
9 years ago |
|
charitha
|
25cff47335
|
Moved email templates to emm base plugin as they are related to emm
|
9 years ago |
|
charitha
|
e0fc7c4018
|
Fix for https://wso2.org/jira/browse/IOTS-110
|
9 years ago |
|
Ruwan
|
5d822bb88a
|
Merge pull request #256 from charithag/master
Bug fixes
|
9 years ago |
|
charitha
|
81524ae32c
|
Fix for https://wso2.org/jira/browse/IOTS-156
|
9 years ago |
|
charitha
|
3d9ae8d1f6
|
Fix for https://wso2.org/jira/browse/IOTS-152
|
9 years ago |
|
Ruwan
|
9e5e8e49b6
|
Merge pull request #255 from charithag/master
Removed unnecessary jaggery apis
|
9 years ago |
|
charitha
|
e7c5ef78d0
|
Removed unnecessary jaggery apis
|
9 years ago |
|
Ruwan
|
8f0840e3df
|
Merge pull request #254 from ayyoob/transport
updated authentication in api
|
9 years ago |
|
ayyoob
|
168033b19d
|
updated authentication in api
|
9 years ago |
|
sumedharubasinghe
|
ee29c5e9a8
|
Merge pull request #253 from charithag/master
Bug fixes
|
9 years ago |
|
charitha
|
685c52a453
|
Bug fixes
|
9 years ago |
|
Ruwan
|
080fd5ac97
|
Merge pull request #252 from ruwany/master
changing profile name
|
9 years ago |
|
Ace
|
cbc505c459
|
changing profile name
|
9 years ago |
|
Ruwan
|
e46ca67aa3
|
Merge pull request #251 from ruwany/master
Making device Type API deployment location configurable
|
9 years ago |
|
Ace
|
4517a7f1aa
|
Making API publish destination configurable and other changes
|
9 years ago |
|
Ace
|
6d9f2f92a4
|
Making API publish destination configurable
|
9 years ago |
Milan Perera
|
3bef5155e0
|
Merge pull request #250 from ayyoob/transport
removed method and type from feature definition
|
9 years ago |
|
ayyoob
|
b3075cf1bc
|
removing application related roles
|
9 years ago |
|
ayyoob
|
51d46213c2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
9 years ago |
|
sumedharubasinghe
|
448178f88f
|
Merge pull request #249 from charithag/master
Add required jagerry modules for the app
|
9 years ago |
|
charitha
|
973e1ce40f
|
Fix issues in group api
|
9 years ago |
|
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
|
9 years ago |
inoshperera
|
2512826c63
|
Merge pull request #248 from madhawap/master
Added swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
43648e4692
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
|
Madhawa Perera
|
b5741b420c
|
Adding swagger annotations to beans
|
9 years ago |
prabathabey
|
71180e686e
|
Improving swagger annotations
|
9 years ago |
|
prabathabey
|
a0dbb25824
|
Fixing code conflicts and improving swagger annotations
|
9 years ago |
|
inoshperera
|
bdc4fb5073
|
Merge pull request #247 from madhawap/master
Added swagger annotations to beans
|
9 years ago |
|
Madhawa Perera
|
c531577535
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
|
Madhawa Perera
|
e75afb8020
|
Adding swagger annotations to beans
|
9 years ago |
|
ayyoob
|
48912a05bb
|
merged with upstream
|
9 years ago |
