harshanl
|
076d60ec83
|
PermissionManager changes
|
9 years ago |
prabathabey
|
d7e363cef7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
00807e8295
|
Fixing transaction anomalies and code clean up
|
9 years ago |
Prabath Abeysekara
|
a5c9886c63
|
Merge pull request #25 from milanperera/master
Fixed "204 Content Not Found" issue in LicenseManager
|
9 years ago |
mharindu
|
f36c82b059
|
Refactored LicenseManager
|
9 years ago |
|
mharindu
|
4709107719
|
Refactored LicenseManager
|
9 years ago |
|
mharindu
|
8949992148
|
Fixed 204 issue in LicenseManager
|
9 years ago |
Dilshan Edirisuriya
|
3c444f6102
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
|
9 years ago |
|
Dilshan Edirisuriya
|
5b46a4e2f8
|
Commenting out unreachable state for now
|
9 years ago |
geethkokila
|
cceb3ac5db
|
Fixing errors and adding caching sketch
|
9 years ago |
dilanua
|
4e5a38998d
|
Updating DAO Layer
|
9 years ago |
|
dilanua
|
df81bef812
|
Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus
|
9 years ago |
|
geethkokila
|
90f8f4aab6
|
Adding test cases and fixing some logic issues and fixing the null pointer from the policy core
|
9 years ago |
|
geethkokila
|
149b743a2e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
harshanl
|
58c45c92be
|
Fixed tenant configuration persisting issue
|
9 years ago |
|
geethkokila
|
c039adf4ea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
c41f6c3002
|
Code cleanup
|
9 years ago |
|
geethkokila
|
3fa65ae98c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
milanperera
|
e30956b619
|
Fixed an issue in SQL query of getPendingOperations(CommandOp)
|
9 years ago |
|
milanperera
|
508082808c
|
Fixed a bug in commons.licence
|
9 years ago |
|
milanperera
|
596a99d412
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
84bc22f9f3
|
Setting default values for fields validFrom and validTo
|
9 years ago |
|
milanperera
|
05a2339cea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
536e13b0a7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
53302070e6
|
Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl
|
9 years ago |
|
milanperera
|
df61f9263a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
geethkokila
|
cb489c0174
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
Dilshan Edirisuriya
|
37763b7e40
|
Importing org.wso2.carbon.device.mgt.common
|
9 years ago |
|
milanperera
|
9fcea34d73
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
geethkokila
|
b8462b02ac
|
Fixing the conflicts
|
9 years ago |
|
prabathabey
|
c134cc7e25
|
Fixing license manager initialization related issues and code cleanup
|
9 years ago |
|
prabathabey
|
ca38cc9f51
|
Removing URL printer start-up handler from device.mgt.core
|
9 years ago |
|
prabathabey
|
c471017c40
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
134b4ae53c
|
Code cleanup
|
9 years ago |
|
Dilshan Edirisuriya
|
e7f02365a8
|
Importing axis2.transport.mail
|
9 years ago |
|
milanperera
|
c0b0975929
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
milanperera
|
63721cb79d
|
Refactored
|
9 years ago |
|
prabathabey
|
54cd6b80f4
|
Fixing merge conflicts
|
9 years ago |
|
prabathabey
|
955c119006
|
Adding policy delegation
|
9 years ago |
|
geethkokila
|
dc205aa081
|
Fixing the conflicts
|
9 years ago |
|
geethkokila
|
6d687364c6
|
Fixing the monitoring tasks
|
9 years ago |
|
milanperera
|
256880089e
|
Merged
|
9 years ago |
|
milanperera
|
f0ec3dbe4c
|
Fixed NPE issues in policy-mgt
|
9 years ago |
|
prabathabey
|
b298407160
|
Fixing improper parent configurations found in apimgt.extensions component and feature
|
9 years ago |
|
prabathabey
|
1716c2c7f6
|
Making apimgt extensions module a separate component/feature pair
|
9 years ago |
|
prabathabey
|
1a6526fc77
|
Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
|
9 years ago |
|
prabathabey
|
bfa1ea1875
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
milanperera
|
5b2e0c8989
|
Merged
|
9 years ago |
|
geethkokila
|
fde54d2d32
|
Fixing the monitoring service
|
9 years ago |
|
prabathabey
|
a68ca0cfd6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
8394b63e0c
|
Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions
|
9 years ago |
|
milanperera
|
7ec10d670c
|
Fixed bugs in device disenrolment
|
9 years ago |
|
milanperera
|
5a8975d7ac
|
Partial Commit
|
9 years ago |
|
milanperera
|
35ce4be1a1
|
Partial Commit
|
9 years ago |
|
geethkokila
|
fcb7530d3d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
geethkokila
|
2769392bc0
|
Fixing the monitoring task for not to notify the blocked and inactive devices
|
9 years ago |
|
Prabath Abeysekara
|
3512e3e60a
|
Merge pull request #20 from milanperera/master
Refactored SQL queries
|
9 years ago |
|
milanperera
|
6f56e27f1d
|
Refactored SQL queries
|
9 years ago |
|
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
|
9 years ago |
|
geethkokila
|
bd75f70a24
|
Fixing the merge conflicts
|
9 years ago |
|
geethkokila
|
6270dff93c
|
Fixing priviledege carbon context issue in device-mgt component
|
9 years ago |
|
prabathabey
|
d9459b09ba
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
fac53e4814
|
Upgrading tomcat version usd in carbon-devicemgt
|
9 years ago |
|
prabathabey
|
9e5e3cf73d
|
Enforcing proxy port to be used when configured
|
9 years ago |
|
prabathabey
|
e4fd0607e8
|
Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code
|
9 years ago |
|
prabathabey
|
15d56e29c3
|
temporarily commenting out test cases till tenancy-test bits are properly added
|
9 years ago |
|
geethkokila
|
8ab843e76c
|
Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
Merging the milan's changes
|
9 years ago |
|
milanperera
|
35ac8ec6c9
|
Fixed formating issues in PolicyManagerImpl
|
9 years ago |
|
milanperera
|
de6572d819
|
Fixed for JIRA MDM-372
|
9 years ago |
|
geethkokila
|
9dc5a1e2e5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
geethkokila
|
aee2402d0d
|
Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
|
9 years ago |
|
harshanl
|
c2ef90d399
|
added class comments
|
9 years ago |
|
harshanl
|
50640c9dfd
|
Added tenant configuration persistance
|
9 years ago |
|
geethkokila
|
397fb7113e
|
Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
|
10 years ago |
|
milanperera
|
7313ba1e7e
|
Implemented policy monitoring add operation
|
10 years ago |
|
prabathabey
|
7d089d8b09
|
Removing IDE warnings
|
10 years ago |
|
prabathabey
|
a461e887d1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |
|
prabathabey
|
87e632866b
|
Fixing connection leaks spotted in operation management implementation
|
10 years ago |
|
harshanl
|
00b9303283
|
Fixed the issue with java package name
|
10 years ago |
|
geethkokila
|
c4739efd0e
|
Fixing the policy monitoring service adding
|
10 years ago |
|
geethkokila
|
9ca5815ec3
|
Fixing the saving issues
|
10 years ago |
|
harshanl
|
57299063b3
|
Added policy configuration to the cdm-config
|
10 years ago |
|
geethkokila
|
e0301e4ce3
|
Adding the 90% completed monitoring task
|
10 years ago |
manoj
|
4049d1a2b4
|
Remove properties from config operations
|
10 years ago |
|
geethkokila
|
38939d6c7b
|
Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
|
10 years ago |
|
prabathabey
|
ff2c29a158
|
Registering license managment service
|
10 years ago |
|
manoj
|
ac3438e2cd
|
Code refactor application update
|
10 years ago |
|
milanperera
|
05fd385d49
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |
|
manoj
|
f8c1cbc405
|
change generated keys to prepared statement constant
|
10 years ago |
|
manoj
|
b0a55a55c8
|
code clean up
|
10 years ago |
|
milanperera
|
f14ba29d30
|
Merged
|
10 years ago |
|
milanperera
|
854b7dda8d
|
Merged
|
10 years ago |
|
manoj
|
a6cee6bae3
|
change update operation response to object
|
10 years ago |
|
manoj
|
3bbbed40e6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |
|
manoj
|
25a8f60d74
|
Retuen int for operations
|
10 years ago |
kasundananjaya
|
2d1433a2f0
|
Merge pull request #16 from milanperera/master
Refactored dynamic-client-registration unregister function
|
10 years ago |
|
manoj
|
27279426f0
|
code clean up
|
10 years ago |
|
manoj
|
00819fe4b6
|
Unit tests, application update
|
10 years ago |
|
manoj
|
de17217303
|
Unit tests, application update
|
10 years ago |
|
milanperera
|
a82351f53f
|
Refactered getDevicesByType query
|
10 years ago |
