mharindu
|
0e7ff3c0c8
|
Merged
|
2015-09-03 20:40:49 +05:30 |
|
hasuniea
|
0c0d54f041
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 20:20:10 +05:30 |
|
hasuniea
|
581c4f013b
|
refactored changes
|
2015-09-03 20:19:28 +05:30 |
|
mharindu
|
59654848ef
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 20:16:17 +05:30 |
|
prabathabey
|
bd6316d8b5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 20:15:07 +05:30 |
|
prabathabey
|
dbf95bcc7c
|
Fixing an issue in the logic of authentication incoming requests
|
2015-09-03 20:14:45 +05:30 |
|
milanperera
|
23bb023686
|
Partial Commit for Permission Authorizer module
|
2015-09-03 12:07:55 +05:30 |
|
mharindu
|
069c7e7c5f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 12:03:41 +05:30 |
|
harshanl
|
30dfa7600e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 00:20:49 +05:30 |
|
harshanl
|
bbec523a47
|
Added notification mechanism
|
2015-09-03 00:19:58 +05:30 |
|
prabathabey
|
46c5f2534f
|
Fixing NoSuchElement exception thrown when standard context is accessed
|
2015-09-03 00:18:39 +05:30 |
|
mharindu
|
7a801c46eb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 22:58:48 +05:30 |
|
geethkokila
|
6ef4bdd73e
|
Fixing enrolment id issues
|
2015-09-02 22:55:52 +05:30 |
|
mharindu
|
5bcc020b3e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 22:35:40 +05:30 |
|
prabathabey
|
dc2680ac5e
|
Making APIPublisher util compose the relevant API endpoint url programmatically
|
2015-09-02 21:21:51 +05:30 |
|
prabathabey
|
256c42243f
|
Improving APIPublisher implementation
|
2015-09-02 21:12:06 +05:30 |
|
prabathabey
|
9288e3846d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 20:26:01 +05:30 |
|
prabathabey
|
4334994b36
|
Fixing issues encountered in APIPublisher implementation
|
2015-09-02 20:25:52 +05:30 |
|
harshanl
|
d7ea5625bc
|
Fixed apimgt publisher component issues
|
2015-09-02 20:24:33 +05:30 |
|
mharindu
|
6418c55f4f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 19:58:55 +05:30 |
|
geethkokila
|
bdf976ad2e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 19:40:09 +05:30 |
|
geethkokila
|
7dd48bf00e
|
Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
|
2015-09-02 19:39:50 +05:30 |
|
prabathabey
|
2f22d1c82a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 19:03:13 +05:30 |
|
prabathabey
|
f2635e9e98
|
Adding more improvements into web-app authenticator framework
|
2015-09-02 18:59:36 +05:30 |
|
mharindu
|
97987f6e10
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 17:45:27 +05:30 |
|
mharindu
|
cbf10a8b59
|
Refactored addOperation method
|
2015-09-02 17:35:41 +05:30 |
|
hasuniea
|
7642112a9f
|
code clean up
|
2015-09-02 17:27:28 +05:30 |
|
Prabath Abeysekara
|
ee0e9af4cb
|
Merge pull request #27 from milanperera/master
Fixing issues of previous PRs
|
2015-09-02 17:19:05 +05:30 |
|
Dilshan Edirisuriya
|
673ef32535
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 16:46:59 +05:30 |
|
Dilshan Edirisuriya
|
454c459172
|
Extract certificate from signature
|
2015-09-02 16:46:51 +05:30 |
|
mharindu
|
0c43338f5d
|
Added runtime exception to DCA
|
2015-09-02 16:16:18 +05:30 |
|
mharindu
|
1903b375f3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 15:34:11 +05:30 |
|
prabathabey
|
aa6f311d26
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 15:25:58 +05:30 |
|
prabathabey
|
46c5dba5c5
|
Improving web-app authenticator framework
|
2015-09-02 15:24:53 +05:30 |
|
geethkokila
|
dff526b272
|
Removing the unnessary commets and imports
|
2015-09-02 15:02:33 +05:30 |
|
geethkokila
|
5ee8c0f065
|
Fixing the cache manager issues
|
2015-09-02 14:47:36 +05:30 |
|
hasuniea
|
9d5f2af7e9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 14:26:15 +05:30 |
|
mharindu
|
8503a997ea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 10:40:30 +05:30 |
|
Dilshan Edirisuriya
|
aeae7a09f0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 10:39:58 +05:30 |
|
Dilshan Edirisuriya
|
0140974487
|
Certificate verification
|
2015-09-02 10:39:51 +05:30 |
|
harshanl
|
e1da84ec55
|
Added JWT authenticator
|
2015-09-01 22:48:35 +05:30 |
|
mharindu
|
725894ed2c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 18:20:09 +05:30 |
|
geethkokila
|
f2b8f978f5
|
Fixing the operations connection close problems
|
2015-09-01 18:15:02 +05:30 |
|
mharindu
|
cd853c9ee8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 17:20:12 +05:30 |
|
geethkokila
|
f4b2a9ca3a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 17:17:05 +05:30 |
|
geethkokila
|
b14461a5af
|
Fixing the datasource issue in the device magt core
|
2015-09-01 17:16:51 +05:30 |
|
Dilshan Edirisuriya
|
d2182e7375
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 16:13:24 +05:30 |
|
Dilshan Edirisuriya
|
d5199dbd62
|
Fixing issues
|
2015-09-01 16:13:17 +05:30 |
|
mharindu
|
ad5335c9f5
|
Fixed local conflicts and merged
|
2015-09-01 15:29:24 +05:30 |
|
mharindu
|
6385c13012
|
Fixed issues in DeviceDAO
|
2015-09-01 15:25:16 +05:30 |
|
geethkokila
|
6c5f7d7ada
|
Fixing conflicts and checkcriterion method
|
2015-09-01 15:14:40 +05:30 |
|
prabathabey
|
26cf4e82da
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 15:07:21 +05:30 |
|
prabathabey
|
2b6bf203e2
|
Resolving conflicts observed in policy management implementation
|
2015-09-01 15:06:41 +05:30 |
|
geethkokila
|
044995ed97
|
Adding the activate method when policies are added.
|
2015-09-01 15:03:09 +05:30 |
|
mharindu
|
a7e3462e91
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 14:13:06 +05:30 |
|
Dilshan Edirisuriya
|
39d1af7242
|
Saving in keystore
|
2015-09-01 13:25:19 +05:30 |
|
mharindu
|
fd29deb372
|
Fixed conflicts of local repo and merged
|
2015-09-01 12:57:13 +05:30 |
|
prabathabey
|
892b9681f5
|
Fixing transaction handling issues
|
2015-09-01 12:51:18 +05:30 |
|
Dilshan Edirisuriya
|
b391681438
|
Merge branches 'master' and 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 11:19:10 +05:30 |
|
Dilshan Edirisuriya
|
3d736d628e
|
adding conf file to touchpoint
|
2015-09-01 11:19:04 +05:30 |
|
geethkokila
|
458618191d
|
Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
|
2015-08-31 19:31:13 +05:30 |
|
geethkokila
|
c673395ce6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-31 17:13:42 +05:30 |
|
harshanl
|
23c931f5f1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-31 16:17:55 +05:30 |
|
harshanl
|
20873e7786
|
Added null checks
|
2015-08-31 14:37:44 +05:30 |
|
Dilshan Edirisuriya
|
c547d85f35
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-31 11:57:07 +05:30 |
|
geethkokila
|
c6d993e532
|
Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
|
2015-08-30 21:45:56 +05:30 |
|
Your Name
|
b906d43cc8
|
Committing tenant configuration manager service
|
2015-08-29 22:14:07 +05:30 |
|
geethkokila
|
bcb2c1ddb1
|
Commiting the monitoring changes and test case changes
|
2015-08-29 17:39:07 +05:30 |
|
Dilshan Edirisuriya
|
fd84190342
|
Adding certificate management components
|
2015-08-28 15:08:16 +05:30 |
|
geethkokila
|
44b496d350
|
Partially commiting due to update
|
2015-08-28 12:33:10 +05:30 |
|
hasuniea
|
7a54838996
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-28 12:22:07 +05:30 |
|
mharindu
|
69cf3f8939
|
Cleaned code and added comments
|
2015-08-27 17:15:37 +05:30 |
|
mharindu
|
abc16557dc
|
Removed unnecessary new lines in DeviceDAOImpl
|
2015-08-27 10:45:10 +05:30 |
|
mharindu
|
460fda1bb9
|
Removed unnecessary new lines in DeviceDAOImpl
|
2015-08-27 10:43:52 +05:30 |
|
mharindu
|
94326323bc
|
Added class level and method level comments for Policy core
|
2015-08-27 01:00:59 +05:30 |
|
harshanl
|
aeed8b92a1
|
Enabled adding custom permissions to permission-tree through webapps
|
2015-08-26 18:20:37 +05:30 |
|
mharindu
|
7fed00a14d
|
Removed unnecessary logs and added null checks in MonitoringManager
|
2015-08-26 18:10:10 +05:30 |
|
mharindu
|
8c748b3dfd
|
Removed unnecessary comments
|
2015-08-26 17:45:21 +05:30 |
|
mharindu
|
97c19c23b0
|
Added method level comments and null checks in DCA
|
2015-08-26 17:14:12 +05:30 |
|
mharindu
|
5e285071d8
|
Removed unnecessary white spaces
|
2015-08-26 15:16:29 +05:30 |
|
hasuniea
|
9f6dd55223
|
fixed issue in modify enrollment
|
2015-08-26 14:05:21 +05:30 |
|
mharindu
|
a51e7646e3
|
Fixing issues of previous PRs
|
2015-08-26 12:48:53 +05:30 |
|
harshanl
|
1850a76462
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-25 09:47:11 +05:30 |
|
prabathabey
|
3582973f84
|
Code cleanup
|
2015-08-24 11:04:47 +05:30 |
|
prabathabey
|
d4c5d9023e
|
Adding necessary instructions for transaction handling
|
2015-08-24 11:04:28 +05:30 |
|
prabathabey
|
de2c378214
|
Code cleanup
|
2015-08-24 10:15:50 +05:30 |
|
prabathabey
|
f66d1dd07b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-24 10:14:22 +05:30 |
|
harshanl
|
423c8e2727
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-24 10:05:24 +05:30 |
|
prabathabey
|
ce0cc1699f
|
Fixing more transaction handling related issues
|
2015-08-23 20:19:20 +05:30 |
|
Dilshan Edirisuriya
|
6cff144573
|
Merge pull request #26 from milanperera/master
Added null check to MonitoringManagerImpl
|
2015-08-22 05:16:26 +05:30 |
|
mharindu
|
fa82a28c0f
|
Added null check to MonitoringManagerImpl
|
2015-08-22 05:15:05 +05:30 |
|
prabathabey
|
2311572d49
|
code cleanup
|
2015-08-22 04:48:24 +05:30 |
|
prabathabey
|
cd31662a96
|
Fixing transactional anomalies found in PolicyManagerImpl
|
2015-08-22 04:42:35 +05:30 |
|
prabathabey
|
05c3d080e0
|
Fixing transactional anomalies found in PolicyManagerImpl
|
2015-08-22 04:09:59 +05:30 |
|
prabathabey
|
cdbdc86f42
|
Fixing transactional anomalies and code cleanup
|
2015-08-22 03:56:44 +05:30 |
|
harshanl
|
076d60ec83
|
PermissionManager changes
|
2015-08-22 03:01:20 +05:30 |
|
prabathabey
|
d7e363cef7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-22 01:51:56 +05:30 |
|
prabathabey
|
00807e8295
|
Fixing transaction anomalies and code clean up
|
2015-08-22 01:51:42 +05:30 |
|
Prabath Abeysekara
|
a5c9886c63
|
Merge pull request #25 from milanperera/master
Fixed "204 Content Not Found" issue in LicenseManager
|
2015-08-22 00:51:12 +05:30 |
|
mharindu
|
f36c82b059
|
Refactored LicenseManager
|
2015-08-22 00:47:17 +05:30 |
|