manoj
105bc2c6cf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-26 22:28:54 +05:30
manoj
bee82d40e2
Add payload parameter to update operation
2015-03-26 22:28:14 +05:30
prabathabey
53d6dcb8ef
Fixing build failures caused by an improper parent pom config
2015-03-26 21:59:55 +05:30
prabathabey
dd03eafe9d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-26 20:35:52 +05:30
prabathabey
8f83027e74
Making plugin registration deferred till the core completely registered
2015-03-26 20:35:32 +05:30
manoj
9b665eaddb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-26 20:32:41 +05:30
manoj
e3acecd5a0
Create databases for plugins
2015-03-26 20:32:04 +05:30
inosh-perera
2002c92032
adding existing API check before publishing
2015-03-26 19:40:00 +05:30
manoj
7e0f4a4b2f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-26 19:22:00 +05:30
inosh-perera
d242b3ffe1
device list retrival url is added to api auto publishing
2015-03-26 17:58:47 +05:30
inosh-perera
e4ac0f2052
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-26 17:50:26 +05:30
inosh-perera
010045f0dd
fixing api-management auto publishing configuration file read issue
2015-03-26 17:49:33 +05:30
prabathabey
a0571dd310
Fixing API endpoint not getting properly added when the APIs are registered
2015-03-26 17:30:29 +05:30
manoj
ab08b835f4
Create plugin level databases
2015-03-26 17:20:52 +05:30
inosh-perera
a46d3a41de
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-25 21:00:44 +05:30
inosh-perera
0565c63f2f
copying app manager config
2015-03-25 21:00:12 +05:30
prabathabey
7c39871feb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-25 20:29:27 +05:30
prabathabey
2cef474281
Adding deactivate method into the service component
2015-03-25 20:29:23 +05:30
inosh-perera
504099a2c4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-25 20:04:22 +05:30
inosh-perera
4a061e7be2
adding App management integeration related code
2015-03-25 20:03:06 +05:30
prabathabey
bcc1cad6e5
Merging Webapp authenticator framework implementation
2015-03-25 18:46:17 +05:30
prabathabey
3070488adf
Fixing Pom issues
2015-03-24 18:28:56 +05:30
manoj
fee9fbad7d
Refactor Email Functionality
2015-03-24 18:15:45 +05:30
manoj
55d57f6577
Refactor email functionality
2015-03-24 17:57:58 +05:30
manoj
ee6c067398
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-24 17:49:53 +05:30
Dulitha Wijewantha
6d7f6767b5
* Implemented the OperationManager’s mapping of device and operation
...
* Change method signature of OperationMappingDAO.addOperationMapping to support a list of device id integers
* Removed h2.sql and added them to CreateH2TestDB.sql in the test resources
* Cleaned up the DeviceManagementBaseTest class
2015-03-24 09:36:42 +05:30
manoj
d7aa86cc0b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-23 20:52:54 +05:30
manoj
3e51415a64
Refactor Email functionality
2015-03-23 20:52:28 +05:30
manoj
03b4f41a2e
Refactor Email functionality
2015-03-23 20:52:08 +05:30
prabathabey
c40af0de7a
Moving API registration bits to device.mgt.core
2015-03-23 18:18:37 +05:30
prabathabey
fc80514d74
Resolving merge conflicts
2015-03-23 12:19:07 +05:30
manoj
0a824d9644
Format enrol email message
2015-03-23 12:16:51 +05:30
prabathabey
d71ea209c2
Code cleanup
2015-03-23 12:16:34 +05:30
manoj
7dfd3f0dd2
Improve email message format
2015-03-20 20:30:49 +05:30
manoj
e6d0d3fd00
Email format
2015-03-20 20:00:21 +05:30
manoj
a458c71789
Email format
2015-03-20 19:50:07 +05:30
prabathabey
9a776b15dc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-03-20 18:08:21 +05:30
prabathabey
8b3d8b74bf
Fixing more feature management related changes
2015-03-20 18:06:05 +05:30
Dulitha Wijewantha
8277a9a818
* Added a method to get a single user
2015-03-20 18:04:04 +05:30
prabathabey
80908bac1e
Adding feature manager related changes
2015-03-20 17:50:56 +05:30
manoj
28a00cd21c
Email functionality
2015-03-20 16:17:51 +05:30
manoj
7c0ca194a1
Email functionality
2015-03-20 16:16:57 +05:30
manoj
78959f0cfb
user management
2015-03-20 14:21:04 +05:30
prabathabey
61073f0a4b
Committing operation management improvements
2015-03-20 14:03:03 +05:30
prabathabey
0e598aad59
Improving operation management implementation
2015-03-20 13:49:37 +05:30
manoj
d790d343a9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
2015-03-20 12:32:50 +05:30
manoj
b2d8f3f7f5
Email Management
2015-03-20 12:28:50 +05:30
manoj
ec6734a1d9
Email management
2015-03-20 12:28:18 +05:30
manoj
34ad4a63a2
Email management
2015-03-20 12:27:45 +05:30
Dulitha Wijewantha
fc86ccd86d
* Setup the datasource for the operation manager dao factory
...
* Implemented the get all devices and get devices for user
* Added support for tenant domain in get devices for user (This has to be added to all methods)
2015-03-20 10:23:32 +05:30