Commit Graph

620 Commits

Author SHA1 Message Date
lasanthaDLPDS
f9ec82e4dc Merge with upstream 2018-09-15 12:50:18 +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
lasanthaDLPDS
d293b5b1b8 Fix merge conflixts 2018-08-19 15:06:25 +05:30
charitha
ead01f837d Fixed issue in Geo fencing 2018-07-26 12:23:47 +05:30
charitha
2bfd598c67 Add location extraction from device properties and deice type specific location retrieval 2018-07-23 11:35:17 +05:30
geethkokila
54fc0be69f Fix the device information delete issue 2018-03-16 17:23:45 +05:30
charitha
f62cb4febd Add missing media type 2018-03-16 01:46:41 +05:30
geethkokila
7aab14c07d Fix the path parameter 2018-03-15 16:50:04 +05:30
Ruwan Yatawara
88924ac8d6 Correcting issue with events resource path 2018-03-15 14:31:44 +05:30
Rasika Perera
108675261f
Merge pull request #1193 from lashanfaliq95/master
Updated the last-known api to be able to return a number of records.
2018-03-14 15:14:07 +05:30
lashanfaliq95
d60b885045 changed the parameters "type" and "deviceId" as required for the last-know api. 2018-03-14 14:44:47 +05:30
lashanfaliq95
b4f78337fa last-known api
updated the comment of the api and handled the error when a negative
value is passed as the limit.
2018-03-14 13:49:11 +05:30
Arcane94
50a14e4321 Requested changes 2018-03-14 12:05:21 +05:30
Arcane94
8c303911b0 Final frontend and backend changes 2018-03-14 12:05:21 +05:30
Arcane94
1ffaad6fb7 rolling back some imports 2018-03-14 11:59:54 +05:30
Arcane94
27ae7cfed8 Fix for adding alerts twice with same name bug 2018-03-14 11:57:01 +05:30
Arcane94
9e64c8971d Minor changes in execution plans 2018-03-14 11:46:38 +05:30
Arcane94
7c88dfa0b3 Minor changes in backend APIs 2018-03-14 11:46:38 +05:30
Arcane94
7583957e16 Execution Plans and other updates 2018-03-14 11:46:38 +05:30
Arcane94
790f91b3b7 Add method overloads 2018-03-14 11:46:38 +05:30
geethkokila
ec3f814133 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 10:05:48 +05:30
Lashan Faliq
51753ebbbf Merge branch 'master' into master 2018-03-13 14:48:50 +05:30
Arcane94
2fb5ec431a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-09 14:46:56 +05:30
shavidissa
b9cde9b936 Updated the swagger content - Groups (#1211)
* Updated the swagger content for the APIs used to add devices to groups

* Formatting the swagger content
2018-03-08 19:45:14 +05:30
geethkokila
9f9fd963a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-08 10:22:36 +05:30
Shavindri Dissanayake
ead0e202d6 updating the swagger content 2018-03-07 19:34:45 +05:30
Arcane94
c0024ce26f Exception name change and minor modifications 2018-03-05 10:42:26 +05:30
geethkokila
b50c657b6b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-05 10:09:22 +05:30
charitha
ab4f2b4833 Add response status to device property update API and improve db connection handling in device property update 2018-03-03 22:47:32 +05:30
geethkokila
b78e6d6d01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-27 14:36:13 +05:30
Arcane94
50503fc7c0 Fixing the issue when defining alerts with same name 2018-02-24 15:15:36 +05:30
lashanfaliq95
7a1c17081b fixed the issues 2018-02-23 18:15:15 +05:30
Madawa Soysa
de9480e721
Merge pull request #1196 from lasanthaDLPDS/master
Formatting device-location API
2018-02-23 15:26:07 +05:30
lasantha
175c987b8a formatting device-location API 2018-02-23 14:29:49 +05:30
lashanfaliq95
65cfca7024 Updated the last-known api to be able to return a number of records. 2018-02-23 09:00:18 +05:30
kamidu
66a4e60b16 Enable user's last name in the email template
This is to enable the user's last name also to be included in the meta information list on email templates. When customizing the email template users can define to include both fist and last name to the content or title of the email
2018-02-22 17:53:24 +05:30
geethkokila
8cf1bd996c Adding the privacy api
This is has an api to delete device of users when they request
2018-02-22 15:54:09 +05:30
kamidu
f87a3a6b08 Fixing the issue when marking as read notification
The issue occures when the notification id is larger than 45 due to the restiction on paramater size. I have removed the related validation in order to resolve the issue.
2018-02-20 14:33:33 +05:30
lasantha
ae1c99f665 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into application-mgt-new 2018-01-28 09:27:16 +05:30
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
Madhawa Perera
e56fb5f4de
New Activity Info Provider API resource which accept an array of activity IDs to get activity information (#1161)
* New Activity Info Provider API resource which accept an array of activity IDs to get activity information

* Modifications to the new activity info provider api

* Add acceptable activity list count validation

* Modifications to the new activity provider API resource

* Added license header to the test class

* Modifications to the new activity provider api
2018-01-22 09:38:51 +05:30
lasantha
667f997f34 merging with master branch 2017-12-24 14:19:50 +05:30
lasantha
11ea50e8ab Adding AP improvements(incomplete) 2017-12-24 13:58:41 +05:30
Rasika Perera
7b8ba259e4
Merge pull request #1134 from madhawap/vf-dev-3
Added an API to filter activities by operation code
2017-12-21 18:43:17 +05:30
Madawa Soysa
e786fa410b Checking if the user store manager class is a sub class of the default
This commit is to modify the current logic which checks if the UserStoreManager class is equal to the JDBCUserStoreManager class to support subclasses of the JDBCUserStoreManager class to return correct total user count.

In this commit, instead of comparing the string name, tests the UserStoreManager instance is a type of JDBCUserStoreManager.

Resolves wso2/product-iots#1556
2017-12-21 17:06:28 +05:30
Ace
fb6c98b969 Restricting clear notifications to tenant domain only 2017-12-18 12:43:37 +05:30
Ace
9ac89d1ebe merging with upstream 2017-12-16 10:03:28 +05:30
Ace
855f294ed2 improving notifications management 2017-12-16 10:03:02 +05:30
Madawa Soysa
8df3999cbc
Merge pull request #1135 from Kamidu/master
Enable roles containing the filter to be listed in role listing
2017-12-15 14:55:04 +05:30
Madawa Soysa
30da164121
Merge pull request #1136 from lasanthaDLPDS/vf-dev-api
Adding v0.9 API version for device management and certificate management
2017-12-15 14:38:34 +05:30