Hasunie
|
8bb75d291c
|
Avoiding package exporting org.wso2.carbon.device.mgt.core.internal
|
8 years ago |
Hasunie
|
2a9027a15e
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
Imesh Chandrasiri
|
3786ef2636
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
Imesh Chandrasiri
|
0cddd896d4
|
Tooltip fix
|
8 years ago |
kamidu
|
4725eb3c3b
|
chenge the group creating steps
|
8 years ago |
kamidu
|
486e02fd71
|
adding ui changes to the cloud related uis
|
8 years ago |
Hasunie
|
315be0a3c7
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
Rasika Perera
|
9ca552584a
|
Merge pull request #602 from rasika/cloud-3.1.0
Adding tooltips
|
8 years ago |
Rasika Perera
|
b8a1b945bb
|
Adding tooltips
|
8 years ago |
Imesh Chandrasiri
|
9d80fcfd54
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
Imesh Chandrasiri
|
7bc5d35746
|
data table padding fix
|
8 years ago |
Kamidu Sachith Punchihewa
|
4d02f9971e
|
Merge pull request #591 from Kamidu/cloud-3.1.0
enable cloud related configurations to the devicemgt application
|
8 years ago |
Hasunie
|
476e439fe2
|
Fixing the task to get the only device registered tenants
|
8 years ago |
Rasika Perera
|
d92c52b89b
|
Adding cloud error pages for jaggery.conf
|
8 years ago |
Rasika Perera
|
8931478a55
|
Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json
|
8 years ago |
kamidu
|
aba4ceaf76
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
kamidu
|
587f847934
|
ui improvements to device cloud
|
8 years ago |
Imesh Chandrasiri
|
c26d7fd15d
|
Changed device loading icon for device loading page
|
8 years ago |
Imesh Chandrasiri
|
dcb29b7792
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
Imesh Chandrasiri
|
5a7fa99e0a
|
Fix data table icon padding issue
|
8 years ago |
Rasika Perera
|
fbae181f07
|
Fixing footer getting cluttered on /devicemgt/devices/search page
|
8 years ago |
Rasika Perera
|
dd645a9fda
|
Fixing footer getting cluttered on /devicemgt/devices/search page
|
8 years ago |
Imesh Chandrasiri
|
b579870672
|
Data table icon cursor added
|
8 years ago |
Imesh Chandrasiri
|
23edb1de7a
|
Model Popup title space issue fix
|
8 years ago |
Imesh Chandrasiri
|
8bbb612de6
|
Fixing cloud header height issue and theme color
|
8 years ago |
geethkokila
|
f3f7635d3b
|
Fixing the task to get the only the device enrolled tenants
|
8 years ago |
kamidu
|
8a07639d6b
|
Fix responsive issue in clud header
|
8 years ago |
kamidu
|
6e19ec31e3
|
fix url issues in the config.json
|
8 years ago |
kamidu
|
b946eeae74
|
fix url issues in the config.json
|
8 years ago |
kamidu
|
f772b35769
|
enable cloud related configurations to the devicemgt application
|
8 years ago |
kamidu
|
4eaf2b41c8
|
enable cloud related configurations to the devicemgt application
|
8 years ago |
ayyoob
|
018b230b5a
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
ayyoob
|
87910bc92b
|
transferred mutual authenticator to jwt authenticator
|
8 years ago |
kamidu
|
ddef86e226
|
stylish issues
|
8 years ago |
kamidu
|
9cba33a6dc
|
Modification to the header panel
|
8 years ago |
WSO2 Builder
|
b051bd108b
|
[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ce78ac277e
|
[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
|
8 years ago |
lakshani
|
18cb2b3e1f
|
added java doc comments
|
8 years ago |
lakshani
|
a2679fde4c
|
added change device status to device view page
|
8 years ago |
kamidu
|
fd3ff5496c
|
cloud relatd ui fixes
|
8 years ago |
lakshani
|
2d83033b26
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicestatus
|
8 years ago |
lakshani
|
a9a6883adc
|
updated device status button
|
8 years ago |
WSO2 Builder
|
c954731870
|
[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
e68c3d170b
|
[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
|
8 years ago |
Kamidu Sachith Punchihewa
|
681c320542
|
Update user-menu.hbs
|
8 years ago |
Kamidu Sachith Punchihewa
|
00b1f982c6
|
Update user-menu.hbs
|
8 years ago |
ayyoob
|
b7566f4e4a
|
added artifact deployment support through UI
|
8 years ago |
ayyoob
|
0999bb70a0
|
exposed artefact deployment through api
Merged Jasintha’s code
|
8 years ago |
ayyoob
|
274d3e9aeb
|
used jwt grant type instead of saml
|
8 years ago |
Kamidu Sachith Punchihewa
|
559fe98cc9
|
Merge pull request #585 from wso2/master
Cloud ui fixes and the new master fixes
|
8 years ago |
WSO2 Builder
|
54a278a1bc
|
[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3bc46c4d2d
|
[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15
|
8 years ago |
kamidu
|
befa75af9a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
6af09cdd31
|
Remove the defaut black color for icons
|
8 years ago |
WSO2 Builder
|
1bc8f5c28d
|
[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
1483503790
|
[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14
|
8 years ago |
Hasunie
|
54d0d7a5ee
|
Merge pull request #582 from charithag/master-update-swagger-docs
Update swagger docs
|
8 years ago |
kamidu
|
41fd402619
|
DIABLE CLOUD UI IN THE MASTER
|
8 years ago |
kamidu
|
43b0d1f1ce
|
Enable appstore and app publisher
|
8 years ago |
Milan Perera
|
a5f41ef734
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
|
8 years ago |
ayyoob
|
4ec7762a5c
|
made it use the default saml grant type
|
8 years ago |
kamidu
|
4b396cf321
|
enable location without das
|
8 years ago |
charitha
|
8e01a98ded
|
Removed unused Dashboard API
|
8 years ago |
charitha
|
423879bee7
|
Updated swagger docs
|
8 years ago |
charitha
|
3cf797fba6
|
Removed hardcoded device types in swagger docs
|
8 years ago |
WSO2 Builder
|
5dc55bb5b5
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
c7fe9c3a20
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
|
8 years ago |
lakshani
|
3b32635cf9
|
removed unwanted new lines
|
8 years ago |
lakshani
|
bbcdf7aeda
|
removed unwanted new line
|
8 years ago |
lakshani
|
26f2e2d2ae
|
added role query param to getdevices restapis
|
8 years ago |
WSO2 Builder
|
c17bead1fc
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
14100d3cc8
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
|
8 years ago |
GPrathap
|
9cdcb58103
|
uncommenting required fields
|
8 years ago |
GPrathap
|
e7e8cb62b6
|
fixing permission issue when viewing device analytics dashboard
|
8 years ago |
GPrathap
|
47e6f6d292
|
adding username as parameter
|
8 years ago |
Milan Perera
|
2b4a3cde61
|
Fixed conflicts and merged
|
8 years ago |
Milan Perera
|
21d8d14b7e
|
Fixed multy tenancy issues related to android device type
|
8 years ago |
geethkokila
|
713ddbf416
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
geethkokila
|
2988357eb9
|
Changing the task to run for all the tenants
|
8 years ago |
ayyoob
|
b42505c1fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
|
8 years ago |
ayyoob
|
1a7a215441
|
added missing license headers
|
8 years ago |
WSO2 Builder
|
cd7e0feaa6
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
abb150d9bd
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
|
8 years ago |
ayyoob
|
3423ef025d
|
merged with upstream
|
8 years ago |
ayyoob
|
e74b4e23c4
|
removed apim dependency from cdmf
|
8 years ago |
WSO2 Builder
|
002fb8719b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
04f32902fd
|
[maven-release-plugin] prepare release v2.0.10
|
8 years ago |
Rasika Perera
|
704680d68d
|
Fixing null pointer when roles are not specified on creating new user
|
8 years ago |
Rasika Perera
|
9a0ba9137b
|
Fixed permissions issue on grouping
|
8 years ago |
Rasika Perera
|
d723e22a8c
|
Fixed roleUpdate issue
|
8 years ago |
WSO2 Builder
|
5c207897ad
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
233d14edbd
|
[maven-release-plugin] prepare release v2.0.9
|
8 years ago |
Rasika Perera
|
8e6855a203
|
Adding DEFAULT_DEVICE_USER on adding user
|
8 years ago |
Rasika Perera
|
5ce413012e
|
Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN
|
8 years ago |
Rasika Perera
|
5aa8776bfe
|
Fixing iot.analytics.host%:%iot.analytics.https.host => iot.analytics.host%:%iot.analytics.https.port
|
8 years ago |
Rasika Perera
|
42816101bb
|
Merge pull request #566 from wso2/release-2.0.8
Release 2.0.8
|
8 years ago |
Imesh Chandrasiri
|
3983780f7f
|
Fix for multiple advance search element
|
8 years ago |
Imesh Chandrasiri
|
a5d1f70c93
|
git status
|
8 years ago |
Imesh Chandrasiri
|
ef80d62307
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Imesh Chandrasiri
|
9f262c1afb
|
Message container markup fix for advance search
|
8 years ago |
WSO2 Builder
|
eedecf00ed
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ef57fc463b
|
[maven-release-plugin] prepare release v2.0.8
|
8 years ago |
Ayyoob Hamza
|
96f0c633d9
|
Merge pull request #563 from madhawap/release-2.0.x
parameterizing sso config
|
8 years ago |
madhawap
|
348b349a37
|
parameterizing sso config
|
8 years ago |
Rasika Perera
|
212cc52eb2
|
Merge pull request #562 from Kamidu/release-2.0.x
improvements for location view
|
8 years ago |
kamidu
|
eb17093747
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
kamidu
|
bf38ad5f70
|
adding location history to map view
|
8 years ago |
Rasika Perera
|
fb1f7771c4
|
Fixing "process" not found on devicemgt
|
8 years ago |
Rasika Perera
|
b39caade98
|
Adding system params picking up for app-conf.json
|
8 years ago |
Rasika Perera
|
ff2cd32bce
|
Merge pull request #561 from geethkokila/release-2.0.x
Adding the fixes for device search
|
8 years ago |
geethkokila
|
2743bf9458
|
Fixing the security issue due to not using prepared statement
|
8 years ago |
geethkokila
|
7359b4c536
|
Fixing the security issue due to not using prepared statement
|
8 years ago |
kamidu
|
bd75b789c2
|
Enable location histry for android sense
|
8 years ago |
Imesh Chandrasiri
|
bc59ac6819
|
Adding action buttons to listing views
|
8 years ago |
Imesh Chandrasiri
|
ba23e5cfd9
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Imesh Chandrasiri
|
9533bc9ac8
|
Adding advance search to devices page
|
8 years ago |
Rasika Perera
|
e86776eb0b
|
Fixing "process" not found issues
|
8 years ago |
Rasika Perera
|
3ff4e37937
|
Merge pull request #557 from DimalChandrasiri/release-2.0.x
Group detail view responsive issue fix
|
8 years ago |
Rasika Perera
|
6733190760
|
Merge pull request #556 from Kamidu/release-2.0.x
Enable location history
|
8 years ago |
Rasika Perera
|
15a919b8a7
|
Added parameters for configs
|
8 years ago |
Rasika Perera
|
252eb78124
|
Now UI configs supports system parameters with eg. %iot.core.host%
|
8 years ago |
Imesh Chandrasiri
|
75f2015f5a
|
Group detail view responsive issue fix
|
8 years ago |
kamidu
|
fb89476e16
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
kamidu
|
5f5d19fc1e
|
Enable location history
|
8 years ago |
Rasika Perera
|
27e953cda3
|
API subscription permission added to [devicemgt-user] role
|
8 years ago |
inoshperera
|
346fd28814
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
inoshperera
|
0bb04789a6
|
adding permissions necessery for iOS to config.json
|
8 years ago |
Milan Perera
|
f8de4869d9
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Milan Perera
|
e9c3a0c3e8
|
Fixed token expiration issue
|
8 years ago |
sameera910409
|
1bec5e5186
|
fixed user password reset failure issue in iot console
|
8 years ago |
Maninda
|
1f5448c2a0
|
Corrected the caching filter pattern
|
8 years ago |
Imesh Chandrasiri
|
bdfb816ffc
|
Fix for issue where list item operations getting fired even after cancelling list item selection
|
8 years ago |
kamidu
|
bb8985781e
|
removing duplicate methoads
|
8 years ago |
kamidu
|
7698c12d80
|
removing duplicate methoads
|
8 years ago |
kamidu
|
7b3db2bdd6
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Rasika Perera
|
51bd2b5bb6
|
UI improvement: Fixing buttons styles
|
8 years ago |
Rasika Perera
|
60ac0522d8
|
Fixes for XSS attacks
|
8 years ago |
kamidu
|
5de2a233d7
|
Recomended security fixes for data tables
|
8 years ago |
Rasika Perera
|
2b46691405
|
Fixing user menu not showing issue
|
8 years ago |
ayyoob
|
4128e2d355
|
pointed to gateway node
|
8 years ago |
Imesh Chandrasiri
|
ba506183b1
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Imesh Chandrasiri
|
34aac48071
|
Notification bar scroll and trigger issue fix
|
8 years ago |
Rasika Perera
|
68ad05fde2
|
Merge pull request #546 from DimalChandrasiri/release-2.0.x
Fix for multiple popup issue and modal js improvement
|
8 years ago |
ayyoob
|
8a883ccd41
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
ayyoob
|
2a538ff959
|
fixed multi tenant login issue
|
8 years ago |
Maninda
|
8aed7c67a9
|
Added devicemgt web app configs to secure web app
|
8 years ago |
Maninda
|
4fbab80782
|
Added security filters to jaggery.conf
|
8 years ago |
Rasika Perera
|
2206e258d1
|
Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles
|
8 years ago |
Imesh Chandrasiri
|
153e3bb719
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Imesh Chandrasiri
|
6e1e801ea0
|
Fix for multiple popup issue
|
8 years ago |
WSO2 Builder
|
585b9bde4d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d206148841
|
[maven-release-plugin] prepare release v2.0.7
|
8 years ago |
Rasika Perera
|
b9c1141f79
|
Added missing utility module import
|
8 years ago |
Rasika Perera
|
0227d5ccbb
|
Fixing https://wso2.org/jira/browse/IOTS-381
|
8 years ago |
Rasika Perera
|
4549a34083
|
changed [fw-ok] with [fw-success]
|
8 years ago |
ayyoob
|
44d09e09ea
|
few changes after testing the gateway
|
8 years ago |
ayyoob
|
671d931d3e
|
merged with origin after resolving conflicts
|
8 years ago |
ayyoob
|
5b3a8091ec
|
fixed Null pointer exception
|
8 years ago |
Rasika Perera
|
864020f20e
|
Adding ability to add deviceType level scopes
|
8 years ago |
Rasika Perera
|
f57de670ea
|
Adding devices:update into /devices scopes list
|
8 years ago |
Rasika Perera
|
e11d2244f5
|
Fixing scope annotation /enrollment-invite
|
8 years ago |
Rasika Perera
|
63cb0e1fde
|
Adding swagger annotations and scope for /effective-policy
|
8 years ago |
Rasika Perera
|
09aae93fc1
|
Adding perm:admin:certificates:verify scope
|
8 years ago |
ayyoob
|
d4ec0705e7
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
ayyoob
|
cdd144237f
|
removed unused parameter
|
8 years ago |
Milan Perera
|
311fe7810f
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Milan Perera
|
21c50c9a55
|
Fixed NPE occurred due to scope mapping
|
8 years ago |
ayyoob
|
2fbaf31b93
|
fixed permission and assigned environment variables for url context
|
8 years ago |
ayyoob
|
93ae646c50
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
ayyoob
|
de957bec29
|
few changes after testing the cluster
|
8 years ago |
Rasika Perera
|
e05600607a
|
Merge pull request #540 from madawas/release-2.0.x
Refactoring policy view and edit units
|
8 years ago |
Rasika Perera
|
c7d489cf2c
|
Merge pull request #538 from madawas/IOTS-377
IOTS-377 : Fixing VFA icon not visible issue
|
8 years ago |
Rasika Perera
|
9bd409e502
|
Merge pull request #536 from DimalChandrasiri/release-2.0.x
Updating font wso2 to version 1.2.1
|
8 years ago |
Madawa Soysa
|
a28458cf13
|
Refactoring policy view and edit units
Refactored the units policy.view and policy.edit to be consistant with policy.create unit. Related to IOTS-296
|
8 years ago |
Milan Perera
|
f25e82f4ec
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Milan Perera
|
98ea97d890
|
Fixed permissions adding issue
|
8 years ago |
Imesh Chandrasiri
|
957224b905
|
Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x
|
8 years ago |
Imesh Chandrasiri
|
d686a9ea57
|
Updating font wso2 to version 1.2.1 - Commit 2
|
8 years ago |
Madawa Soysa
|
8a7d0bb3aa
|
IOTS-377 : Fixing VFA icon not visible issue
Fixes IOTS-377
|
8 years ago |
Rasika Perera
|
83868303dd
|
Merge branch 'release-2.0.x' into release-2.0.x
|
8 years ago |
Rasika Perera
|
8311828c5d
|
Merge pull request #537 from ayyoob/release-2.0.x
updated ui config
|
8 years ago |
Imesh Chandrasiri
|
f1954c4f10
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
ayyoob
|
0d721a226b
|
updated ui config
|
8 years ago |
Imesh Chandrasiri
|
3230a4e269
|
Updating font wso2 to version 1.2.1
|
8 years ago |
Rasika Perera
|
ef2a1b84a2
|
IOTS-376 : Fixing cannot delete a device
|
8 years ago |
kamidu
|
4588cfbed4
|
Fixing the permission management issue in EMM console
|
8 years ago |
Ace
|
c6d186aa1a
|
Adding missing fix
|
8 years ago |
Ace
|
bd45b27cc9
|
Merging with upstream
|
8 years ago |
Ace
|
643acd7827
|
Adding api for renaming devices
|
8 years ago |
ayyoob
|
471e634790
|
merged with upstream
|
8 years ago |
ayyoob
|
06977295ea
|
merged with upstream
|
8 years ago |
Milan Perera
|
562631cc1d
|
Fixed scopes related issue in SAML Granttype
|
8 years ago |
charitha
|
cb7ff7f66a
|
Change package name to lower case
|
8 years ago |
ayyoob
|
9d5061230c
|
fixing test failures
(cherry picked from commit ac8dae7 )
|
8 years ago |
charitha
|
c909144589
|
Add select2 controller to select roles to share a group
|
8 years ago |
ayyoob
|
ac8dae7ed0
|
fixing test failures
|
8 years ago |
Rasika Perera
|
e1228b408a
|
Removed [httpsWebURL] from config.json
|
8 years ago |
Rasika Perera
|
9afffc6571
|
Merge pull request #530 from charithag/release-2.0.x
Add select2 controller to select roles to share a group
|
8 years ago |
charitha
|
1ad9439162
|
Add select2 controller to select roles to share a group
|
8 years ago |
Rasika Perera
|
250984f438
|
Merge pull request #529 from rasika/merge-master
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
charitha
|
5caa688014
|
Fixed issue in populating server.ip property.
|
8 years ago |
Rasika Perera
|
0acd273ae1
|
Fixing merge conflicts
|
8 years ago |
Rasika Perera
|
83aea1fd01
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# components/apimgt-extensions/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
# components/device-mgt-extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
# components/identity-extensions/pom.xml
# components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
# components/policy-mgt/pom.xml
# components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
# components/webapp-authenticator-framework/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
# features/apimgt-extensions/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
# features/certificate-mgt/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
# features/device-mgt-extensions/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
# features/device-mgt/pom.xml
# features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/pom.xml
# features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
# features/email-sender/pom.xml
# features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
# features/jwt-client/pom.xml
# features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
# features/oauth-extensions/pom.xml
# features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
# features/policy-mgt/pom.xml
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
# features/webapp-authenticator-framework/pom.xml
# pom.xml
|
8 years ago |
WSO2 Builder
|
5411d93103
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3ea83b925a
|
[maven-release-plugin] prepare release v2.0.6
|
8 years ago |
Rasika Perera
|
ebdba19041
|
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
|
8 years ago |
Rasika Perera
|
b4ed33bcd0
|
IOTS-171 : Register form validation message corrected
|
8 years ago |
Rasika Perera
|
4de481e501
|
Merge pull request #521 from rasika/release-2.0.x
UI improvement for Datatables
|
8 years ago |
Rasika Perera
|
d826ba81d0
|
UI improvement for Datatables
|
8 years ago |
Rasika Perera
|
8397b688e9
|
Merge branch 'release-2.0.x' into mutual_ssl_feature
|
8 years ago |
Rasika Perera
|
b4a649bdfa
|
Merge pull request #516 from milanperera/release-2.0.x
Improved permission-scope mapping capabilities
|
8 years ago |
geethkokila
|
739a8bdb69
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
8 years ago |
Rasika Perera
|
1c1da1f5cd
|
Merge pull request #517 from rasika/release-2.0.x
Fixing CDMF version in footer
|
8 years ago |
Rasika Perera
|
ab28d596e7
|
Fixing CDMF version in footer
|
8 years ago |
Milan Perera
|
d51ee711fc
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Rasika Perera
|
79e98a592b
|
Merge pull request #515 from rasika/release-2.0.x
Replaced [EMM] with [IoT Server]
|
8 years ago |
Milan Perera
|
228848075c
|
Fixed conflicts and merged
|
8 years ago |
Rasika Perera
|
e501724c3c
|
Replaced [EMM] with [IoT Server]
|
8 years ago |
Rasika Perera
|
7af63522f2
|
Fixed quick startup guide doc url
|
8 years ago |
Milan Perera
|
42a587904f
|
Fixed issues in permission-scope mapping
|
8 years ago |
geethkokila
|
9200adebed
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
8 years ago |
charitha
|
d65557e03e
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
charitha
|
e6e39532b7
|
Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements
|
8 years ago |
Rasika Perera
|
3472090d1b
|
Merge pull request #513 from ruwany/wip
Fixing device listing issue
|
8 years ago |
Ace
|
6a69d8cf4b
|
merging with upstream
|
8 years ago |
Ace
|
b83479b214
|
Fixing device listing issue
|
8 years ago |
Milan Perera
|
637c014866
|
Refactored scope strings
|
8 years ago |
Milan Perera
|
157ef998a6
|
Resolved conflicts and merged
|
8 years ago |
Milan Perera
|
e0ee2fc1e5
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
ayyoob
|
b20a2e0997
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Chatura Dilan
|
e0627bf748
|
Merge pull request #509 from rasika/release-2.0.x
Fixing https://wso2.org/jira/browse/IOTS-362
|
8 years ago |
GPrathap
|
5d1435c7bc
|
renamed permission string
|
8 years ago |
Rasika Perera
|
25a35dcf20
|
Changing title [WSO2 IoT] into [WSO2 IoT Server]
|
8 years ago |
Rasika Perera
|
7612f064fe
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Maninda
|
00a5a07373
|
Fixed some security issues found after running FindBugs security scan.
|
8 years ago |
Milan Perera
|
f3409adc21
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Milan Perera
|
2a4a636eb4
|
Resolved conflicts and merged
|
8 years ago |
Milan Perera
|
d13dadff08
|
Renamed prefix of scopes
|
8 years ago |
GPrathap
|
0bd7b90e9a
|
added scope annotation
|
8 years ago |
ayyoob
|
db2ddc7bed
|
policy manager refactored to support tenancy
|
8 years ago |
Milan Perera
|
7b8a7c0b52
|
Merge pull request #1 from GPrathap/release-2.0.x
removed setting APIs secured as default.
|
8 years ago |
Maninda
|
0fb5a577b8
|
Fixed some issues found in FindBugs security analysis.
|
8 years ago |
Rasika Perera
|
235b41c9df
|
config.json [usernameLength] moved to [userValidationConfig][usernameLength]
|
8 years ago |
Rasika Perera
|
2a7e62f857
|
config.json [apimgt-gateway] renamed to [gatewayEnabled]
|
8 years ago |
Rasika Perera
|
e5062abcc2
|
Removed unneccesary configs
|
8 years ago |
charitha
|
f6f99ed06a
|
Fixed following issues:
https://wso2.org/jira/browse/IOTS-271
|
8 years ago |
Milan Perera
|
b860be0150
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
geethkokila
|
65cb12b5ac
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
8 years ago |
charitha
|
295921b289
|
Fixed following issues:
https://wso2.org/jira/browse/IOTS-218
https://wso2.org/jira/browse/IOTS-236
https://wso2.org/jira/browse/IOTS-263
https://wso2.org/jira/browse/IOTS-173
|
8 years ago |
Milan Perera
|
02d75b757c
|
Fixed conflicts and merged
|
8 years ago |