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 |
|
charitha
|
1ad9439162
|
Add select2 controller to select roles to share a group
|
2017-01-09 15:02:10 +05:30 |
|
Rasika Perera
|
250984f438
|
Merge pull request #529 from rasika/merge-master
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2017-01-09 14:47:07 +05:30 |
|
charitha
|
5caa688014
|
Fixed issue in populating server.ip property.
|
2017-01-09 12:35:04 +05:30 |
|
Rasika Perera
|
0acd273ae1
|
Fixing merge conflicts
|
2017-01-08 12:41:09 +05:30 |
|
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
|
2017-01-08 11:45:46 +05:30 |
|
WSO2 Builder
|
5411d93103
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-07 07:48:36 +00:00 |
|
WSO2 Builder
|
3ea83b925a
|
[maven-release-plugin] prepare release v2.0.6
|
2017-01-07 07:33:45 +00:00 |
|
Rasika Perera
|
ebdba19041
|
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
|
2017-01-07 08:04:48 +05:30 |
|
Rasika Perera
|
b4ed33bcd0
|
IOTS-171 : Register form validation message corrected
|
2017-01-06 21:44:02 +05:30 |
|
Rasika Perera
|
4de481e501
|
Merge pull request #521 from rasika/release-2.0.x
UI improvement for Datatables
|
2017-01-06 20:29:47 +05:30 |
|
Rasika Perera
|
d826ba81d0
|
UI improvement for Datatables
|
2017-01-06 20:27:24 +05:30 |
|
Rasika Perera
|
8397b688e9
|
Merge branch 'release-2.0.x' into mutual_ssl_feature
|
2017-01-06 19:34:25 +05:30 |
|
Rasika Perera
|
b4a649bdfa
|
Merge pull request #516 from milanperera/release-2.0.x
Improved permission-scope mapping capabilities
|
2017-01-06 19:02:12 +05:30 |
|
geethkokila
|
739a8bdb69
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
2017-01-06 17:04:18 +05:30 |
|
Rasika Perera
|
1c1da1f5cd
|
Merge pull request #517 from rasika/release-2.0.x
Fixing CDMF version in footer
|
2017-01-06 16:57:16 +05:30 |
|
Rasika Perera
|
ab28d596e7
|
Fixing CDMF version in footer
|
2017-01-06 16:56:20 +05:30 |
|
Milan Perera
|
d51ee711fc
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-06 16:46:56 +05:30 |
|
Rasika Perera
|
79e98a592b
|
Merge pull request #515 from rasika/release-2.0.x
Replaced [EMM] with [IoT Server]
|
2017-01-06 16:46:44 +05:30 |
|
Milan Perera
|
228848075c
|
Fixed conflicts and merged
|
2017-01-06 16:46:42 +05:30 |
|
Rasika Perera
|
e501724c3c
|
Replaced [EMM] with [IoT Server]
|
2017-01-06 16:26:59 +05:30 |
|
Rasika Perera
|
7af63522f2
|
Fixed quick startup guide doc url
|
2017-01-06 16:14:24 +05:30 |
|
Milan Perera
|
42a587904f
|
Fixed issues in permission-scope mapping
|
2017-01-06 16:10:52 +05:30 |
|
geethkokila
|
9200adebed
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
2017-01-06 15:17:44 +05:30 |
|
charitha
|
d65557e03e
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-06 14:55:41 +05:30 |
|
charitha
|
e6e39532b7
|
Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements
|
2017-01-06 14:55:26 +05:30 |
|
Rasika Perera
|
3472090d1b
|
Merge pull request #513 from ruwany/wip
Fixing device listing issue
|
2017-01-06 14:16:47 +05:30 |
|
Ace
|
6a69d8cf4b
|
merging with upstream
|
2017-01-06 13:27:33 +05:30 |
|
Ace
|
b83479b214
|
Fixing device listing issue
|
2017-01-06 13:20:56 +05:30 |
|
Milan Perera
|
637c014866
|
Refactored scope strings
|
2017-01-06 10:15:21 +05:30 |
|
Milan Perera
|
157ef998a6
|
Resolved conflicts and merged
|
2017-01-06 09:22:49 +05:30 |
|
Milan Perera
|
e0ee2fc1e5
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-06 09:19:12 +05:30 |
|
ayyoob
|
b20a2e0997
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-05 17:51:34 +05:30 |
|
Chatura Dilan
|
e0627bf748
|
Merge pull request #509 from rasika/release-2.0.x
Fixing https://wso2.org/jira/browse/IOTS-362
|
2017-01-05 16:49:29 +05:30 |
|
GPrathap
|
5d1435c7bc
|
renamed permission string
|
2017-01-05 16:47:53 +05:30 |
|
Rasika Perera
|
25a35dcf20
|
Changing title [WSO2 IoT] into [WSO2 IoT Server]
|
2017-01-05 16:43:48 +05:30 |
|
Rasika Perera
|
7612f064fe
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-05 15:19:25 +05:30 |
|
Maninda
|
00a5a07373
|
Fixed some security issues found after running FindBugs security scan.
|
2017-01-05 14:28:30 +05:30 |
|
Milan Perera
|
f3409adc21
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-05 12:41:22 +05:30 |
|
Milan Perera
|
2a4a636eb4
|
Resolved conflicts and merged
|
2017-01-05 12:41:08 +05:30 |
|
Milan Perera
|
d13dadff08
|
Renamed prefix of scopes
|
2017-01-05 12:35:02 +05:30 |
|
GPrathap
|
0bd7b90e9a
|
added scope annotation
|
2017-01-05 12:26:07 +05:30 |
|
ayyoob
|
db2ddc7bed
|
policy manager refactored to support tenancy
|
2017-01-05 12:24:41 +05:30 |
|
Milan Perera
|
7b8a7c0b52
|
Merge pull request #1 from GPrathap/release-2.0.x
removed setting APIs secured as default.
|
2017-01-05 11:58:52 +05:30 |
|
Maninda
|
0fb5a577b8
|
Fixed some issues found in FindBugs security analysis.
|
2017-01-05 11:47:09 +05:30 |
|
Rasika Perera
|
235b41c9df
|
config.json [usernameLength] moved to [userValidationConfig][usernameLength]
|
2017-01-04 22:28:13 +05:30 |
|
Rasika Perera
|
2a7e62f857
|
config.json [apimgt-gateway] renamed to [gatewayEnabled]
|
2017-01-04 22:15:01 +05:30 |
|
Rasika Perera
|
e5062abcc2
|
Removed unneccesary configs
|
2017-01-04 20:00:18 +05:30 |
|
charitha
|
f6f99ed06a
|
Fixed following issues:
https://wso2.org/jira/browse/IOTS-271
|
2017-01-04 15:09:36 +05:30 |
|
Milan Perera
|
b860be0150
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-04 10:34:57 +05:30 |
|
geethkokila
|
65cb12b5ac
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
2017-01-03 14:13:49 +05:30 |
|
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
|
2017-01-03 11:35:08 +05:30 |
|
Milan Perera
|
02d75b757c
|
Fixed conflicts and merged
|
2017-01-03 10:37:46 +05:30 |
|
GPrathap
|
4c9578ebe2
|
resized buffer size to 0 for each scope
|
2017-01-01 21:53:53 +05:30 |
|
WSO2 Builder
|
6aea6195e9
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-23 19:20:14 +00:00 |
|
WSO2 Builder
|
3db5b289ac
|
[maven-release-plugin] prepare release v2.0.5
|
2016-12-23 19:18:26 +00:00 |
|
Rasika Perera
|
acb2c38799
|
Fixing user is not authorized to view devices
|
2016-12-24 00:42:04 +05:30 |
|
WSO2 Builder
|
ed47094964
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-23 07:05:25 +00:00 |
|
WSO2 Builder
|
8d409a7248
|
[maven-release-plugin] prepare release v2.0.4
|
2016-12-23 07:00:40 +00:00 |
|
charitha
|
1a93868424
|
Fixed https://wso2.org/jira/browse/IOTS-335
|
2016-12-23 12:19:57 +05:30 |
|
charitha
|
61d1710614
|
Fixed https://wso2.org/jira/browse/IOTS-341
|
2016-12-23 11:12:42 +05:30 |
|
Ace
|
674048ab27
|
Coorecting version import ranges
|
2016-12-23 09:57:47 +05:30 |
|
Rasika Perera
|
d001cf2ee1
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2016-12-23 08:22:43 +05:30 |
|
Rasika Perera
|
fea128d29e
|
Fixing grid-view cropped on group view
|
2016-12-23 08:22:12 +05:30 |
|
Ayyoob Hamza
|
4960fd0d05
|
Merge pull request #499 from charithag/release-2.0.x-IOTS-342
Fixed https://wso2.org/jira/browse/IOTS-342
|
2016-12-22 19:56:45 +05:30 |
|
charitha
|
a625ccecf0
|
Fixed https://wso2.org/jira/browse/IOTS-342
|
2016-12-22 19:53:12 +05:30 |
|
Ruwan
|
46c3b015fa
|
Merge pull request #498 from charithag/release-2.0.x-email-invites
Release 2.0.x email invites
|
2016-12-22 18:41:22 +05:30 |
|
charitha
|
58a9ea80c7
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2016-12-22 18:39:26 +05:30 |
|
Charitha Goonetilleke
|
5318601df0
|
Add license header
|
2016-12-22 18:37:31 +05:30 |
|
charitha
|
2b1d46f45f
|
Finalized enrollment invitations
|
2016-12-22 18:30:07 +05:30 |
|
Charitha Goonetilleke
|
af8902f392
|
Merge pull request #497 from rasika/release-2.0.x
Removing device-view button
|
2016-12-22 16:14:08 +05:30 |
|
Rasika Perera
|
b0d32a140e
|
Adding context for anchor links
|
2016-12-22 16:12:04 +05:30 |
|
Rasika Perera
|
ad92a5278e
|
Adding on-image anchor links instead of separate btn for device-view
|
2016-12-22 15:59:10 +05:30 |
|
Rasika Perera
|
6f7d87a590
|
Merge pull request #496 from madhawap/release-2.0.x
Task operation config related changes
|
2016-12-22 14:01:09 +05:30 |
|
madhawap
|
d486ad14fd
|
Task operation config related changes
|
2016-12-22 13:47:39 +05:30 |
|
Ace
|
64da9479a1
|
Bumping identity dependencies
|
2016-12-22 12:32:24 +05:30 |
|
Ace
|
1d2a5dc9ef
|
Updating identity/auth-saml dependencies to latest
|
2016-12-22 10:58:59 +05:30 |
|
charitha
|
795ccb740c
|
Add backend support for enrollment invitations
|
2016-12-20 23:46:55 +05:30 |
|
geethkokila
|
1b4857b7fd
|
Fixing conflicts
|
2016-12-20 11:19:58 +05:30 |
|
Supun94
|
a831dc6a9a
|
Changing cdm-config file
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
3d6f5ee64d
|
Changing policy compliance view
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
09572a9977
|
Removed redundant classes
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
2751d4b856
|
Code refactoring
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
eb1575126f
|
Minor refactoring on policy merging
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
35f3fcc8f9
|
Changed policy evaluation point
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
936e71a743
|
Adding configurations for different policy evaluation service components
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
5a1c73b119
|
Adding cdmf effective policy unit
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
2847ff2095
|
Adding cdmf effective policy page
|
2016-12-19 16:19:36 +05:30 |
|
Supun94
|
33b79dcbba
|
Adding effective policy service
|
2016-12-19 16:19:36 +05:30 |
|
charitha
|
7acbc5cd0b
|
Moved qr modal to device mgt core
|
2016-12-19 15:25:06 +05:30 |
|
Charitha Goonetilleke
|
f4b3313ad7
|
Merge pull request #491 from DimalChandrasiri/release-2.0.x
UI update on email invites
|
2016-12-19 13:42:43 +05:30 |
|
Charitha Goonetilleke
|
8216ea3a79
|
Merge pull request #488 from madawas/IOTS-296
Fixing generic policy saving issues
|
2016-12-19 13:41:39 +05:30 |
|
Rasika Perera
|
1465c56822
|
Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
This reverts commit f9b6939cb7.
|
2016-12-19 12:39:56 +05:30 |
|
Ace
|
47d8baccf7
|
upgrading to latest version of identity
|
2016-12-19 11:38:03 +05:30 |
|
Imesh Chandrasiri
|
765f97f5a0
|
email invite sender changes
|
2016-12-19 11:27:01 +05:30 |
|
Imesh Chandrasiri
|
e696b5bd0c
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2016-12-19 11:02:57 +05:30 |
|
WSO2 Builder
|
f9b6939cb7
|
[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
|
2016-12-19 09:06:04 +05:30 |
|
Rasika Perera
|
42930fe8c4
|
Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
This reverts commit 78b9052c37.
|
2016-12-19 08:45:19 +05:30 |
|
Harshan Liyanage
|
a2a03a523e
|
Refactored RoleMgtServiceImpl.
|
2016-12-16 19:46:14 +05:30 |
|
Harshan Liyanage
|
de2f85de2e
|
IOTS-337:Fixed permission remove issue when updating role permissions.
|
2016-12-16 19:30:41 +05:30 |
|
WSO2 Builder
|
78b9052c37
|
[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
|
2016-12-16 17:03:06 +05:30 |
|
Imesh Chandrasiri
|
f70be13bf2
|
Common unit for email invite modal for devices screens
|
2016-12-16 14:53:51 +05:30 |
|
Madawa Soysa
|
5b1a68280c
|
Moving codemirror to a lib unit
This commit moves the codemirror library and modes to a lib unit and reuse the unit when necessary.
|
2016-12-16 10:17:59 +05:30 |
|
Madawa Soysa
|
0f291d5d04
|
Fixing generic policy saving issues
This commit changes the generic policy mode to application/json and add generic policy add/edit/view units.
|
2016-12-15 11:29:14 +05:30 |
|
Milan Perera
|
bcbf61a886
|
Fixed conflicts
|
2016-12-14 08:50:17 +05:30 |
|
Milan Perera
|
36ee55f493
|
Implemented permission-scope mapping for IoTs
|
2016-12-14 08:45:42 +05:30 |
|
Rasika Perera
|
9f615916d0
|
Fixing analyticsEnabled and groupingEnabled not working
|
2016-12-11 14:56:31 +05:30 |
|
Rasika Perera
|
1bee155d9a
|
Fixing formatting issue
|
2016-12-09 19:06:00 +05:30 |
|
Rasika Perera
|
91437ff81c
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2016-12-09 18:39:39 +05:30 |
|
Rasika Perera
|
c284732192
|
Displaying SSO auth failure messages
|
2016-12-09 18:22:09 +05:30 |
|
Rasika Perera
|
9fd6145605
|
Fixing SSO issue
|
2016-12-09 17:34:56 +05:30 |
|
Milan Perera
|
dd353e1bfb
|
Commiting permission-scope mapping improvements
|
2016-12-08 20:30:49 +05:30 |
|
WSO2 Builder
|
a59edee410
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-08 14:39:00 +00:00 |
|
WSO2 Builder
|
8f9b21b41b
|
[maven-release-plugin] prepare release v2.0.3
|
2016-12-08 14:37:11 +00:00 |
|
charitha
|
d8881244fd
|
Fix issue in task operation
|
2016-12-08 20:03:54 +05:30 |
|
charitha
|
0a7f8ac22c
|
Update error pages and CsrfGuard property file.
|
2016-12-08 19:41:43 +05:30 |
|
charitha
|
78dfddbbed
|
Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
|
2016-12-08 18:58:47 +05:30 |
|
madhawap
|
fa171ef079
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2016-12-08 17:38:24 +05:30 |
|
madhawap
|
d62a9c8b83
|
resolving conflicts
|
2016-12-08 17:38:12 +05:30 |
|
Madawa Soysa
|
ea1371a008
|
Fixing generic policy payload
|
2016-12-08 17:31:50 +05:30 |
|
madhawap
|
b889f6e384
|
adding separate tasks for each device type
|
2016-12-08 17:21:07 +05:30 |
|
charitha
|
0b3183e3be
|
Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
|
2016-12-08 17:19:27 +05:30 |
|
charitha
|
312098b1de
|
Fix issues in generic policy editor
|
2016-12-08 17:19:12 +05:30 |
|
Hasunie
|
9a1c12d730
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2016-12-08 15:59:30 +05:30 |
|
Hasunie
|
60d1281949
|
fixing windows device name issue
|
2016-12-08 15:58:32 +05:30 |
|
geethkokila
|
87b2fb3603
|
Fixing the login issue
|
2016-12-08 14:28:33 +05:30 |
|
geethkokila
|
9def8aa609
|
Fixing the login issue
|
2016-12-08 14:08:46 +05:30 |
|
geethkokila
|
a0615d3d63
|
Merge branch 'release-2.0.x' into merge-master
|
2016-12-08 12:36:53 +05:30 |
|
geethkokila
|
d911281ad1
|
Merging master branch with release-2.0.x
|
2016-12-08 12:34:50 +05:30 |
|
Madawa Soysa
|
630a1105a9
|
IOTS-296: Refactoring generic policy unit code
This code is refactored to use the device type specific operation mod functions (payload generation etc.) in the device type plugins.
|
2016-12-08 10:29:12 +05:30 |
|
Ruwan
|
a0c842c6c6
|
Merge pull request #473 from charithag/release-2.0.x
Update the way we are checking existence of policy operations.
|
2016-12-07 14:52:47 +05:30 |
|
Rasika Perera
|
6edbb8330f
|
Merge pull request #472 from rasika/release-2.0.x
Fixing enrollment broken issue
|
2016-12-07 14:45:13 +05:30 |
|
charitha
|
4b5c69d2d7
|
Update the way we are checking existence of policy operations.
|
2016-12-07 14:40:56 +05:30 |
|
Rasika Perera
|
641cc58bbf
|
Fixing enrollment broken issue
|
2016-12-07 14:37:10 +05:30 |
|
Imesh Chandrasiri
|
da2fd787c4
|
Fix for datatable icon not showing issue
|
2016-12-07 12:50:23 +05:30 |
|
Ruwan
|
f2f304ccc4
|
Merge pull request #470 from rasika/release-2.0.x
Fixing device identifier is null and Throwing exception when device not found
|
2016-12-07 12:15:17 +05:30 |
|
Rasika Perera
|
289987db8e
|
Throwing exception on getDevice when device is not found
|
2016-12-07 12:05:48 +05:30 |
|