Commit Graph

1083 Commits (c3ea1b3be829958ed94a746e6e783a73ca4c97bb)

Author SHA1 Message Date
Ace ecd386adf0 Fixing IOTS-160
8 years ago
mharindu 968cb00f35 Fixed conflicts and merged
8 years ago
mharindu 83c2a1f0ee Fixed issues in api publishing
8 years ago
prabathabey 5e03c5ed30 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
prabathabey a375252a94 Adding pluggable push notification framework
8 years ago
sumedharubasinghe 067f0a8050 Merge pull request #266 from ayyoob/transport
8 years ago
mharindu bca1b4b059 Fixed conflicts
8 years ago
mharindu 9f93570b29 Fixed issues in webapp-publisher
8 years ago
ayyoob ba47af3186 added api application registration filter
8 years ago
dilanua 7051af8d80 Adding relevant contextual names for database view names in dashboard analytics feature
8 years ago
geethkokila 958288f8ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
geethkokila c7dd386c94 Adding new apis for device informations
8 years ago
dilanua 2886ead44b Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
8 years ago
mharindu 49cb4787c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu 82b90522a0 Migrated to APIM 5.0.4
8 years ago
sumedharubasinghe 61ef87c658 Merge pull request #265 from rasika90/IOTS-114
8 years ago
Rasika Perera bc3f64a77a Fixing IOTS-114: the user is unable to deselect a child node permissions
8 years ago
charitha 075b5a8901 Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
8 years ago
sumedharubasinghe 6a69a3a895 Merge pull request #261 from charithag/master
8 years ago
sumedharubasinghe 2f6c1dfbdd Merge pull request #263 from ayyoob/transport
8 years ago
ayyoob c0240c5cbc few fixes in JWT client after testing with multi tenancy
8 years ago
charitha aadf87e5d9 Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
8 years ago
Rasika Perera be970bfc9d Fixing IOTS-117 Domain needs to be marked as a mandatory field
8 years ago
mharindu 89026c2b7f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
charitha 6dc0a9dd38 Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
8 years ago
mharindu 9ebf2ab6d9 Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
8 years ago
charitha ddc47cd862 Fix for https://wso2.org/jira/browse/IOTS-161
8 years ago
charitha 0ccaa9fe81 Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
8 years ago
mharindu 5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
dilanua d5950afe7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua c90f4471a8 Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
8 years ago
charitha 9480c71522 Fixed script error
8 years ago
charitha e0fc7c4018 Fix for https://wso2.org/jira/browse/IOTS-110
8 years ago
charitha 81524ae32c Fix for https://wso2.org/jira/browse/IOTS-156
8 years ago
charitha 3d9ae8d1f6 Fix for https://wso2.org/jira/browse/IOTS-152
8 years ago
charitha e7c5ef78d0 Removed unnecessary jaggery apis
8 years ago
mharindu b77f5358e8 Removed external dependancies from webapp publisher component
8 years ago
mharindu 83ec18c38d Removed external dependancies from webapp publisher component
8 years ago
mharindu c68b92c7b4 Fixed conflicts
8 years ago
mharindu 9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
Ruwan 8f0840e3df Merge pull request #254 from ayyoob/transport
8 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
9 years ago
Madhawa Perera 43648e4692 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
9 years ago
Madhawa Perera fca80273bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
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
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
Madhawa 85f485df4c Few changes to interfaces with swagger annotations
9 years ago
Madhawa b6e7827920 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa fffc7f3205 Adding swagger annotations to beans
9 years ago
Hasunie 17f3a10ec4 Merge pull request #243 from hasuniea/master
9 years ago
ayyoob ec7727e8bf removed method and type from features
9 years ago
mharindu fd39b31369 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 1f21144668 Renamed EMM permission to CDMF
9 years ago
hasuniea e633d28013 added annotation for ConfigurationEntry
9 years ago
Madhawa ae13f7f889 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa 707da02c7e Adding swagger annotations to beans
9 years ago
Kasun Delgolla da1a60615c Merge pull request #239 from charithag/master
9 years ago
hasuniea e4dfe63548 code conflicts
9 years ago
hasuniea 1267db52ce added swagger annotations for TenantConfiguration
9 years ago
Milan Perera fb9c824e40 Merge pull request #241 from ayyoob/transport
9 years ago
inoshperera 97db3e42d6 Merge pull request #242 from madhawap/master
9 years ago
inosh-perera 5597c752ac Adding sawgger annotations to admin Jax-rs apis.
9 years ago
Madhawa b407797ab0 added swagger annotation to the interfaces
9 years ago
ayyoob 34f1f4dfe2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
9 years ago
Madhawa 36c3a057dc created interfaces for the api classes in order add swagger definitions
9 years ago
Madhawa f5915cbf5d created interfaces for the api classes in order add swagger definitions
9 years ago
Madhawa 46e0c4ea8b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa 7b04d9f0b0 created interfaces for the api classes in order add swagger definitions
9 years ago
ayyoob ac587c3353 fixes after testing
9 years ago
dilanua bb3bcdfd2d Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature
9 years ago
charitha 18957b0110 Add required jagerry modules for the app
9 years ago
charitha 0c8f1ce770 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago