Commit Graph

6767 Commits

Author SHA1 Message Date
Ruwan
d2b485c883
Merge pull request #1263 from ruwany/master
Fixing serialization issue due to changes added to Operations DTO
2018-10-10 18:26:17 +05:30
Ace
deeeb2ce48 Persisting profile operations as string payloads and retriving same as strings, failing which as profile objects to support legacy functonality 2018-10-10 11:20:45 +05:30
Ace
77db878951 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-10-09 13:59:28 +05:30
Ace
a8e52ee781 Fixing issue due to change in serialVersionUID after adding additional field to Operation DTO and correcting flaw in notification sending logic 2018-10-09 13:57:02 +05:30
WSO2 Builder
7186ed2f62 [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare for next development iteration 2018-10-08 18:01:00 +00:00
WSO2 Builder
60aee974ff [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare release v3.1.41 2018-10-08 18:00:47 +00:00
Hasunie
a3f8a10dfd
Merge pull request #1262 from charithag/master
Geo fencing & notification fixes
2018-10-08 10:48:02 -07:00
charitha
5d13979629 Increased notification popup time 2018-10-08 23:11:51 +05:30
charitha
9381362a0a Provide workaround to address WS issue
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026
2018-10-08 23:11:44 +05:30
Ace
1fa0591f4b Fixing issue with notification sending logic 2018-10-08 23:11:38 +05:30
charitha
1f2f85d691 Increased notification popup time 2018-10-08 23:07:36 +05:30
charitha
53e1d3abde Provide workaround to address WS issue
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026
2018-10-08 22:52:55 +05:30
Milan Harindu
9af96d5fc4 Merge branch 'master' into 'master'
Fixing issue with notification sending logic

See merge request entgra/carbon-device-mgt!27
2018-10-07 13:54:48 +00:00
Ace
4b08dd6053 Fixing issue with notification sending logic 2018-10-06 15:46:47 +05:30
charitha
59bc8db4b1 Fix build issue in gitlab 2018-10-03 00:53:20 +05:30
charitha
d4005222c8 Fix build issue in gitlab 2018-10-03 00:09:39 +05:30
charitha
2e730b73fa Fix build issue in gitlab 2018-10-02 23:38:04 +05:30
Milan Perera
cac08e38e7 Remove entgra release nexus repo 2018-10-01 11:30:08 +05:30
charitha
e12e7a3876 Add validation to event retrial 2018-09-30 21:57:29 +05:30
Ubuntu
e5cc5284e3 [maven-release-plugin] prepare for next development iteration 2018-09-28 17:13:33 +00:00
Ubuntu
ae078fe390 [maven-release-plugin] prepare release v3.2.0 2018-09-28 17:12:41 +00:00
Milan Perera
6d63f020e8 Update scm details 2018-09-28 19:01:46 +05:30
Milan Perera
411fb7ffa7 Add release repo 2018-09-28 14:28:28 +05:30
Milan Perera
466968802a Add entgra repos 2018-09-28 14:01:46 +05:30
Charitha Goonetilleke
5801271e31 Merge branch 'master' into 'master'
Whitelabel devicemgt jaggeryapp

See merge request entgra/carbon-device-mgt!16
2018-09-27 13:19:37 +00:00
Milan Perera
53f8014730 Whitelabel devicemgt jaggeryapp 2018-09-27 11:09:13 +05:30
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