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 |
