Ayyoob Hamza
|
96f0c633d9
|
Merge pull request #563 from madhawap/release-2.0.x
parameterizing sso config
|
2017-01-20 01:05:19 +05:30 |
|
madhawap
|
348b349a37
|
parameterizing sso config
|
2017-01-20 00:27:36 +05:30 |
|
Rasika Perera
|
212cc52eb2
|
Merge pull request #562 from Kamidu/release-2.0.x
improvements for location view
|
2017-01-19 22:45:38 +05:30 |
|
kamidu
|
eb17093747
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-19 22:37:19 +05:30 |
|
kamidu
|
bf38ad5f70
|
adding location history to map view
|
2017-01-19 22:37:08 +05:30 |
|
Rasika Perera
|
fb1f7771c4
|
Fixing "process" not found on devicemgt
|
2017-01-19 22:36:21 +05:30 |
|
Rasika Perera
|
b39caade98
|
Adding system params picking up for app-conf.json
|
2017-01-19 19:42:41 +05:30 |
|
Rasika Perera
|
3a2b206fe6
|
Fixing certificate management api returns 403 forbidden
|
2017-01-19 19:41:21 +05:30 |
|
Rasika Perera
|
ff2cd32bce
|
Merge pull request #561 from geethkokila/release-2.0.x
Adding the fixes for device search
|
2017-01-19 19:32:39 +05:30 |
|
geethkokila
|
2743bf9458
|
Fixing the security issue due to not using prepared statement
|
2017-01-19 17:51:42 +05:30 |
|
geethkokila
|
7359b4c536
|
Fixing the security issue due to not using prepared statement
|
2017-01-19 17:51:32 +05:30 |
|
kamidu
|
bd75b789c2
|
Enable location histry for android sense
|
2017-01-19 17:43:33 +05:30 |
|
Imesh Chandrasiri
|
bc59ac6819
|
Adding action buttons to listing views
|
2017-01-19 14:08:59 +05:30 |
|
Imesh Chandrasiri
|
ba23e5cfd9
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-19 10:58:47 +05:30 |
|
Imesh Chandrasiri
|
9533bc9ac8
|
Adding advance search to devices page
|
2017-01-19 10:58:05 +05:30 |
|
Rasika Perera
|
e86776eb0b
|
Fixing "process" not found issues
|
2017-01-19 07:41:12 +05:30 |
|
Rasika Perera
|
3ff4e37937
|
Merge pull request #557 from DimalChandrasiri/release-2.0.x
Group detail view responsive issue fix
|
2017-01-19 01:25:19 +05:30 |
|
Rasika Perera
|
6733190760
|
Merge pull request #556 from Kamidu/release-2.0.x
Enable location history
|
2017-01-19 01:24:58 +05:30 |
|
Rasika Perera
|
15a919b8a7
|
Added parameters for configs
|
2017-01-19 00:55:30 +05:30 |
|
Rasika Perera
|
252eb78124
|
Now UI configs supports system parameters with eg. %iot.core.host%
|
2017-01-19 00:55:02 +05:30 |
|
Imesh Chandrasiri
|
75f2015f5a
|
Group detail view responsive issue fix
|
2017-01-18 23:27:16 +05:30 |
|
kamidu
|
fb89476e16
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-18 22:39:07 +05:30 |
|
kamidu
|
5f5d19fc1e
|
Enable location history
|
2017-01-18 22:38:37 +05:30 |
|
Rasika Perera
|
27e953cda3
|
API subscription permission added to [devicemgt-user] role
|
2017-01-18 21:29:54 +05:30 |
|
inoshperera
|
346fd28814
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-18 20:50:55 +05:30 |
|
inoshperera
|
0bb04789a6
|
adding permissions necessery for iOS to config.json
|
2017-01-18 20:48:39 +05:30 |
|
Milan Perera
|
f8de4869d9
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-18 18:15:09 +05:30 |
|
Milan Perera
|
e9c3a0c3e8
|
Fixed token expiration issue
|
2017-01-18 18:14:55 +05:30 |
|
Rasika Perera
|
152ff2965a
|
Merge pull request #552 from Jasintha/release-2.0.x
Fixing firearm policy push notification issue
|
2017-01-18 17:29:00 +05:30 |
|
sameera910409
|
1bec5e5186
|
fixed user password reset failure issue in iot console
|
2017-01-18 14:53:44 +05:30 |
|
Jasintha
|
e8ffe60e8c
|
Fixing firealam policy push notification issue
|
2017-01-18 14:27:05 +05:30 |
|
Maninda
|
1f5448c2a0
|
Corrected the caching filter pattern
|
2017-01-18 12:36:11 +05:30 |
|
Imesh Chandrasiri
|
bdfb816ffc
|
Fix for issue where list item operations getting fired even after cancelling list item selection
|
2017-01-18 11:43:49 +05:30 |
|
kamidu
|
bb8985781e
|
removing duplicate methoads
|
2017-01-18 10:22:11 +05:30 |
|
kamidu
|
7698c12d80
|
removing duplicate methoads
|
2017-01-18 10:07:59 +05:30 |
|
kamidu
|
7b3db2bdd6
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-18 09:59:53 +05:30 |
|
Rasika Perera
|
51bd2b5bb6
|
UI improvement: Fixing buttons styles
|
2017-01-18 08:29:21 +05:30 |
|
Rasika Perera
|
60ac0522d8
|
Fixes for XSS attacks
|
2017-01-18 08:14:17 +05:30 |
|
kamidu
|
5de2a233d7
|
Recomended security fixes for data tables
|
2017-01-18 00:16:18 +05:30 |
|
Rasika Perera
|
2b46691405
|
Fixing user menu not showing issue
|
2017-01-17 20:17:40 +05:30 |
|
Imesh Chandrasiri
|
ba506183b1
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-17 15:09:52 +05:30 |
|
Imesh Chandrasiri
|
34aac48071
|
Notification bar scroll and trigger issue fix
|
2017-01-17 15:09:40 +05:30 |
|
Rasika Perera
|
68ad05fde2
|
Merge pull request #546 from DimalChandrasiri/release-2.0.x
Fix for multiple popup issue and modal js improvement
|
2017-01-17 11:49:05 +05:30 |
|
Maninda
|
8aed7c67a9
|
Added devicemgt web app configs to secure web app
|
2017-01-16 15:00:03 +05:30 |
|
Maninda
|
4fbab80782
|
Added security filters to jaggery.conf
|
2017-01-16 14:40:33 +05:30 |
|
Rasika Perera
|
2206e258d1
|
Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles
|
2017-01-16 09:37:52 +05:30 |
|
Imesh Chandrasiri
|
153e3bb719
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-14 23:53:04 +05:30 |
|
Imesh Chandrasiri
|
6e1e801ea0
|
Fix for multiple popup issue
|
2017-01-14 23:50:34 +05:30 |
|
WSO2 Builder
|
585b9bde4d
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-14 01:50:45 +00:00 |
|
WSO2 Builder
|
d206148841
|
[maven-release-plugin] prepare release v2.0.7
|
2017-01-14 01:46:41 +00:00 |
|
Rasika Perera
|
b9c1141f79
|
Added missing utility module import
|
2017-01-14 07:11:26 +05:30 |
|
Rasika Perera
|
24a7179c4b
|
Merge pull request #544 from geethkokila/release-2.0.x
Adding support for identifying the device type from the url
|
2017-01-13 22:41:07 +05:30 |
|
Rasika Perera
|
0227d5ccbb
|
Fixing https://wso2.org/jira/browse/IOTS-381
|
2017-01-13 18:00:36 +05:30 |
|
Rasika Perera
|
4549a34083
|
changed [fw-ok] with [fw-success]
|
2017-01-13 17:50:18 +05:30 |
|
geethkokila
|
bf8ab0da11
|
Adding support for identifying the device type from the url
|
2017-01-13 16:23:47 +05:30 |
|
ayyoob
|
44d09e09ea
|
few changes after testing the gateway
|
2017-01-13 04:49:17 +05:30 |
|
ayyoob
|
671d931d3e
|
merged with origin after resolving conflicts
|
2017-01-12 23:24:35 +05:30 |
|
ayyoob
|
5b3a8091ec
|
fixed Null pointer exception
|
2017-01-12 23:18:54 +05:30 |
|
Rasika Perera
|
864020f20e
|
Adding ability to add deviceType level scopes
|
2017-01-12 22:42:44 +05:30 |
|
Rasika Perera
|
f57de670ea
|
Adding devices:update into /devices scopes list
|
2017-01-12 22:42:44 +05:30 |
|
Rasika Perera
|
e11d2244f5
|
Fixing scope annotation /enrollment-invite
|
2017-01-12 22:42:44 +05:30 |
|
Rasika Perera
|
63cb0e1fde
|
Adding swagger annotations and scope for /effective-policy
|
2017-01-12 22:42:44 +05:30 |
|
Rasika Perera
|
3cc176c121
|
Fixing permission for certificates:verify
|
2017-01-12 22:42:43 +05:30 |
|
Rasika Perera
|
09aae93fc1
|
Adding perm:admin:certificates:verify scope
|
2017-01-12 22:42:43 +05:30 |
|
Milan Perera
|
d9ea6af775
|
Changed logs to warn
|
2017-01-12 20:26:46 +05:30 |
|
ayyoob
|
d4ec0705e7
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-12 19:09:12 +05:30 |
|
ayyoob
|
cdd144237f
|
removed unused parameter
|
2017-01-12 19:09:01 +05:30 |
|
Milan Perera
|
311fe7810f
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-12 19:02:30 +05:30 |
|
Milan Perera
|
21c50c9a55
|
Fixed NPE occurred due to scope mapping
|
2017-01-12 19:01:57 +05:30 |
|
ayyoob
|
2fbaf31b93
|
fixed permission and assigned environment variables for url context
|
2017-01-12 18:13:43 +05:30 |
|
ayyoob
|
93ae646c50
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-12 11:13:49 +05:30 |
|
ayyoob
|
de957bec29
|
few changes after testing the cluster
|
2017-01-12 11:12:28 +05:30 |
|
Rasika Perera
|
e05600607a
|
Merge pull request #540 from madawas/release-2.0.x
Refactoring policy view and edit units
|
2017-01-11 22:39:53 +05:30 |
|
Rasika Perera
|
c7d489cf2c
|
Merge pull request #538 from madawas/IOTS-377
IOTS-377 : Fixing VFA icon not visible issue
|
2017-01-11 22:33:45 +05:30 |
|
Rasika Perera
|
9bd409e502
|
Merge pull request #536 from DimalChandrasiri/release-2.0.x
Updating font wso2 to version 1.2.1
|
2017-01-11 21:26:03 +05:30 |
|
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
|
2017-01-11 18:34:03 +05:30 |
|
Milan Perera
|
f25e82f4ec
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-11 14:42:08 +05:30 |
|
Milan Perera
|
98ea97d890
|
Fixed permissions adding issue
|
2017-01-11 14:41:54 +05:30 |
|
Imesh Chandrasiri
|
957224b905
|
Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x
|
2017-01-11 14:40:48 +05:30 |
|
Imesh Chandrasiri
|
d686a9ea57
|
Updating font wso2 to version 1.2.1 - Commit 2
|
2017-01-11 14:39:59 +05:30 |
|
Madawa Soysa
|
8a7d0bb3aa
|
IOTS-377 : Fixing VFA icon not visible issue
Fixes IOTS-377
|
2017-01-11 14:03:12 +05:30 |
|
Rasika Perera
|
83868303dd
|
Merge branch 'release-2.0.x' into release-2.0.x
|
2017-01-11 13:26:53 +05:30 |
|
Rasika Perera
|
8311828c5d
|
Merge pull request #537 from ayyoob/release-2.0.x
updated ui config
|
2017-01-11 13:18:04 +05:30 |
|
Imesh Chandrasiri
|
f1954c4f10
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-11 13:06:14 +05:30 |
|
ayyoob
|
0d721a226b
|
updated ui config
|
2017-01-11 12:41:34 +05:30 |
|
Imesh Chandrasiri
|
3230a4e269
|
Updating font wso2 to version 1.2.1
|
2017-01-11 11:11:33 +05:30 |
|
Rasika Perera
|
ef2a1b84a2
|
IOTS-376 : Fixing cannot delete a device
|
2017-01-11 09:12:46 +05:30 |
|
kamidu
|
4588cfbed4
|
Fixing the permission management issue in EMM console
|
2017-01-10 17:22:42 +05:30 |
|
Ace
|
c6d186aa1a
|
Adding missing fix
|
2017-01-10 16:19:57 +05:30 |
|
Ace
|
bd45b27cc9
|
Merging with upstream
|
2017-01-10 16:17:58 +05:30 |
|
Ace
|
643acd7827
|
Adding api for renaming devices
|
2017-01-10 16:16:31 +05:30 |
|
ayyoob
|
471e634790
|
merged with upstream
|
2017-01-10 12:11:03 +05:30 |
|
ayyoob
|
06977295ea
|
merged with upstream
|
2017-01-10 12:00:13 +05:30 |
|
Milan Perera
|
562631cc1d
|
Fixed scopes related issue in SAML Granttype
|
2017-01-10 11:36:45 +05:30 |
|
charitha
|
cb7ff7f66a
|
Change package name to lower case
|
2017-01-10 10:18:28 +05:30 |
|
ayyoob
|
9d5061230c
|
fixing test failures
(cherry picked from commit ac8dae7)
|
2017-01-10 10:15:14 +05:30 |
|
charitha
|
c909144589
|
Add select2 controller to select roles to share a group
|
2017-01-10 10:00:48 +05:30 |
|
ayyoob
|
ac8dae7ed0
|
fixing test failures
|
2017-01-10 09:27:10 +05:30 |
|
Rasika Perera
|
e1228b408a
|
Removed [httpsWebURL] from config.json
|
2017-01-09 16:36:11 +05:30 |
|
Rasika Perera
|
9afffc6571
|
Merge pull request #530 from charithag/release-2.0.x
Add select2 controller to select roles to share a group
|
2017-01-09 15:04:28 +05:30 |
|