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
8b3d8b74bf
Fixing more feature management related changes
2015-03-20 18:06:05 +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
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
Dulitha Wijewantha
4600968d60
* Re-added the method to convert a Device Property list to a Map
2015-03-19 11:17:18 +05:30
prabathabey
4638d25ff1
Code cleanup
2015-03-18 22:00:19 +05:30
manoj
58337a986d
Email functionality
2015-03-18 19:23:21 +05:30
manoj
e7d165d3b9
Email sending
2015-03-18 19:20:41 +05:30
manoj
232ef4bd90
merge with master
2015-03-18 19:10:09 +05:30
manoj
a41c1421e9
User list
2015-03-18 18:55:56 +05:30
prabathabey
19fbc11642
Restructuring the sources
2015-03-18 16:25:34 +05:30
prabathabey
3219a7cc41
Restructuring source code to be able to make it more maintenable
2015-03-18 15:47:31 +05:30
prabathabey
7056b01d18
Fixing more build issues
2015-03-18 10:25:38 +05:30
prabathabey
d5127f6874
Code cleanup and fixing build failures
2015-03-17 21:04:25 +05:30
prabathabey
3fb61d9c8b
Resolving more merge conflicts
2015-03-17 17:40:49 +05:30
prabathabey
8b5f491d69
Fixing merge conflicts
2015-03-17 17:37:11 +05:30
prabathabey
31b931537f
Adding operation and license management implementations
2015-03-17 17:30:30 +05:30
prabathabey
8662eb36e4
Adding operation manager related changes
2015-03-17 17:27:41 +05:30
inosh-perera
4754da70be
get all devices when the username is provided
2015-03-16 12:39:08 +05:30
Geeth Munasinghe
ac2fa547d4
[maven-release-plugin] prepare for next development iteration
2015-02-24 14:29:34 +05:30
Geeth Munasinghe
28a1bd9fde
[maven-release-plugin] prepare release v0.9.1
2015-02-24 14:29:25 +05:30
Geeth Munasinghe
1a550269f1
Changing the version to 0.9.1-SNAPSHOT
2015-02-24 14:24:16 +05:30
Geeth Munasinghe
835207a13d
[maven-release-plugin] prepare for next development iteration
2015-02-23 18:54:54 +05:30
Geeth Munasinghe
7933271193
[maven-release-plugin] prepare release v0.9.1
2015-02-23 18:54:44 +05:30
harshanL
021c27666c
Removed governance dependencies
2015-02-21 02:00:55 +05:30
prabathabey
b52f8d8697
Making LicenseManagement OSGi service use the existing LicenseManagerImpl
2015-02-20 14:59:51 +05:30
prabathabey
916760275f
Refactoring license management implementation
2015-02-19 17:24:50 +05:30
prabathabey
9ad8d6eab9
Refactoring License management functionality
2015-02-18 18:33:18 +05:30
prabathabey
a9a0ac5899
Fixing merge conflicts
2015-02-16 17:42:46 +05:30
prabathabey
8db95a349d
Improving License handling functionality
2015-02-16 17:41:10 +05:30
manoj
cd3913d43d
Remove Date Adaptor class
2015-02-13 19:43:47 +05:30
manoj
4d87e3f605
remove xml data adaptor
2015-02-13 15:01:42 +05:30
harshanL
1736d5db3e
CDMF-8 fixes
2015-02-12 18:32:06 +05:30
harshanL
98ac04479d
CDMF-6 fix
2015-02-10 18:28:18 +05:30
Geeth Munasinghe
05cee229d3
[maven-release-plugin] prepare for next development iteration
2015-02-09 17:45:18 +05:30
Geeth Munasinghe
ba12c63636
[maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2
2015-02-09 17:45:09 +05:30
Geeth Munasinghe
68f5cf6400
[maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2
2015-02-09 17:42:48 +05:30
Geeth Munasinghe
f0511a0b01
[maven-release-plugin] prepare for next development iteration
2015-02-09 17:41:29 +05:30
Geeth Munasinghe
5f72231731
[maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2
2015-02-09 17:41:21 +05:30
Geeth Munasinghe
13692f6355
[maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2
2015-02-09 15:02:25 +05:30
Geeth Munasinghe
3dd38392b1
[maven-release-plugin] prepare for next development iteration
2015-02-09 14:53:48 +05:30
Geeth Munasinghe
c6d993cee8
[maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2
2015-02-09 14:53:33 +05:30
Geeth Munasinghe
81d6a238c7
Changing the version to 0.9.0 and fixing some issues on poms
2015-02-09 14:51:57 +05:30
Geeth Munasinghe
f494143351
Separating the components from the product-cdm repository, all the commits will be survived.
2015-02-09 14:25:57 +05:30
Geeth Munasinghe
fb3e40bc2f
Merge branch 'master' of https://github.com/wso2/product-cdm
2015-02-09 12:07:16 +05:30
Geeth Munasinghe
8c5fd85484
Changing the version to 1.0.0-SNAPSHOT
2015-02-09 12:06:04 +05:30
Geeth Munasinghe
0fd9875342
[maven-release-plugin] prepare for next development iteration
2015-02-08 12:30:55 +05:30
Geeth Munasinghe
ab92119231
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-08 12:30:44 +05:30
Geeth Munasinghe
3e8591cccd
Fixing issues in the pom for release purposes
2015-02-08 12:09:09 +05:30
Geeth Munasinghe
c3b26b3f1c
[maven-release-plugin] prepare for next development iteration
2015-02-08 11:58:59 +05:30
Geeth Munasinghe
12e49a0b1a
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-08 11:58:49 +05:30
Geeth Munasinghe
4c30dfb9d8
[maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2
2015-02-08 11:54:54 +05:30
Geeth Munasinghe
aad4c8d244
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-08 11:54:06 +05:30
manoj
815dc00344
Merge branch 'master' of https://github.com/wso2/product-cdm
2015-02-07 06:20:23 +05:30
manoj
4b81d04320
License Managment refactor
2015-02-07 06:14:20 +05:30
Geeth Munasinghe
17acce9458
[maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2
2015-02-06 20:32:24 +05:30
Geeth Munasinghe
5254511f5e
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-06 20:31:01 +05:30
Geeth Munasinghe
84fbde538e
Fixing pom issues for release works
2015-02-06 20:27:32 +05:30
Geeth Munasinghe
c88ac79541
[maven-release-plugin] prepare for next development iteration
2015-02-05 19:22:54 +05:30
Geeth Munasinghe
8482d4cf27
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-05 19:22:45 +05:30
Geeth Munasinghe
f67eee625a
Changing the version to 1.0.0-SNAPSHOT
2015-02-05 19:04:32 +05:30
Geeth Munasinghe
da9443a065
[maven-release-plugin] prepare for next development iteration
2015-02-05 16:56:52 +05:30
Geeth Munasinghe
7418cb8d4d
[maven-release-plugin] prepare release 1.1.0
2015-02-05 16:56:42 +05:30
Geeth Munasinghe
1942fd68b1
[maven-release-plugin] rollback the release of wso2cdm-parent-1.0.0
2015-02-05 16:50:24 +05:30
Geeth Munasinghe
ae4e56c9d6
[maven-release-plugin] prepare for next development iteration
2015-02-05 16:40:38 +05:30
Geeth Munasinghe
d57c56e36d
[maven-release-plugin] prepare release wso2cdm-parent-1.0.0
2015-02-05 16:40:26 +05:30
Geeth Munasinghe
02d1a259df
[maven-release-plugin] rollback the release of 1.0.0
2015-02-05 16:18:34 +05:30
Geeth Munasinghe
462e53070c
[maven-release-plugin] prepare for next development iteration
2015-02-05 15:58:47 +05:30
Geeth Munasinghe
0d81d60c99
[maven-release-plugin] prepare release 1.0.0
2015-02-05 15:58:37 +05:30
Geeth Munasinghe
ac609f9996
Changing the version to 1.0.0-SNAPSHOT
2015-02-05 14:55:27 +05:30
manoj
8cd5f6d61f
Default License ManagementY
2015-02-05 13:11:10 +05:30
manoj
394258d10f
Default License feature
2015-02-05 13:10:26 +05:30
manoj
b21676a639
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
...
Default License feature
2015-02-05 13:09:48 +05:30
Geeth Munasinghe
e1b94822ab
[maven-release-plugin] prepare for next development iteration
2015-02-05 12:35:56 +05:30
Geeth Munasinghe
7f0558448e
[maven-release-plugin] prepare release 1.0.0
2015-02-05 12:35:47 +05:30
prabathabey
d6a22b06ff
Fixing more SNAPSHOT versions, used in carbon-governance, carbon-deployment related components
2015-02-02 21:13:52 +05:30