prabathabey
|
54cd6b80f4
|
Fixing merge conflicts
|
2015-07-28 15:21:06 +05:30 |
|
prabathabey
|
955c119006
|
Adding policy delegation
|
2015-07-28 15:19:34 +05:30 |
|
geethkokila
|
dc205aa081
|
Fixing the conflicts
|
2015-07-27 20:32:12 +05:30 |
|
geethkokila
|
6d687364c6
|
Fixing the monitoring tasks
|
2015-07-27 12:27:12 +05:30 |
|
geethkokila
|
821697f24e
|
Merge branch 'milanperera-master'
|
2015-07-27 12:14:43 +05:30 |
|
milanperera
|
256880089e
|
Merged
|
2015-07-27 11:16:03 +05:30 |
|
milanperera
|
f0ec3dbe4c
|
Fixed NPE issues in policy-mgt
|
2015-07-27 10:49:46 +05:30 |
|
prabathabey
|
b298407160
|
Fixing improper parent configurations found in apimgt.extensions component and feature
|
2015-07-25 13:29:57 +05:30 |
|
prabathabey
|
1716c2c7f6
|
Making apimgt extensions module a separate component/feature pair
|
2015-07-25 12:41:18 +05:30 |
|
prabathabey
|
1a6526fc77
|
Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
|
2015-07-24 19:22:14 +05:30 |
|
prabathabey
|
bfa1ea1875
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-24 12:36:35 +05:30 |
|
milanperera
|
5b2e0c8989
|
Merged
|
2015-07-24 12:32:26 +05:30 |
|
prabathabey
|
8fb37722ea
|
Fixing an invalid artifact id used in device management extensions pom
|
2015-07-24 12:30:30 +05:30 |
|
geethkokila
|
fde54d2d32
|
Fixing the monitoring service
|
2015-07-24 12:26:57 +05:30 |
|
prabathabey
|
2694b98883
|
Adding device management extension feature
|
2015-07-24 12:19:55 +05:30 |
|
prabathabey
|
a68ca0cfd6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-24 12:08:12 +05:30 |
|
prabathabey
|
8394b63e0c
|
Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions
|
2015-07-24 12:07:57 +05:30 |
|
milanperera
|
7ec10d670c
|
Fixed bugs in device disenrolment
|
2015-07-23 17:32:05 +05:30 |
|
milanperera
|
5a8975d7ac
|
Partial Commit
|
2015-07-23 16:55:54 +05:30 |
|
milanperera
|
35ce4be1a1
|
Partial Commit
|
2015-07-23 15:55:32 +05:30 |
|
geethkokila
|
fcb7530d3d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-23 15:32:27 +05:30 |
|
geethkokila
|
2769392bc0
|
Fixing the monitoring task for not to notify the blocked and inactive devices
|
2015-07-23 15:32:12 +05:30 |
|
Prabath Abeysekara
|
3512e3e60a
|
Merge pull request #20 from milanperera/master
Refactored SQL queries
|
2015-07-23 14:50:57 +05:30 |
|
milanperera
|
6f56e27f1d
|
Refactored SQL queries
|
2015-07-23 14:46:22 +05:30 |
|
prabathabey
|
701228810b
|
Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications
|
2015-07-23 14:35:25 +05:30 |
|
prabathabey
|
6c857fdc4d
|
Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications
|
2015-07-23 14:35:02 +05:30 |
|
geethkokila
|
bd75f70a24
|
Fixing the merge conflicts
|
2015-07-23 10:17:04 +05:30 |
|
geethkokila
|
6270dff93c
|
Fixing priviledege carbon context issue in device-mgt component
|
2015-07-23 10:14:24 +05:30 |
|
prabathabey
|
d9459b09ba
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-23 10:02:02 +05:30 |
|
prabathabey
|
fac53e4814
|
Upgrading tomcat version usd in carbon-devicemgt
|
2015-07-23 10:01:56 +05:30 |
|
prabathabey
|
9e5e3cf73d
|
Enforcing proxy port to be used when configured
|
2015-07-23 09:57:50 +05:30 |
|
geethkokila
|
ee031fe41c
|
Merge branch 'milanperera-master'
|
2015-07-23 07:07:37 +05:30 |
|
prabathabey
|
e4fd0607e8
|
Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code
|
2015-07-22 23:43:12 +05:30 |
|
prabathabey
|
15d56e29c3
|
temporarily commenting out test cases till tenancy-test bits are properly added
|
2015-07-22 23:41:05 +05:30 |
|
geethkokila
|
8ab843e76c
|
Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
Merging the milan's changes
|
2015-07-22 17:59:45 +05:30 |
|
milanperera
|
35ac8ec6c9
|
Fixed formating issues in PolicyManagerImpl
|
2015-07-22 17:53:58 +05:30 |
|
milanperera
|
de6572d819
|
Fixed for JIRA MDM-372
|
2015-07-22 17:46:40 +05:30 |
|
geethkokila
|
9dc5a1e2e5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-22 17:24:50 +05:30 |
|
geethkokila
|
aee2402d0d
|
Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
|
2015-07-22 17:24:33 +05:30 |
|
harshanl
|
c2ef90d399
|
added class comments
|
2015-07-22 15:47:25 +05:30 |
|
harshanl
|
50640c9dfd
|
Added tenant configuration persistance
|
2015-07-22 15:36:16 +05:30 |
|
geethkokila
|
8047cd9d0a
|
Merge branch 'milanperera-master'
Merging milan's changes to policy core
|
2015-07-21 20:01:37 +05:30 |
|
geethkokila
|
397fb7113e
|
Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
|
2015-07-21 19:51:28 +05:30 |
|
milanperera
|
7313ba1e7e
|
Implemented policy monitoring add operation
|
2015-07-21 19:43:22 +05:30 |
|
prabathabey
|
7d089d8b09
|
Removing IDE warnings
|
2015-07-21 19:13:16 +05:30 |
|
prabathabey
|
a461e887d1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-21 19:12:34 +05:30 |
|
prabathabey
|
87e632866b
|
Fixing connection leaks spotted in operation management implementation
|
2015-07-21 19:12:22 +05:30 |
|
harshanl
|
00b9303283
|
Fixed the issue with java package name
|
2015-07-21 10:26:24 +05:30 |
|
geethkokila
|
c4739efd0e
|
Fixing the policy monitoring service adding
|
2015-07-20 19:05:13 +05:30 |
|
geethkokila
|
9ca5815ec3
|
Fixing the saving issues
|
2015-07-20 16:47:25 +05:30 |
|