Commit Graph

6541 Commits

Author SHA1 Message Date
Ace
3f77a3b27c Adding correct tenant ID 2018-10-18 11:55:20 +05:30
Ace
92bf6f4140 Fixing formatting issues 2018-10-18 11:36:12 +05:30
Ace
b39be48919 Adding constants 2018-10-18 11:31:10 +05:30
Ace
8bc15e1f14 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-10-18 11:24:10 +05:30
Ace
4aee621039 Fixing tenanted username 2018-10-17 20:30:17 +05:30
Ace
1721824d53 Fixing issue where super tenant table space is querried instead of relavent tenant when retrieving geo location data 2018-10-17 16:49:29 +05:30
Milan Perera
a01886cb37 Handle NotNow response from device 2018-10-16 21:12:05 +05:30
WSO2 Builder
e7a9406789 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare for next development iteration 2018-10-16 13:39:36 +00:00
WSO2 Builder
b87b073739 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare release v3.1.44 2018-10-16 13:39:24 +00:00
Hasunie
e52675feef
Merge pull request #1265 from milanperera/notnow-wso2-fix
Handle NotNow response from device
2018-10-16 06:25:43 -07:00
Milan Perera
b256d55847 Handle NotNow response from device 2018-10-16 17:41:39 +05:30
Charitha Goonetilleke
61e5cd4b53 Merge branch 'master' into 'master'
Persisting profile operations as string values instead of Objects

See merge request entgra/carbon-device-mgt!30
2018-10-12 08:55:10 +00:00
Ace
de0bc0bb50 persisting profile operation payloads as string values as upposed to profile objects. this will iron iot future compatibility issues that may arise, due to operation dto getting updated 2018-10-12 10:44:53 +05:30
Ace
f06f83adda Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2018-10-12 10:37:58 +05:30
WSO2 Builder
806ac13c39 [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare for next development iteration 2018-10-12 03:58:28 +00:00
WSO2 Builder
e3901043fc [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare release v3.1.43 2018-10-12 03:58:17 +00:00
Geeth
5ee7cba36a
Merge pull request #1264 from ruwany/master
Persisting profile operations as string values instead of Objects
2018-10-12 09:11:58 +05:30
Ace
cb0fb87b49 Fixing test failures and adding enhancements 2018-10-11 16:37:13 +05:30
Ace
4b71c6ec40 Operation retrieval logic changed to retrieve operation details via table merge instead of secondary DB call 2018-10-11 14:21:26 +05:30
Ace
de9cf67977 fixing issues with notification status not getting updated 2018-10-10 22:35:05 +05:30
charitha
ac4be9196d Updated email templates 2018-10-10 21:31:20 +05:30
WSO2 Builder
3782e68f27 [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare for next development iteration 2018-10-10 13:11:05 +00:00
WSO2 Builder
3111680b9f [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare release v3.1.42 2018-10-10 13:10:53 +00:00
Ace
e487ef4627 Fixing issue due to changes in serialVersionUID after adding an additional field to Operation DTO. As a fix, serializationUID of the earlier revision of the class was included in the current code 2018-10-10 18:37:37 +05:30
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