prabathabey
|
fbf213f77c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
20fd2ec768
|
Improving application installation/uninstallation handling
|
9 years ago |
hasuniea
|
9c3c08b4ca
|
fix UnAuthorizedDeviceAccessException.java
|
9 years ago |
prabathabey
|
af58e5ec88
|
Code cleanup
|
9 years ago |
prabathabey
|
5ed982beb4
|
Adding more improvements to the JAX-RS APIs of CDM-F
|
9 years ago |
prabathabey
|
fd7a137b07
|
Improving jax-rs APIS of CDM-F
|
9 years ago |
hasuniea
|
20343d9349
|
fixed swagger message issue
|
9 years ago |
prabathabey
|
726a700528
|
Improving error handling in checking for monitoring frquency
|
9 years ago |
prabathabey
|
6e5148a374
|
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
|
9 years ago |
mharindu
|
71eb657e52
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
prabathabey
|
54f9d02ebb
|
Code cleanup
|
9 years ago |
prabathabey
|
77d4c167af
|
code cleanup
|
9 years ago |
geethkokila
|
b7da99a621
|
Adding activity apis to get the updated once after a given time
|
9 years ago |
prabathabey
|
2925f52cd8
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
6d50ba14b1
|
Code cleanup
|
9 years ago |
inoshperera
|
db3dc0517b
|
adding activity status related details.
|
9 years ago |
prabathabey
|
e1dfecb518
|
Changing the value of If-Modified-Since header as a string
|
9 years ago |
prabathabey
|
76ec7bdc28
|
Improving swagger metada
|
9 years ago |
prabathabey
|
425c0e7498
|
Improving swagger annotations of CDM-F core APIs further
|
9 years ago |
geethkokila
|
ed0da9e1d0
|
Fixing the device informations to get the applications
|
9 years ago |
prabathabey
|
95458ce9b0
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
d92fb53dc9
|
Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do
|
9 years ago |
geethkokila
|
ecc8b5e6f2
|
Fixing the api issues
|
9 years ago |
geethkokila
|
0221782533
|
Adding new apis for getting the device location when list of device identifiers are supplied
|
9 years ago |
geethkokila
|
62c84319d8
|
Fixing the device search for application list
|
9 years ago |
prabathabey
|
88cab5abf5
|
Fixing commit conflicts
|
9 years ago |
prabathabey
|
37aa05f79c
|
Committing improved swagger annotated cdm-f APIs
|
9 years ago |
dilanua
|
f4f47cbfdd
|
Changing view names to fix oracle naming issues in dashboard analytics feature
|
9 years ago |
geethkokila
|
6328d35797
|
Changing the device info object by adding the application list
|
9 years ago |
inoshperera
|
3c73217e96
|
fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
|
9 years ago |
inoshperera
|
1ffbb2183a
|
adding permissions for DM services
|
9 years ago |
prabathabey
|
0b9c64594c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
32cb32b706
|
modifying the name of the device management admin api war
|
9 years ago |
inoshperera
|
4623fa2269
|
swagger annotations added to APIs
|
9 years ago |
prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
9 years ago |
prabathabey
|
ebefd60533
|
Renaming TenantConfiguration as PlatformConfiguration
|
9 years ago |
ayyoob
|
e8b9f03748
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
Milan Perera
|
4462c353b4
|
Merge pull request #277 from ayyoob/transport
Fixed https://wso2.org/jira/browse/IOTS-177
|
9 years ago |
geethkokila
|
86e564713d
|
Adding the changes for getting activity ids which are changes after a certain time
|
9 years ago |
geethkokila
|
01e3cc4987
|
Fixing the activity related issues
|
9 years ago |
prabathabey
|
6d33d7036b
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
0f5cf86d04
|
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
|
9 years ago |
ayyoob
|
5532db6dd4
|
Fixed https://wso2.org/jira/browse/IOTS-177
|
9 years ago |
inoshperera
|
aeec472805
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
inoshperera
|
2959c05e1a
|
adding swagger annotations for device and activity APIs.
|
9 years ago |
mharindu
|
52388ed33d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
mharindu
|
106be76118
|
Fixed issues of API publishing to gateway
|
9 years ago |
prabathabey
|
7e8f38cf16
|
Fixing conflicts while merging the latest changes in master
|
9 years ago |
prabathabey
|
e7bf0c7658
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
prabathabey
|
8b9cf0da85
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
prabathabey
|
29b3b965b0
|
Making all CDM-F REST APIs compatible with the REST API specifications
|
9 years ago |
Milan Perera
|
67e5a5a23a
|
Merge pull request #275 from GPrathap/master
added a bundleDef :net.minidev:json-smart
|
9 years ago |
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 |
mharindu
|
50d35a90f8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
mharindu
|
66ccad65cf
|
Partial commit for APIM Gateway migration
|
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 |
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
Adding swagger annotations to beans
|
9 years ago |
Madhawa
|
fffc7f3205
|
Adding swagger annotations to beans
|
9 years ago |
Hasunie
|
17f3a10ec4
|
Merge pull request #243 from hasuniea/master
added annotation for ConfigurationEntry
|
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
Adding swagger annotations to beans
|
9 years ago |
Madhawa
|
707da02c7e
|
Adding swagger annotations to beans
|
9 years ago |
Kasun Delgolla
|
da1a60615c
|
Merge pull request #239 from charithag/master
Fixed https://wso2.org/jira/browse/IOTS-104
|
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
Few fixes after testing
|
9 years ago |
inoshperera
|
97db3e42d6
|
Merge pull request #242 from madhawap/master
Added swagger annotations to the interfaces
|
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
Created interfaces for the api classes in order to add swagger definitions.
|
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 |
charitha
|
73222e347b
|
Fixed https://wso2.org/jira/browse/IOTS-104
|
9 years ago |
dilanua
|
14c07846b2
|
Adding mssql support to dashboard analytics feature
|
9 years ago |
prabathabey
|
285c870d6a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
bc894f2517
|
Adding Swagger-annotation dependency to carbon-device-mgt
|
9 years ago |
mharindu
|
b58e2b13c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
mharindu
|
5ad8d2938e
|
Fixed issues of publishing APIs to synapse gateway
|
9 years ago |
Ruwan
|
93b1d618b6
|
Merge pull request #237 from charithag/master
Enable group analytics
|
9 years ago |
charitha
|
576a7d83ad
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charitha
|
7ff993a7b7
|
Enable group analytics
|
9 years ago |
dilanua
|
4cabe359a0
|
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
|
9 years ago |
dilanua
|
0534cd0a7e
|
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
|
9 years ago |
dilanua
|
adec59e934
|
Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
|
9 years ago |
dilanua
|
2a9e2a47e8
|
Adding inter-mediate code improvements to dashboard analytics feature
|
9 years ago |
dilanua
|
0ab4035b37
|
Adding H2, MySQL Support for dashboard analytics feature
|
9 years ago |
dilanua
|
a23e578537
|
Adding inter-mediate development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
17e958d838
|
Adding inter-mediate development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
7b43d28298
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
d568c6e8bd
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
945e188917
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
82ffcb012b
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
9786908b35
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
Rasika Perera
|
18edc21a04
|
Adding group permissions validation for operations
|
9 years ago |
Rasika Perera
|
5c680b3f65
|
Fixing issue on group permission validating
|
9 years ago |
sumedharubasinghe
|
d7064c9230
|
Merge pull request #233 from ayyoob/das-ext
removed unused code
|
9 years ago |
Charitha Goonetilleke
|
ca62c2ef73
|
Fix grouped device listing
|
9 years ago |
Charitha Goonetilleke
|
e01b62086f
|
Fix parameter mismatch
|
9 years ago |
ayyoob
|
442f8c38fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
|
9 years ago |
ayyoob
|
5f302fce63
|
removed unused code and resolved host issues
|
9 years ago |
Charitha Goonetilleke
|
8c62d9d64c
|
Add authorization check for shared devices in groups
|
9 years ago |
Charitha Goonetilleke
|
92784120bd
|
Add group sharing UI functionality
|
9 years ago |
Charitha Goonetilleke
|
d15e52491a
|
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
|
9 years ago |
Rasika Perera
|
33eed1f6cd
|
Adding permissions for roles updating
|
9 years ago |
Rasika Perera
|
b6c33a0aec
|
Fixing group roles listing
|
9 years ago |
Charitha Goonetilleke
|
b705352fb7
|
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
|
9 years ago |
Charitha Goonetilleke
|
f74a5b7a59
|
Merge remote-tracking branch 'rasika/master'
|
9 years ago |
Rasika Perera
|
938eda7c46
|
Adding group permissions checking
|
9 years ago |
Rasika Perera
|
9cb24d8cec
|
Adding enum to hold default role to default permissions mapping
|
9 years ago |
Rasika Perera
|
142ab10eea
|
Code refactoring
|
9 years ago |
Rasika Perera
|
64a262d3e4
|
Fixing 404 on groups listing
|
9 years ago |
Rasika Perera
|
4eb588ac60
|
Group Constants moved to common
|
9 years ago |
geethkokila
|
d32e822055
|
Fixing the shutdown errors
|
9 years ago |
Rasika Perera
|
38cdd94f3c
|
Adding group permission checking for Device Access Authorizations
|
9 years ago |
dilanua
|
af973dacc6
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
Rasika Perera
|
07c0aa1045
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
d9015b92a0
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
c828a5264b
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
geethkokila
|
a0d260e6a3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
e2d67fc92c
|
Adding the changes for device search
|
9 years ago |
Kasun Delgolla
|
d1def26602
|
Committing group listing back end pagination UI
|
9 years ago |
dilanua
|
f2f153a2b4
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
geethkokila
|
f2128762f0
|
Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them
|
9 years ago |
geethkokila
|
3396a5066d
|
Adding changes for the updated time of device info and device location
|
9 years ago |
geethkokila
|
d4f2a95972
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
fd531555a3
|
Fix bugs
|
9 years ago |
charithag
|
a2cb6937c1
|
Fix device listing page title
|
9 years ago |
charithag
|
68361f01ed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
aa3e7a9eda
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
b8972c9019
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
geethkokila
|
3dd830c7d0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
6f9851413e
|
Adding the changes for operation activity id
|
9 years ago |
dilanua
|
330e1a1e19
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
46117b4e84
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
mharindu
|
548f71ca2e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
49513ba79b
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
b9be51d50d
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
mharindu
|
6f8bb64e1c
|
Fixed merge conflicts
|
9 years ago |
mharindu
|
ffc7542d4d
|
Modified authorization to support API gateway
|
9 years ago |
charithag
|
25ea00f26f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
b1683c1ccb
|
Add capability to assign device in to a group and bug fixes
|
9 years ago |
dilanua
|
053d14b317
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
Ace
|
a06327b731
|
refactoring and bug fixes
|
9 years ago |
geethkokila
|
5a77e08fd5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
6e84f0a5a3
|
Fix font issue
|
9 years ago |
charithag
|
2a006684cc
|
Fix formatting
|
9 years ago |
charithag
|
fb52c5845d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
bcbde92143
|
Update new analytics components.
|
9 years ago |
dilanua
|
2a55c50ad1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
2b62eac4f5
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
charithag
|
1e709bc394
|
Update new analytics components and remove obsoletes.
|
9 years ago |
geethkokila
|
4029c86da4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
2fb42518b6
|
Adding the changes for the device group with policy.
|
9 years ago |
charithag
|
f6281c8ef0
|
Add jax-rs endpoints to modify and remove devices.
Update clientside js to work with secured apis
|
9 years ago |
Charitha Goonetilleke
|
15a6e4b63b
|
Fix formatting issues
|
9 years ago |
charithag
|
d8a9b642ff
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
42d11b9d78
|
Add tenant aware dynamic units routing
|
9 years ago |
prabathabey
|
52b81dd3eb
|
Fixing compilation failures
|
9 years ago |
prabathabey
|
f5f177a858
|
Wrapping all device provisioning related info in ProvisioningConfig
|
9 years ago |
Prabath Abeysekara
|
6ddd5db8cc
|
Merge pull request #221 from ayyoob/das-ext
Added device type specific graph loader
|
9 years ago |
prabathabey
|
2133762792
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
95d3b97c5f
|
Code cleanup
|
9 years ago |
ayyoob
|
e0f47cba19
|
Added device type specific graph loader
|
9 years ago |
charithag
|
6d5635465e
|
Add missing UI functionalities
|
9 years ago |
Ruwan
|
f04705dda5
|
Merge pull request #213 from charithag/patch-1
Fix formatting
|
9 years ago |
charithag
|
61b43ce5d8
|
Rename packages in device mgt jax-rs apis
|
9 years ago |
Rasika Perera
|
22031c476c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
646d87968c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
dfb7e9a9c8
|
Fix permissions
|
9 years ago |
prabathabey
|
aef892fece
|
Code cleanup
|
9 years ago |
prabathabey
|
a10a693507
|
Fixing find bugs reported issues
|
9 years ago |
prabathabey
|
f2ba20baeb
|
Code cleanup
|
9 years ago |
prabathabey
|
47572d08f5
|
Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI
|
9 years ago |
Rasika Perera
|
480d6d5b7e
|
Remove redundant log messages
|
9 years ago |
dilanua
|
7027a3553a
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
dilanua
|
2f2e8f391a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
c3bc22519a
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
ayyoob
|
5e1ad22480
|
few changes on download api
|
9 years ago |
ayyoob
|
9f98f538de
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
|
9 years ago |
ayyoob
|
b99d10e075
|
few changes invoker util to support file downloading
|
9 years ago |
dilanua
|
274aa0ecd3
|
Adding temporary development code bits for cdmf-product dashboard feature
|
9 years ago |
dilanua
|
a888cf39c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Ruwan
|
c6fbc8f1fe
|
Merge pull request #216 from GPrathap/master
fixed some bugs which caused while enabling SSO in IoT Server
|
9 years ago |
GPrathap
|
84492d70ac
|
added constants for authentications types
|
9 years ago |
GPrathap
|
55a95cca86
|
bug fixes
|
9 years ago |
Rasika Perera
|
8e7052e012
|
adding JSON strigify on payload if contentType is json
|
9 years ago |
Rasika Perera
|
69e38b3c98
|
adding JSON strigify on payload if contentType is json
|
9 years ago |
Rasika Perera
|
6ec5b7a85a
|
Reading Http Method from Features
|
9 years ago |
Rasika Perera
|
2d44ec234b
|
Now operations are auto generated and supports query params, path params and form params.
|
9 years ago |
Rasika Perera
|
bb33b4ea12
|
Parameterizing Content-Type and Accept headers.
|
9 years ago |
charithag
|
a5a1529853
|
Fix issues in device listing page and device details page
|
9 years ago |
Charitha Goonetilleke
|
05858da548
|
Fix formatting
|
9 years ago |
charithag
|
c0e4c6b461
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
6d8c3e5315
|
Fix default permission issues
|
9 years ago |
charithag
|
516155dae5
|
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
|
9 years ago |
ayyoob
|
afe965e787
|
adding code review changes on JWT and API App registration
|
9 years ago |
dilanua
|
3daa42ca5d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
ab4b61401c
|
Fixing UI and implementation issues occurred after restructuring.
|
9 years ago |
charithag
|
4a72c789f2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
0133cddc68
|
Fixing UI and implementation issues occurred after restructuring.
|
9 years ago |
dilanua
|
c7af1a1e23
|
Adding temporary development code bits of dashboard analytics feature
|
9 years ago |
dilanua
|
ce8d4b53a2
|
Adding temporary development code bits of dashboard analytics feature
|
9 years ago |
Lakshman
|
993a387e7c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
3dc23c5708
|
Fixing UI and implementation issues occurred after restructuring.
|
9 years ago |
charithag
|
06a7fd2f1a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
905f9ae4c1
|
Fixing UI issues occured after restructuring.
|
9 years ago |
Kasun Delgolla
|
4e57e5bc85
|
Committing restructuring mdm-admin + UI merging style fixes
|
9 years ago |
Lakshman
|
551aaf172b
|
formatting change
|
9 years ago |
Lakshman
|
7174d000e0
|
override hash and equals function in Device to avoid duplicates in collections
|
9 years ago |
Ruwan
|
a192bfa85c
|
Merge pull request #207 from rasika90/master
Adding uuf template app into cdmf-base-ui
|
9 years ago |
Rasika Perera
|
3e34aeeff4
|
Fixing "Cannot write to cached file" issue
|
9 years ago |
Rasika Perera
|
5911c873f3
|
Adding uuf template app
|
9 years ago |
Kasun Delgolla
|
04de876265
|
Merge pull request #206 from charithag/master
Restructure group related UIs
|
9 years ago |
charithag
|
99d004b6a6
|
Restructure group related UIs
|
9 years ago |
Prabath Abeysekara
|
30e5666750
|
Merge pull request #205 from charithag/master
Refactor group management
|
9 years ago |
geethkokila
|
d6923a1343
|
Fixing the issue in single condition
|
9 years ago |
mharindu
|
afbfaf4c1d
|
Fixed for EMM-1305
|
9 years ago |
mharindu
|
a2a1e8115d
|
Fixed conflicts and merged
|
9 years ago |
mharindu
|
72591eff44
|
Fixed modify enrollment bug
|
9 years ago |
geethkokila
|
7318502697
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
e60a383f4d
|
Adding fixes to the device search
|
9 years ago |
charithag
|
f6d224a623
|
Refactor group management
|
9 years ago |
charithag
|
d22570dadb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
bf58342d81
|
Refactor group management
|
9 years ago |
Prabath Abeysekara
|
f1081f7029
|
Merge pull request #204 from ayyoob/merge-latest
Merged device type multitenant implementation.
|
9 years ago |
ayyoob
|
3a3e9cc649
|
changed analytics components to released version
|
9 years ago |
ayyoob
|
1b4a9227d8
|
merged web app publisher code and refactored jwt client extension to adhere to new artefact name
|
9 years ago |
geethkokila
|
73a82f743f
|
Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes
|
9 years ago |
ayyoob
|
83057acd9a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
|
9 years ago |
geethkokila
|
fbc7c0807c
|
Skipping the validation of task operations
|
9 years ago |
ayyoob
|
fc725fa767
|
removed analytics
|
9 years ago |
ayyoob
|
81ae512f13
|
Merge pull request #6 from ayyoob/merge-devicetype
merge device type
|
9 years ago |
ayyoob
|
026d4ef018
|
removed analytics
|
9 years ago |
charithag
|
0a8e00fd1e
|
Merged with upstream and resolved conflicts.
|
9 years ago |
charithag
|
3e4ccf6337
|
Add missing features and component from IoTS-1.0.0-M4
|
9 years ago |
geethkokila
|
888971ae39
|
Fixing the oracl and postgres sql datasources and removing the start and end from the search context
|
9 years ago |
charithag
|
2f0a3388a6
|
Implemented missing methods in group management.
|
9 years ago |
geethkokila
|
aa63b5f592
|
Fixing the application memory usage and adding location based search
|
9 years ago |
charithag
|
3fd141acdf
|
Add missing parts and test to group management.
|
9 years ago |
charithag
|
d1ee1fd578
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charithag
|
fa2f61f48a
|
Add missing parts in group management
|
9 years ago |
ayyoob
|
284a6645f0
|
import required packages
|
9 years ago |
ayyoob
|
4554aadd82
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
ayyoob
|
c45895685b
|
Added device type multi tenancy capability.
|
9 years ago |
ayyoob
|
021378df3b
|
added org.wso2.carbon import package
|
9 years ago |
ayyoob
|
e06565728e
|
removed duplicate imports and improper imports
|
9 years ago |
charithag
|
062a843ca2
|
Fix for https://wso2.org/jira/browse/IOTS-99
|
9 years ago |
prabathabey
|
22e579ff15
|
Fixing build failures causde by missing references to certain packages
|
9 years ago |
prabathabey
|
3a7ef33c16
|
Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup
|
9 years ago |
prabathabey
|
284ca1b8e8
|
Removing obsolete source structures
|
9 years ago |
prabathabey
|
12c4ba10af
|
Code cleanup
|
9 years ago |
prabathabey
|
36161f6288
|
Merging extended device management functionalities
|
9 years ago |
prabathabey
|
5e7985dae6
|
merging group-mgt implementation
|
9 years ago |
prabathabey
|
b584131160
|
Fixing build failures in device.mgt.analytics.data.publisher bundle
|
9 years ago |
prabathabey
|
43926b64b4
|
Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher
|
9 years ago |
prabathabey
|
1a43cf6a55
|
Fixing build faliure caused by not adding a package-import upon org.wso2.carbon.base
|
9 years ago |
prabathabey
|
5dcd9dfe4a
|
Merging device analytics feature impl to master
|
9 years ago |
prabathabey
|
e537e2d841
|
Adding device.mgt base ui framework
|
9 years ago |
geethkokila
|
e9da24c9e8
|
Changing the snapshot versions from 1.0.4 to 1.1.0
|
9 years ago |
geethkokila
|
41191d6df0
|
Adding the search feature to device mgt plugin
|
9 years ago |
geethkokila
|
1826c9ee49
|
Doing a partial commit for pull
|
9 years ago |
geethkokila
|
be890c2e9a
|
Doing a partial commit
|
9 years ago |
geethkokila
|
7a809c1c01
|
Doing a partial commit
|
9 years ago |
prabathabey
|
3726a57d96
|
Making email-sender a separate component and code cleanup
|
9 years ago |
prabathabey
|
0b31042aa2
|
More improvements to the email sending functionality
|
9 years ago |
prabathabey
|
535c74a962
|
Improving email sender functionality
|
9 years ago |
Dileesha Rajapakse
|
8ac485d66d
|
Fixed Pagination issues in Device and Operation Oracle DAO classes
|
9 years ago |
Dileesha Rajapakse
|
9204ed900d
|
Fixed Pagination issues in Oracle DAO classes
|
9 years ago |
Kamidu Sachith
|
370badf9d3
|
Preventing infromation leakage
|
9 years ago |
geethkokila
|
e0e0a57c11
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
cebb88e712
|
[maven-release-plugin] prepare release v1.0.3
|
9 years ago |
geethkokila
|
e66d291947
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
f416a73e75
|
[maven-release-plugin] prepare release v1.0.2
|
9 years ago |
geethkokila
|
185a59fbd4
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
b3580d754b
|
[maven-release-plugin] prepare release v1.0.1
|
9 years ago |
prabathabey
|
1fe9371558
|
Fixing https://wso2.org/jira/browse/EMM-1133
|
9 years ago |
prabathabey
|
cbee88c7d0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
77c4c34858
|
Fixing https://wso2.org/jira/browse/EMM-1133
|
9 years ago |
harshanl
|
8d4c09c20f
|
Fixed EMM-1139
|
9 years ago |
harshanl
|
9a7093a0f7
|
Fixed EMM-1146 issue
|
9 years ago |
prabathabey
|
7a27e88551
|
Changing the log levels configured in log4j.properties files used as part of test configurations
|
9 years ago |
geethkokila
|
4e9255fbc9
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
ceb60adb34
|
[maven-release-plugin] prepare release v1.0.0
|
9 years ago |
Kamidu Sachith
|
c6e2c01caa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Kamidu Sachith
|
2d23eb86eb
|
Improve runtime performance
|
9 years ago |
harshanl
|
a61fe6171a
|
Refactored pagination code
|
9 years ago |
Dileesha Rajapakse
|
b25438097e
|
Fixed issues in EnrollmentDAOImpl
|
9 years ago |
harshanl
|
6441c201e5
|
Added search support for pagination
|
9 years ago |
Dileesha Rajapakse
|
eb680da572
|
Fixed EMM-1103
|
9 years ago |
harshanl
|
91ece82eca
|
Updated operation DAO to sort data in DESC order of timestamp.
|
9 years ago |
harshanl
|
d4b6ba5e36
|
Added pagination support for operation management apis.
|
9 years ago |
harshanl
|
30e8dc885c
|
Fixed EMM-1034
|
9 years ago |