GPrathap
|
78475963e3
|
added entry for websocket url
|
9 years ago |
inoshperera
|
deb4195f7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
inoshperera
|
a40e44899a
|
syncing REST apis of core and product EMM
|
9 years ago |
Ruwan
|
98f8ace1ff
|
Merge pull request #274 from rasika90/master
Adding licence headers for server-side handlebar templates
|
9 years ago |
geethkokila
|
c64a6e0ec5
|
Changing apis to return activity when an operation is added
|
9 years ago |
Rasika Perera
|
d7f4a39075
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
Rasika Perera
|
b879927dc1
|
Adding licence headers for handlebar templates
|
9 years ago |
|
geethkokila
|
afba711969
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
339512e287
|
Updating comments in dashboard analytics feature
|
9 years ago |
|
inoshperera
|
d7fe6d5e96
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
dilanua
|
4663d78060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
dilanua
|
47e17e4a51
|
Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
|
9 years ago |
|
inosh
|
1341884957
|
resolving conflicts
|
9 years ago |
|
inosh
|
60b42715d6
|
syncing admin api from product emm
|
9 years ago |
|
geethkokila
|
16b809b255
|
Fixing the conflicts
|
9 years ago |
|
geethkokila
|
1697a7ce85
|
Doing a partial commit for syncing the code base
|
9 years ago |
|
geethkokila
|
ba25ecc6ef
|
Doing a partial commit for syncing the code base
|
9 years ago |
Prabath Abeysekara
|
830b3fc075
|
Merge pull request #272 from wso2/release-1.1.0
Release 1.1.0 and upgrading the versions
|
9 years ago |
|
dilanua
|
8c4752ede3
|
Adding more comments to dashboard analytics data service interface
|
9 years ago |
|
dilanua
|
975a3b915f
|
Properly layering beans and custom exceptions in dashboard analytics feature
|
9 years ago |
|
dilanua
|
a7c7452e2e
|
Adding final updates to dashboard analytics feature
|
9 years ago |
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
|
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
9 years ago |
|
mharindu
|
65612f724f
|
Fixed compile issue
|
9 years ago |
prabathabey
|
9ec80bfe18
|
Fixing build failures caused by changed introduced to Operation Management APIs
|
9 years ago |
|
dilanua
|
b9a9fb3169
|
Adding class & method comments, constants to dashboard analytics feature
|
9 years ago |
|
Ace
|
ecd386adf0
|
Fixing IOTS-160
|
9 years ago |
|
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
9 years ago |
|
mharindu
|
83c2a1f0ee
|
Fixed issues in api publishing
|
9 years ago |
|
prabathabey
|
5e03c5ed30
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
9 years ago |
sumedharubasinghe
|
067f0a8050
|
Merge pull request #266 from ayyoob/transport
added api application registration filter
|
9 years ago |
|
mharindu
|
bca1b4b059
|
Fixed conflicts
|
9 years ago |
|
mharindu
|
9f93570b29
|
Fixed issues in webapp-publisher
|
9 years ago |
ayyoob
|
ba47af3186
|
added api application registration filter
|
9 years ago |
|
dilanua
|
7051af8d80
|
Adding relevant contextual names for database view names in dashboard analytics feature
|
9 years ago |
|
geethkokila
|
958288f8ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
geethkokila
|
c7dd386c94
|
Adding new apis for device informations
|
9 years ago |
|
dilanua
|
2886ead44b
|
Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
|
9 years ago |
|
mharindu
|
49cb4787c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
|
mharindu
|
82b90522a0
|
Migrated to APIM 5.0.4
|
9 years ago |
|
sumedharubasinghe
|
61ef87c658
|
Merge pull request #265 from rasika90/IOTS-114
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
9 years ago |
|
Rasika Perera
|
bc3f64a77a
|
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
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 |
|
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 |
|
mharindu
|
89026c2b7f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
|
charitha
|
6dc0a9dd38
|
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
|
9 years ago |
|
mharindu
|
9ebf2ab6d9
|
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
|
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 |
|
mharindu
|
5ccc480ddb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
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 |
|
charitha
|
9480c71522
|
Fixed script error
|
9 years ago |
|
charitha
|
e0fc7c4018
|
Fix for https://wso2.org/jira/browse/IOTS-110
|
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 |
|
charitha
|
e7c5ef78d0
|
Removed unnecessary jaggery apis
|
9 years ago |
|
mharindu
|
b77f5358e8
|
Removed external dependancies from webapp publisher component
|
9 years ago |
|
mharindu
|
83ec18c38d
|
Removed external dependancies from webapp publisher component
|
9 years ago |
|
mharindu
|
c68b92c7b4
|
Fixed conflicts
|
9 years ago |
|
mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
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 |
|
charitha
|
685c52a453
|
Bug fixes
|
9 years ago |
|
Ace
|
cbc505c459
|
changing profile name
|
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 |
|
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 |
|
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 |
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 |
|
Madhawa Perera
|
e75afb8020
|
Adding swagger annotations to beans
|
9 years ago |
|
ayyoob
|
48912a05bb
|
merged with upstream
|
9 years ago |
|
prabathabey
|
9e4b4d2205
|
Improving swagger annotations
|
9 years ago |
|
ayyoob
|
bee9a106cc
|
removed method and type from feature
|
9 years ago |
|
inoshperera
|
50b5661a74
|
Merge pull request #245 from madhawap/master
Added swagger annotations to beans
|
9 years ago |
|
Madhawa Perera
|
fca80273bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
|
inosh-perera
|
b2383617e1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
inosh-perera
|
0cf0ec6e77
|
adding swagger annotations to APIs
|
9 years ago |
|
Madhawa Perera
|
6227e93d2f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
|
Madhawa Perera
|
087adafeb7
|
Adding swagger annotations to beans
|
9 years ago |
|
geethkokila
|
ccea046240
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
geethkokila
|
4e4e660fa1
|
Adding the swagger documentation to the activity id resource
|
9 years ago |
|
Madhawa Perera
|
26c10f84ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
|
Madhawa Perera
|
66c12a8b1c
|
Adding swagger annotations to beans
|
9 years ago |
|
geethkokila
|
3bec779e0b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
9 years ago |
|
inosh-perera
|
797c7a02d0
|
adding swagger annotation to beans
|
9 years ago |
|
Madhawa
|
07c5362104
|
Adding swagger annotations to beans and some modifications to api interfaces
|
9 years ago |
|
mharindu
|
ed1eb217ea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
inosh-perera
|
c945d63038
|
fixing issues in swagger dependancy
|
9 years ago |
