community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,541 Commits 31 Branches 461 Tags 183 MiB
b90f188e9b
Commit Graph

6541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
charitha
034a15aa59 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 2018-09-26 14:23:04 +05:30
WSO2 Builder
353d6936db [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare for next development iteration 2018-09-19 15:36:32 +00:00
WSO2 Builder
8e2541b9ac [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare release v3.1.40 2018-09-19 15:36:20 +00:00
Milan Perera
cf2aaa21de
Merge pull request #1260 from milanperera/iot331 
Fixed issue in the order of get pending operations
 2018-09-19 20:53:17 +05:30
Milan Perera
4c7bd0664d Fix issue in order of get pending operations 2018-09-19 16:30:41 +05:30
charitha
b5ce0fdd03 Merge branch 'iots-3.3.1' into entgra-master 2018-09-19 13:15:21 +05:30
charitha
b46e45dae4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-09-13 15:29:30 +05:30
charitha
fd8e73480d Order by on operation mapping ID 2018-09-13 15:28:58 +05:30
charitha
7ea609612c Revert "This is the fix for the intermittent issues when applying policies on devices" 
This reverts commit ba8537e
 2018-09-12 13:29:23 +05:30
WSO2 Builder
01991dcc4d [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare for next development iteration 2018-09-12 07:55:38 +00:00
WSO2 Builder
18b81223df [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare release v3.1.39 2018-09-12 07:55:26 +00:00
charitha
530484ac5d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-09-12 13:19:50 +05:30
Milan Perera
39aa9c5c88
Merge pull request #1259 from milanperera/master-new 
Fix wso2/product-iots#1863
 2018-09-12 13:08:33 +05:30
Milan Perera
576fa40cb0 Modify addOperation logic to improve the performance 2018-09-12 11:10:55 +05:30
Milan Perera
77f7792bc7 Fix wso2/product-iots#1863 2018-09-12 11:00:12 +05:30
charitha
63660eeb91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-09-12 09:36:56 +05:30
WSO2 Builder
cbbd327a02 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare for next development iteration 2018-09-11 06:43:08 +00:00
WSO2 Builder
de07597d53 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare release v3.1.38 2018-09-11 06:42:55 +00:00
Dharshana Warusavitharana
8e8ad03814
Merge pull request #1257 from aselarbd/master 
Fixes for multiple issues in IOT server
 2018-09-11 11:57:08 +05:30
aselarbd
ba8537e198 This is the fix for the intermittent issues when applying policies on devices 
Please find the GitHub issue from [1]

[1]: https://github.com/wso2/product-iots/issues/1833
 2018-09-10 11:56:59 +05:30
aselarbd
8fbe1a4234 This is the fix for the enrollment error occurred when a user enrols android device to EMM 2.2.0 in FCM enabled environment if whitelist policy is enforced. 
Please find the GitHub issue from [1]

[1]: https://github.com/wso2/product-iots/issues/1827
 2018-09-07 14:56:31 +05:30
aselarbd
3ca4672ac6 This commit fix the issue "Change password option does not work from the portal IOT server 3.1.0 " 
For more info refer https://github.com/wso2/product-iots/issues/1835
 2018-09-07 14:21:14 +05:30
charitha
3a319ebcc3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-08-31 11:06:55 +05:30
WSO2 Builder
3401a8c845 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare for next development iteration 2018-08-30 14:38:47 +00:00
WSO2 Builder
ecadadef94 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare release v3.1.37 2018-08-30 14:38:36 +00:00
Geeth
b6c835d2ee
Merge pull request #1256 from geethkokila/master 
Fix https://github.com/wso2/product-iots/issues/1857
 2018-08-30 19:50:12 +05:30
geethkokila
2f428c8a58 Fix https://github.com/wso2/product-iots/issues/1857 
Filtering the activities based on the user who added the operation
 2018-08-30 18:01:12 +05:30
WSO2 Builder
2b6de6834b [maven-release-plugin] prepare for next development iteration 2018-08-30 09:30:45 +00:00
WSO2 Builder
16c6a27f81 [maven-release-plugin] prepare release v3.1.36 2018-08-30 09:30:34 +00:00
Geeth
a421c12d5e
Merge pull request #1255 from charithag/iots-3.3.1 
Update manager urls and product version
 2018-08-30 14:15:27 +05:30
charitha
3443af1ae2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-08-30 11:51:50 +05:30
charitha
22f02c4062 Update manager urls and product version 2018-08-30 11:51:16 +05:30
WSO2 Builder
252b260237 [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare for next development iteration 2018-08-22 10:22:19 +00:00
WSO2 Builder
a2422cb02a [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare release v3.1.35 2018-08-22 10:22:09 +00:00
Geeth
f5515bfa5f
Merge pull request #1252 from abhishekdesilva/master 
Checking for pending operations before adding an operation
 2018-08-22 15:37:21 +05:30
abhishekdesilva
85040f0c68 Log debug process completion 2018-08-21 15:00:14 +05:30
abhishekdesilva
4aad82437b Log info has changed into debug 2018-08-21 14:46:18 +05:30
abhishekdesilva
a0bc1cdd20 Reformatted the code block as necessary 2018-08-21 09:53:23 +05:30
WSO2 Builder
af7aa73886 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare for next development iteration 2018-08-20 15:59:37 +00:00
WSO2 Builder
47ed74c156 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare release v3.1.34 2018-08-20 15:59:26 +00:00
Charitha Goonetilleke
1885afbd77
Merge pull request #1254 from charithag/iots-3.3.1 
Add secure web socket proxy to route ws connections in IoTS cluster
 2018-08-20 21:16:42 +05:30
charitha
d54d78a02b Refactoring 2018-08-20 21:16:08 +05:30
charitha
98dfced2b6 Remove unnecessary dependency 2018-08-20 19:03:52 +05:30
charitha
82778f06c6 Add secure web socket proxy to route ws connections in IoTS cluster 2018-08-20 15:44:55 +05:30
WSO2 Builder
4848e271af [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare for next development iteration 2018-08-13 10:09:29 +00:00
WSO2 Builder
c79baf3392 [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare release v3.1.33 2018-08-13 10:09:18 +00:00
Geeth
5d70a252ef
Merge pull request #1253 from geethkokila/master 
Adding a audit trail for operation
 2018-08-13 15:25:09 +05:30
geethkokila
7d34928ac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-08-13 14:56:13 +05:30
geethkokila
1d427aef73 Fix https://github.com/wso2/product-iots/issues/1852 2018-08-13 14:55:00 +05:30
charitha
e858f5b627 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-08-13 12:21:24 +05:30