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
8,315 Commits 31 Branches 461 Tags 183 MiB
6cb15c7e7f
Commit Graph

6655 Commits

Author SHA1 Message Date
lasanthaDLPDS
0a8848121c Improve APPM subscribing method 2019-05-25 10:32:46 +05:30
lasanthaDLPDS
06e9591e36 Fix device-mgt operation log displaying issue 2019-05-24 06:06:36 +05:30
lasanthaDLPDS
7b8e68220f Add minor fixes in APP subscription flow 2019-05-23 14:16:08 +05:30
lasanthaDLPDS
efa17d2e51 Merge with upstream master 2019-05-23 14:06:29 +05:30
lasanthaDLPDS
c1c821e0f7 Add device subscription functionality for APPM 2019-05-23 14:03:42 +05:30
lasanthaDLPDS
ab841939a4 Add improvement for user subscription method in APPM 2019-05-22 18:45:47 +05:30
Jayasanka
e59ed1d807 Load screenshots from array 2019-05-22 18:15:11 +05:30
Jayasanka
9c9790f2ed Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-05-22 17:45:10 +05:30
Jayasanka
64747a8c26 Make layout responsive 2019-05-22 17:44:55 +05:30
lasanthaDLPDS
7c593d83fa Add APIs for subscription management 2019-05-22 17:39:09 +05:30
Jayasanka
c99d572317 Make layout responsive 2019-05-22 16:06:14 +05:30
Jayasanka
cdca1900cf Add headers with viewport meta tag 2019-05-22 14:09:18 +05:30
Jayasanka
753a347848 Display screenshots and icon 2019-05-22 14:04:13 +05:30
Jayasanka
14db806fb0 Fix lifecycle not updating issue 2019-05-22 10:02:27 +05:30
Saad Sahibjan
2da0a6aa19 Fix macos enrollment error due to invalid challenge token 2019-05-20 11:54:13 +05:30
Saad Sahibjan
a9f19a6afb Merge branch 'master' into 'master' 
Add missing permission in v0.9 API

See merge request entgra/carbon-device-mgt!73
 2019-05-18 08:00:13 +00:00
lasanthaDLPDS
15dac5bc69 Add review deleting functionality 2019-05-17 22:07:44 +05:30
lasanthaDLPDS
e8743f001b Add admin APIs for review management 2019-05-17 07:45:21 +05:30
lasanthaDLPDS
569809b1de Add API to update an application release review 2019-05-16 22:38:17 +05:30
lasanthaDLPDS
726739a81f Fix merge conflicts 2019-05-16 20:15:43 +05:30
lasanthaDLPDS
6e3742aff3 Add APIs for APPM review management 2019-05-16 17:38:59 +05:30
Jayasanka
26fa7ae1b2 Change invoker call of lifecycle in publisher ui 2019-05-16 14:24:06 +05:30
Jayasanka
6300b7ff98 Change invoker call of lifecycle in publisher ui 2019-05-16 14:19:07 +05:30
Jayasanka
756324d883 Fix minor issue in publisher ui lifecycle 2019-05-16 14:16:36 +05:30
Jayasanka
fdd9d77a47 Create change lifecycle function 2019-05-16 14:04:46 +05:30
Jayasanka
c58264241b Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-16 12:12:52 +05:30
Jayasanka
b19c79bb44 Create action for change lifecycle 2019-05-16 12:12:24 +05:30
lasanthaDLPDS
5ea379dfd0 Improve review management and lifecycle management in APPM 2019-05-16 11:57:25 +05:30
Saad Sahibjan
f3b580277b Add UI for update enrollment 2019-05-16 10:05:17 +05:30
lasanthaDLPDS
03ae304234 Fix lifecycle changing issue 2019-05-16 03:56:45 +05:30
lasanthaDLPDS
a1b8632aa4 Improve review management 2019-05-15 17:18:17 +05:30
Jayasanka
35a62ae52e Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-15 17:07:40 +05:30
Jayasanka
abee848e2b render Lifecycle from new library 2019-05-15 16:58:45 +05:30
lasanthaDLPDS
25d9569952 Add APIs for APPM review management 2019-05-15 09:13:32 +05:30
lasanthaDLPDS
8a6411bac6 Add APPM store APIs for getting application data 2019-05-13 17:48:23 +05:30
lasanthaDLPDS
f356b0df6b Improve APPM publisher APIs 2019-05-13 13:54:14 +05:30
lasanthaDLPDS
b48fa9df7c Fix minor issue in App publisher interface 2019-05-13 07:58:32 +05:30
lasanthaDLPDS
c6440a779d Add support for application category list adding for an application. 2019-05-13 01:52:24 +05:30
lasanthaDLPDS
be992c4b8d add APIs for managing caregories 2019-05-12 01:11:45 +05:30
lasanthaDLPDS
b4643d84cd Add tag managing APIs for app manager 2019-05-10 17:10:35 +05:30
lasanthaDLPDS
1b0983dafb Fix isues in app release update 2019-05-10 09:25:06 +05:30
inoshperera
e98674f9b9 init commit for MacOS 2019-05-10 07:57:39 +05:30
Jayasanka
7f70dd96e0 Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-05-09 17:22:48 +05:30
Jayasanka
6b9d24f886 Create action for change lifecycle 2019-05-09 17:20:56 +05:30
Jayasanka
c2018da2e8 Fix issue: Publisher 
not opening modal for second time
 2019-05-09 16:50:36 +05:30
Geeth Munasinghe
48d606bdde Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-09 15:55:45 +05:30
Geeth Munasinghe
9257b072e9 fix the saving location 2019-05-09 15:55:14 +05:30
lasanthaDLPDS
70440cb88a Merge branch 'application-mgt-new' of gitlab.com:tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-09 15:50:41 +05:30
lasanthaDLPDS
ed30867f3a Add APIs which are related to application tag management 2019-05-09 15:49:56 +05:30
Geeth Munasinghe
e39b34af13 remove node js 2019-05-09 15:48:28 +05:30
Geeth Munasinghe
438577dcd5 remove node js 2019-05-09 15:46:08 +05:30
Geeth Munasinghe
911710291a add test cases 2019-05-09 15:44:10 +05:30
Jayasanka
b39a52fd7c Create new action for lifecycle modal 2019-05-09 15:38:25 +05:30
lasanthaDLPDS
1a3d3215a0 Add API for delete an application tag 2019-05-08 17:59:13 +05:30
lasanthaDLPDS
3eb69a9fca Improve the format of category and tag classes 2019-05-08 12:24:28 +05:30
lasanthaDLPDS
a9a608bc84 Add APIs for getting registered tags and categories 2019-05-08 09:48:12 +05:30
Jayasanka
1c8d5bfc3e Create lifecycle diagram 2019-05-08 00:05:52 +05:30
Jayasanka
62e0430d1d Create lifecycle diagram 2019-05-08 00:05:34 +05:30
Jayasanka
6a67e59243 Get lifecycle from API 2019-05-07 14:47:01 +05:30
Jayasanka
29e06ddf4e Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-05-07 10:24:16 +05:30
lasanthaDLPDS
f93185a11b Improve publisher jax-rs logic 2019-05-07 02:40:12 +05:30
lasanthaDLPDS
38006c8ff0 Fix issues in lifecycle management feature 2019-05-07 02:19:18 +05:30
lasanthaDLPDS
6d4252a5dd Fix issues in lifecycle adding method 2019-05-06 21:53:54 +05:30
lasanthaDLPDS
a3d75df8a0 Add lifecycle adding API 2019-05-06 18:01:52 +05:30
Jayasanka
07e7d96174 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-06 15:01:46 +05:30
lasanthaDLPDS
e293a236c5 Add application delete admin API 2019-05-06 15:01:22 +05:30
Jayasanka
e1589575e9 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-06 15:00:32 +05:30
Jayasanka
a3798b8bfa created util to auto arrange nodes in LifeCycle 2019-05-06 14:57:53 +05:30
Jayasanka
6d9c522334 viewed basic diagram in lifecycle 2019-05-06 14:20:58 +05:30
Charitha Goonetilleke
ca83635f13 Fix log issue in test cases 2019-05-06 08:46:41 +00:00
lasanthaDLPDS
018d078e1b Improve life cycle manager 2019-05-06 00:03:07 +05:30
lasanthaDLPDS
1900d1d1ef Add frontend-maven-plugin 2019-05-04 08:48:56 +05:30
Dharmakeerthi Lasantha
8926e7ffd8 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Publisher: View Releases

See merge request entgra/carbon-device-mgt!84
 2019-05-03 17:12:12 +00:00
lasanthaDLPDS
d0f48a2c72 Remove lifecycle graph classes 2019-05-03 21:10:03 +05:30
lasanthaDLPDS
7ef9485b7d Fix issues in lifecycle retrieving API 2019-05-03 21:05:46 +05:30
lasanthaDLPDS
1100db4d67 Add lifecycle retrieving API 2019-05-03 17:01:40 +05:30
Jayasanka
1712792d87 display release 2019-05-03 15:41:17 +05:30
lasanthaDLPDS
f95f872732 Add application release deleting API 2019-05-02 18:38:15 +05:30
lasanthaDLPDS
3a5cf16c26 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-05-02 15:12:30 +05:30
Jayasanka
795acbe219 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-02 14:05:24 +05:30
Jayasanka
1d14bc39c4 Link release to Release component 2019-05-02 14:05:17 +05:30
lasanthaDLPDS
16e2da3c0b Add API for getting application release 2019-05-02 13:48:32 +05:30
Jayasanka
ccc7021d1e Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-05-02 11:48:52 +05:30
Jayasanka
20b13d1512 changed Icon and color on App Card 2019-05-02 11:16:21 +05:30
lasanthaDLPDS
b991ed22ee Improve get applications method 2019-05-02 03:00:32 +05:30
lasanthaDLPDS
6dafe59eab Improve application create functionality 2019-05-02 02:46:45 +05:30
lasanthaDLPDS
5399ae1a3c Add subscription management exception class 2019-05-01 20:08:43 +05:30
lasanthaDLPDS
d79c11c762 Add admin API interface for app publisher 2019-05-01 19:48:27 +05:30
Jayasanka
89cf25432e Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-30 22:34:20 +05:30
Jayasanka
9dc007c1da loaded releases in modal (basic view) 2019-04-30 22:32:59 +05:30
lasanthaDLPDS
04c03c9f46 Fix application release adding API 2019-04-30 22:31:21 +05:30
Jayasanka
9843e6f0e2 loaded modal with redux 2019-04-30 21:55:39 +05:30
Jayasanka
fffad9eea4 displayed modal title from redux 2019-04-30 18:03:33 +05:30
Jayasanka
31ce3fb9d0 changed action types to single object 2019-04-30 16:54:36 +05:30
Jayasanka
4864d5f8ec moved components to sub directory 2019-04-30 15:50:05 +05:30
lasanthaDLPDS
eb6998f297 Fix application release update method 2019-04-29 22:09:12 +05:30
Dharmakeerthi Lasantha
4482245971 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Add Login Redirection

See merge request entgra/carbon-device-mgt!77
 2019-04-29 12:27:14 +00:00
Jayasanka
feb68e9a70 Changed hard coded urls to config 2019-04-29 17:54:02 +05:30
Jayasanka
42727786ce changed platform to devicetype 2019-04-29 17:07:41 +05:30
Jayasanka
6ce3eceb70 get Data 2019-04-29 17:06:26 +05:30
Jayasanka
1b3390f1b9 Load data from Redux state 2019-04-29 16:21:03 +05:30
Jayasanka
321a2e902c Created component to list apps 2019-04-29 16:10:06 +05:30
Jayasanka
1cd23097d5 created component to load apps 2019-04-29 15:38:50 +05:30
Jayasanka
ca1f147c77 fixed wrong redirection 2019-04-29 13:51:03 +05:30
Jayasanka
9c80756c12 refactored Apps Component 2019-04-29 13:35:32 +05:30
lasanthaDLPDS
68b9795201 Fix application update issue 2019-04-29 00:54:10 +05:30
Jayasanka
c3689010dd Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-28 21:53:31 +05:30
lasanthaDLPDS
93fa110a08 Fix App update issue 2019-04-28 20:08:10 +05:30
Jayasanka
4babef6211 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-28 19:31:49 +05:30
lasanthaDLPDS
5837e53d1f Fix scope issue in APPM publisher 2019-04-28 19:26:20 +05:30
lasanthaDLPDS
8bf0a67336 Add missing log line 2019-04-28 18:33:17 +05:30
Jayasanka
7301d98328 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-28 18:33:16 +05:30
Jayasanka
1c86d57da3 changed routes 2019-04-28 18:32:57 +05:30
lasanthaDLPDS
5c6a3cba1f Improve web app authentication 
Improve web app authentication to unsecure dynamic context paths and further improve app management APIs
 2019-04-28 18:16:25 +05:30
Jayasanka
9a580e513f fixed routing 2019-04-28 17:22:16 +05:30
Jayasanka
b3d87186eb listed apps 2019-04-28 16:32:25 +05:30
Jayasanka
c1cf3faba9 fixed error redirection 2019-04-28 14:57:00 +05:30
lasanthaDLPDS
7703d217f9 Add App updating API 2019-04-26 23:03:51 +05:30
Jayasanka
5865cecf3e Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-04-26 15:00:21 +05:30
lasanthaDLPDS
460394c9da Improve application edit functionality 2019-04-26 09:49:19 +05:30
Charitha Goonetilleke
7a16ac7532 Fix build failure 2019-04-25 09:01:37 +00:00
Charitha Goonetilleke
0c471fbb0b Add capability to store device type specific platform configurations for any device type 2019-04-25 08:47:20 +00:00
lasanthaDLPDS
9fab48839d Add changes in master branch 2019-04-25 00:02:07 +05:30
lasanthaDLPDS
84e3beb6f6 Fix merge conflicts 2019-04-24 23:09:16 +05:30
lasanthaDLPDS
c2afa1126a Remove v0.9 API source 2019-04-24 19:58:08 +05:30
lasanthaDLPDS
39b1f0b72e Remove v0.9 API 2019-04-24 19:42:34 +05:30
Jayasanka
7c25663022 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-24 15:15:06 +05:30
Dharmakeerthi Lasantha
dd5109c2aa Merge branch 'application-mgt-new' into 'application-mgt-new' 
Add login

See merge request tcdlpds/carbon-device-mgt!3
 2019-04-24 09:31:22 +00:00
Gathika Ratnayaka
38c7f6211e Additional methods and unit tests to LifeCycleManager 2019-04-24 09:10:58 +00:00
lasanthaDLPDS
707d885107 Improve APPM proxy response 2019-04-24 14:31:43 +05:30
lasanthaDLPDS
ba4d73d940 Add missing permission in v0.9 API 2019-04-24 13:17:32 +05:30
Jayasanka
0095d188b7 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-24 10:49:13 +05:30
lasanthaDLPDS
f1672ee961 Add artifact download API 2019-04-24 10:45:16 +05:30
lasanthaDLPDS
c9f928915e Add application artifact dowloading API 2019-04-24 02:58:59 +05:30
Jayasanka
281511d93e Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-23 22:29:45 +05:30
Jayasanka
ee80e42e9a Publisher: added basic redirection to login page if not logged in 2019-04-23 22:29:19 +05:30
lasanthaDLPDS
e1bad46558 Fix Handler issues 2019-04-23 22:27:05 +05:30
Jayasanka
c64cb80507 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-23 21:53:29 +05:30
Jayasanka
9f402d5f91 Publisher: added default child route 2019-04-23 21:47:44 +05:30
Jayasanka
f5c1eea6fa removed console logs 2019-04-23 19:43:06 +05:30
lasanthaDLPDS
96fc71c00b Fix minor issues in APPM proxy 2019-04-23 16:49:47 +05:30
Entgra Builder
54b0a0afd0 [maven-release-plugin] prepare for next development iteration 2019-04-23 10:42:17 +00:00
Entgra Builder
6dd8ca9484 [maven-release-plugin] prepare release v3.2.4 2019-04-23 10:42:10 +00:00
Jayasanka
18f4f877ca completed login with redirection 2019-04-23 15:59:57 +05:30
lasanthaDLPDS
cf8e23ff32 Fix get applications API response 2019-04-23 15:32:54 +05:30
Dharmakeerthi Lasantha
71c792739c Merge branch 'application-mgt-new' into 'application-mgt-new' 
Publisher Send Login request

See merge request tcdlpds/carbon-device-mgt!2
 2019-04-23 08:58:17 +00:00
Jayasanka
369bc869c5 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-23 14:26:33 +05:30
lasanthaDLPDS
6fe5b11db1 Fix app manager access token creating issue 2019-04-23 14:25:15 +05:30
Jayasanka
6dbcb37ea2 Send request from login page 2019-04-22 22:58:47 +05:30
Jayasanka
eeb4d961d0 Created folder structure for redux 2019-04-22 16:55:42 +05:30
Jayasanka
e93de0b67d Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-22 13:30:33 +05:30
lasanthaDLPDS
42a4196ed4 Fix token generating for APPM and add WIP code 2019-04-22 10:51:26 +05:30
Jayasanka
4681ac250f Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-21 12:02:51 +05:30
lasanthaDLPDS
6c543922b4 Add ne APIs and refactor 2019-04-21 02:16:57 +05:30
Saad Sahibjan
80ccaf8fcc Merge branch 'ios-fix' into 'master' 
iOS enrollment fix

See merge request entgra/carbon-device-mgt!71
 2019-04-20 05:53:45 +00:00
inoshperera
0c304e862b iOS enrollment fix 2019-04-20 10:33:52 +05:30
Pahansith Gunathilake
4aa7987be8 Fix notification not showing issue - Issue ID #84 2019-04-19 08:08:33 +00:00
lasanthaDLPDS
19f088d222 Add get application and add new release APIs 2019-04-19 13:19:59 +05:30
Jayasanka
380d8f6538 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-18 19:48:12 +05:30
Entgra Builder
14337bb884 [maven-release-plugin] prepare for next development iteration 2019-04-18 13:58:18 +00:00
Entgra Builder
736ce76df6 [maven-release-plugin] prepare release v3.2.3 2019-04-18 13:58:11 +00:00
lasanthaDLPDS
e747c0bdb0 Add API for getting applications 2019-04-18 17:52:08 +05:30
Jayasanka
42a91ac923 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-04-18 11:08:06 +05:30
Inosh Perara
25a743f8e5 Merge branch 'master' into 'master' 
Add an API to update the device owner for given device identifiers.

See merge request entgra/carbon-device-mgt!68
 2019-04-18 04:55:48 +00:00
lasanthaDLPDS
12d46550e6 Fix requested changes in the review 2019-04-17 15:40:22 +05:30
Pahansith Gunathilake
2a6b960e80 Change Product Version to 3.5.0 2019-04-16 21:06:03 +00:00
lasanthaDLPDS
cc989148d6 Add an API to update the device owner for given device identifiers. 
Further, add an API to get device activities without passing the username. Username is retrieved from the carbon context.
 2019-04-16 20:11:02 +05:30
Jayasanka
a2ff850d06 changed layout of add nuw app in publisher 2019-04-11 15:53:09 +05:30
Jayasanka
f260dfdc8b changed layout of add nuw app in publisher 2019-04-11 14:10:27 +05:30
Jayasanka
36127ceca5 added semicolons in line endings 2019-04-11 10:04:23 +05:30
Entgra Builder
65eb70139b [maven-release-plugin] prepare for next development iteration 2019-04-10 19:04:25 +00:00
Entgra Builder
6bbbbdc18b [maven-release-plugin] prepare release v3.2.2 2019-04-10 19:04:19 +00:00
Pahansith Gunathilake
b075688d91 Whitelabel UI 2019-04-10 17:29:05 +00:00
Milan Perera
89e3c91fe6 Fix device information reduction issue 2019-04-09 14:38:06 +05:30
Milan Perera
a7e40db75b Fix AuthenticationHandler Test Failure 2019-04-09 13:54:05 +05:30
Milan Perera
20a4fb7b01 Fix Authentication Handler Issue 
Replaced the invalid value in the AuthenticationHandler file to support mutual SSL.
 2019-04-09 13:33:16 +05:30
lasanthaDLPDS
e467453fd3 Integrate lifecycle management functionality 2019-04-09 07:34:02 +05:30
lasanthaDLPDS
a79b600922 Fix merge conflicts 2019-04-08 17:33:03 +05:30
lasanthaDLPDS
071ef71c86 Fix app installing issue for same package name 
If we add same installer as a new app  by giving different name, it was able to add as new application. But, if there is application release for same package name, the application adding should be blocked. Therefore verify if there is an application release for same package name before adding an application.
 2019-04-08 16:48:04 +05:30
lasanthaDLPDS
b06a908f5f Modify Entity Class name 2019-04-08 08:07:10 +05:30
lasanthaDLPDS
03dc9e8810 Improve app create response 2019-04-07 13:36:58 +05:30
lasanthaDLPDS
7e4cc36977 Fix app hash value getting issue 2019-04-05 17:20:00 +05:30
Jayasanka
075a973788 created the step one 2019-04-05 15:38:46 +05:30
Jayasanka
a1f6bc9935 removed unused imports 2019-04-05 15:38:46 +05:30
Jayasanka
d47651c533 completed designing apps page 2019-04-05 15:38:46 +05:30
Jayasanka
6fd321bf6b fixed logo 2019-04-05 15:38:46 +05:30
Gathika94
329499a962 resolve conflicts 2019-04-05 14:23:16 +05:30
lasanthaDLPDS
6a52997a82 Fix syntax issue in get application call 2019-04-05 08:40:55 +05:30
lasanthaDLPDS
017aa7af11 Remove commented code 2019-04-05 07:33:24 +05:30
lasanthaDLPDS
2f0f47fe92 Fix Application Creating Issue 2019-04-05 07:29:09 +05:30
Jayasanka
f4ec3e211c added all form items to single page 2019-04-04 23:38:35 +05:30
Jayasanka
59d3407cd5 moved items to left 2019-04-04 22:31:20 +05:30
Jayasanka
ae1d0cbff2 created the step one 2019-04-04 22:14:10 +05:30
Gathika94
c8b983fb93 Add seperate class to facilitate unit tests related to the LifeCycleManagementTest 2019-04-04 14:02:15 +05:30
Jayasanka
b5dc76d005 removed unused imports 2019-04-04 11:32:17 +05:30
Jayasanka
370605d288 completed designing apps page 2019-04-04 10:32:43 +05:30
Jayasanka
c51176f2cc fixed logo 2019-04-04 10:09:49 +05:30
lasanthaDLPDS
74e4b2ca5d Fix app adding issue 2019-04-04 09:07:28 +05:30
lasanthaDLPDS
8fa6abf697 Fix h2 SQL syntax errors 2019-04-04 08:37:48 +05:30
Gathika94
64507c1011 ensure unit tests related to LifeCycleManager running without issues 2019-04-04 05:58:42 +05:30
Gathika94
c67117eb01 change application-mgt.xml class related to the test cases 2019-04-02 15:46:59 +05:30
Gathika94
f714feb239 add new methods to check whether the app is updatable or installable in a given state 2019-04-01 08:32:28 +05:30
lasanthaDLPDS
e5fb01f23e Add application create fixes 2019-03-31 20:24:54 +05:30
Gathika94
bb808fd9e3 Rechange the app manager lifecycle xml file, add comments and headers 2019-03-29 14:26:35 +05:30
Saad Sahibjan
d64edd8cf9 Add handlebar helper to convert json to string 2019-03-28 14:26:07 +05:30
Gathika94
dc5547bb38 fix the dependency issue due to using DeviceManagementDataHolder when getting UserRealm 2019-03-28 11:55:09 +05:30
Gathika94
3bb2e8a5bf Add new method to put permission taking String parameters 2019-03-28 11:55:09 +05:30
Gathika94
6ba46facb1 change xml file and add relevant permission related to app mgmt lifecycle 2019-03-28 11:55:09 +05:30
Jayasanka
b591bede46 added steps to create app 2019-03-27 22:11:42 +05:30
Jayasanka
e3fcf68c3e Added filtering option 2019-03-27 22:11:22 +05:30
Jayasanka
1c4779d7cc Created Apps table 2019-03-27 19:17:58 +05:30
Jayasanka
c904587599 Created class for add new app 2019-03-27 19:17:37 +05:30
Jayasanka
f8ec1be9b8 Overrided css class for header 2019-03-27 19:17:07 +05:30
Jayasanka
3c50af2a14 Removed unused routs 2019-03-26 23:04:07 +05:30
Jayasanka
ab4b5d1764 Created Layout for dashboard 2019-03-26 22:40:28 +05:30
Jayasanka
536a2ca81b Created new routes with router config 2019-03-26 22:40:07 +05:30
lasanthaDLPDS
9876d8685c Refactor the source 2019-03-26 18:25:24 +05:30
lasanthaDLPDS
b2260b6919 Add modification to app creating flow 2019-03-25 21:07:44 +05:30
lasanthaDLPDS
02b99eb442 Merge branch 'application-mgt-new' of gitlab.com:tcdlpds/carbon-device-mgt into application-mgt-new 2019-03-23 02:32:08 +05:30
lasanthaDLPDS
5717e81cfb modefying DAO layer 2019-03-23 02:31:47 +05:30
Geeth Munasinghe
cf11ed671c Adding todos 2019-03-22 15:02:01 +05:30
lasanthaDLPDS
6e25a0bc3e Improve DB connection handling 2019-03-21 22:21:30 +05:30
Jayasanka
15f38ba101 Added login to router 2019-03-21 20:00:41 +05:30
Jayasanka
7ee7384969 Changed webpack to absolute path 2019-03-21 19:59:40 +05:30
lasanthaDLPDS
dc518dcca2 Add modification for app getting logic 2019-03-21 18:58:50 +05:30
Jayasanka
40e9fbebb8 Created Component for Sub Routes 2019-03-21 14:36:51 +05:30
lasanthaDLPDS
9dc885e888 Fix minor issues in APPM publisher 2019-03-21 01:47:39 +05:30
lasanthaDLPDS
3c9ba37bfb Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-03-20 23:25:30 +05:30
jayasanka
c7cb3319eb Added routings 2019-03-20 22:21:14 +05:30
lasanthaDLPDS
ed780cbe9a Fix app release deleting API 2019-03-20 21:45:22 +05:30
lasanthaDLPDS
29efebdb99 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-03-20 18:45:10 +05:30
lasanthaDLPDS
b3fb1f2234 Add modification for app manager publisher 2019-03-20 18:44:23 +05:30
jayasanka
3dc7758d20 Created login page 2019-03-20 01:57:01 +05:30
jayasanka
9361a70023 Removed comments 2019-03-20 01:55:19 +05:30
jayasanka
ea2dd0a024 configured of LESS Module in webpack 2019-03-19 22:41:17 +05:30
jayasanka
2a5cc97de9 Fixed routing 2019-03-19 21:42:57 +05:30
lasanthaDLPDS
b440c57147 Improve APPM publisher logic 2019-03-18 06:00:00 +05:30
jayasanka
6ad21b473e added new files 2019-03-14 17:25:35 +05:30
jayasanka
f010304eba Added ant design to the publisher 2019-03-14 17:22:20 +05:30
lasanthaDLPDS
69b65aa073 Remove unnecessary files 2019-03-14 15:02:07 +05:30
lasanthaDLPDS
d7c92612f1 Add new UI theme dependencies 2019-03-14 14:57:13 +05:30
lasanthaDLPDS
98d14b0815 Fix merge conflicts 2019-03-13 12:09:29 +05:30
lasanthaDLPDS
49c1279dd5 APPM publisher UI deploying as web app 2019-03-13 03:06:52 +05:30
Saad Sahibjan
625fb7d07e Allow webclips installation via enrollment app install policy 2019-03-12 22:00:49 +05:30
Saad Sahibjan
a9a01c045e Add copy commands to copy UserValidateManagement and OAuth2TokenManagement synapse APIs to IoTs pack 2019-03-12 10:33:13 +00:00
lasanthaDLPDS
fbcb1d0e32 Add modification to application creating logic 2019-03-05 02:48:17 +05:30
lasanthaDLPDS
0cb26066c5 Fix lifecycle instance initiating issue 2019-03-04 19:07:50 +05:30
Saad Sahibjan
0d084242d0 Increase length of VALUE_FIELD column in DM_DEVICE_INFO table 2019-03-04 16:35:39 +05:30
lasanthaDLPDS
911bc6f9a0 Fix application getting issue 2019-03-04 10:25:13 +05:30
lasanthaDLPDS
e2acb5c4c8 Fix application installing issue 2019-03-04 02:57:08 +05:30
lasanthaDLPDS
a7a8a9c6df Improve APPM publisher functionality and add UI source 2019-03-03 08:36:20 +05:30
inoshperera
a39d567e85 fix License text loading inconsistency in tenants 2019-02-02 18:20:11 +05:30
lasanthaDLPDS
f92ae35e4b Fix the task running issue in tenant mode 
If a run time error encountered while sending a notification(e.g:- Push Notification ) to a device when the task is running for tenants, it terminates the task running and notifications won't be sending to devices which are enrolled to other tenants as well. Hence cath the exception in sendNotification method and log.

Further, since this is critical path, added few debug logs as well.
 2019-01-28 11:56:49 +05:30
Inosh Perara
ecd35c34e4 Merge branch 'master' into 'master' 
Add enrollment notification sending feature

See merge request entgra/carbon-device-mgt!38
 2019-01-28 05:48:01 +00:00
lasanthaDLPDS
7975563530 Improve the payload of enrollment notification 2019-01-24 17:41:53 +05:30
lasanthaDLPDS
c4c92f0faa Adding application management initial pub UI 2019-01-23 14:26:16 +05:30
charitha
2380a22d53 Commit transaction after changing status 2019-01-21 15:36:42 +05:30
lasanthaDLPDS
e852c62663 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt 2019-01-21 10:54:37 +05:30
lasanthaDLPDS
b90766b5a4 Add enrollment notification sending feature 2019-01-18 08:04:40 +05:30
charitha
026bd175e9 Reformat & fix API publishing issue to Gateway 2019-01-17 22:46:32 +05:30
charitha
8b34253bc1 Optimize functionality 2019-01-17 15:28:12 +05:30
charitha
3d42175bea Merge branch 'master' of https://gitlab.com/ruwany.ace/carbon-device-mgt into entgra-master 2019-01-17 14:00:22 +05:30
Ace
18078c51e8 bug fixes 2019-01-17 13:53:42 +05:30
Ace
59186155d0 Adding new apis to update devices status/get count/get list based on status 2019-01-17 12:35:06 +05:30
charitha
e78a2a1279 Merge remote-tracking branch 'entgra/master' into entgra-master 2019-01-14 15:24:15 +05:30
charitha
75dd9321af Add methods to get device count based on status and device type 2019-01-14 15:24:01 +05:30
Saad Sahibjan
ae9dd807cc Enrollment application install feature for policy 2019-01-01 08:19:53 +00:00
Madawa Soysa
6f80d1993d Move private constants to a public constant class 2018-12-13 20:21:59 +11:00
Madawa Soysa
eea040f391 Remove redundant authorization check and fix the test 2018-12-09 14:01:45 +11:00
Madawa Soysa
001649e5fd Fix issue with advanced search to pick the correct enrollment 
This commit addresses following two issues,

1. Advanced search feature returns the oldest enrollment instance

This issue occurs when the same device is enrolled for multiple users. The cause of the issue is filtering the devices by device identifier which is a unique property for a device. This commit fixes the issue by filtering the devices from enrollment id and owner instead of the device identifier.

2. All devices do not return for privileged users when searched through advanced-search

The cause of the issue is not considering the user permissions when filtering the devices. This commit fixes the issue by validating the permissions of the logged in user before filtering.

Fixes entgra/product-iots#13
Fixes entgra/product-iots#14
 2018-12-04 23:04:25 +11:00
lasanthaDLPDS
f810c1a7e4 Fix minor issues and add app manager UI into the feature 2018-11-21 08:01:51 +05:30
lasanthaDLPDS
b6a0b75f05 Fix build failure 2018-11-18 14:04:14 +05:30
lasanthaDLPDS
8841741567 Fiz merge conflicts 2018-11-18 08:05:35 +05:30
Entgra Builder
cbe85378d8 [maven-release-plugin] prepare for next development iteration 2018-11-11 13:25:02 +00:00
Entgra Builder
4b1f83b168 [maven-release-plugin] prepare release v3.2.1 2018-11-11 13:24:57 +00:00
charitha
c3893d93bb Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2018-11-11 14:28:00 +05:30
charitha
4deb71229c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 
# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
#	components/apimgt-extensions/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml
#	components/certificate-mgt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
#	components/device-mgt-extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml
#	components/device-mgt/pom.xml
#	components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
#	components/email-sender/pom.xml
#	components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
#	components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
#	components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
#	components/identity-extensions/pom.xml
#	components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
#	components/policy-mgt/pom.xml
#	components/test-coverage/pom.xml
#	components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
#	components/webapp-authenticator-framework/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
#	features/apimgt-extensions/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
#	features/certificate-mgt/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
#	features/device-mgt-extensions/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
#	features/device-mgt/pom.xml
#	features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
#	features/email-sender/pom.xml
#	features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
#	features/jwt-client/pom.xml
#	features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
#	features/oauth-extensions/pom.xml
#	features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
#	features/policy-mgt/pom.xml
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
#	features/webapp-authenticator-framework/pom.xml
#	pom.xml
 2018-11-11 14:27:32 +05:30
Ace
880720a72f Fixing issue with task scheduler 2018-11-09 21:51:42 +05:30
WSO2 Builder
b4e8bb4da0 [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare for next development iteration 2018-10-30 16:02:55 +00:00
WSO2 Builder
e482894fbd [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare release v3.1.51 2018-10-30 16:02:44 +00:00
charitha
10672ea534 Fixed date format issue in geofencing 2018-10-30 20:47:31 +05:30
charitha
d936aea03a Fixed pom issues 2018-10-30 14:45:54 +05:30
charitha
f0ec4a3520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 
# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
#	components/apimgt-extensions/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml
#	components/certificate-mgt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
#	components/device-mgt-extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/ProfileOperationDAOImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml
#	components/device-mgt/pom.xml
#	components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
#	components/email-sender/pom.xml
#	components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
#	components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
#	components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
#	components/identity-extensions/pom.xml
#	components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
#	components/policy-mgt/pom.xml
#	components/test-coverage/pom.xml
#	components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
#	components/webapp-authenticator-framework/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
#	features/apimgt-extensions/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
#	features/certificate-mgt/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
#	features/device-mgt-extensions/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
#	features/device-mgt/pom.xml
#	features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
#	features/email-sender/pom.xml
#	features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
#	features/jwt-client/pom.xml
#	features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
#	features/oauth-extensions/pom.xml
#	features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
#	features/policy-mgt/pom.xml
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
#	features/webapp-authenticator-framework/pom.xml
#	pom.xml
 2018-10-30 14:29:37 +05:30
WSO2 Builder
1bd160f551 [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare for next development iteration 2018-10-30 07:42:23 +00:00
WSO2 Builder
b45aef9fec [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare release v3.1.50 2018-10-30 07:42:11 +00:00
charitha
86029752f8 Fixed https://github.com/wso2/product-iots/issues/1184 2018-10-29 21:03:24 +05:30
Charitha Goonetilleke
e25d536210 Introduce new API for user search based on user attributes 
Closes product-iots#6
See merge request entgra/carbon-device-mgt!31
 2018-10-27 12:26:59 +00:00
WSO2 Builder
764b119ae5 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare for next development iteration 2018-10-24 19:03:29 +00:00
WSO2 Builder
1bbbce9ac3 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare release v3.1.49 2018-10-24 19:03:17 +00:00
geethkokila
2bb3e2cdc0 Fixing the SQL 2018-10-25 00:11:49 +05:30
WSO2 Builder
5005cebbff [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare for next development iteration 2018-10-24 04:01:39 +00:00
WSO2 Builder
5d688d8c4f [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare release v3.1.48 2018-10-24 04:01:27 +00:00
lasanthaDLPDS
e76fe92ebe Fix device monitoring task disabling issue 2018-10-24 08:29:35 +05:30
Madawa Soysa
6795cbb180 Add IMEI parameter to custom parameters of the advanced search 
Fixes entgra/product-iots#8
 2018-10-24 13:53:13 +11:00
Madawa Soysa
5300a7f363 Fix device advanced search 
Device search button was not functioning due to a id mismatch. This
commit fixes the issue.

Fixes entgra/product-iots#7
 2018-10-24 13:52:28 +11:00
WSO2 Builder
a18b4550ef [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare for next development iteration 2018-10-22 19:13:35 +00:00
WSO2 Builder
9c77054795 [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare release v3.1.47 2018-10-22 19:13:23 +00:00
Madawa Soysa
9b5cb1ef6a Fix issue with search not updating 
Related: entgra/product-iots#6
 2018-10-22 17:47:32 +11:00
charitha
128b5f64aa Fixed NPE in sending push notifications 2018-10-22 10:36:58 +05:30
Madawa Soysa
6aca4650e2 Introduce new API for user search based on user attributes 
This commit introduces a new API to search users based on user claims such as First Name, Last Name, Email, etc. This new API can be used to filter users through a search query. Also this commit includes the UI modifications to modify the exiting user listing page to allow filter users by attributes.

Fixes to entgra/product-iots#6
 2018-10-22 13:41:30 +11:00
WSO2 Builder
8eaa7c6698 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare for next development iteration 2018-10-21 13:35:14 +00:00
WSO2 Builder
03b88248b8 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare release v3.1.46 2018-10-21 13:34:59 +00:00
charitha
3856a25449 Fixed authentication issue in deploying execution plans as non admin user 2018-10-21 14:30:06 +05:30
WSO2 Builder
bfff9e7a7e [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare for next development iteration 2018-10-18 06:51:09 +00:00
WSO2 Builder
af64244ab3 [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare release v3.1.45 2018-10-18 06:50:57 +00:00
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
Milan Perera
b256d55847 Handle NotNow response from device 2018-10-16 17:41:39 +05:30
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
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
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
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
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
Ace
4b08dd6053 Fixing issue with notification sending logic 2018-10-06 15:46:47 +05:30
lasanthaDLPDS
c1a23bfed8 Add create new app release API 2018-10-06 10:35:40 +05:30
lasanthaDLPDS
425938e3a8 Add app release inserting API 2018-10-04 02:37:26 +05:30
lasanthaDLPDS
cd28edc6a3 Filx application getting API issue 2018-10-02 17:35:09 +05:30
lasanthaDLPDS
74be4d8a82 Improve application releases getting logic 2018-10-01 18:24:12 +05:30
lasanthaDLPDS
9978af097d Bump APPM version 2018-10-01 01:48:07 +05:30
lasanthaDLPDS
7388bcadce Merge master branch 2018-10-01 01:27:45 +05:30
lasanthaDLPDS
f37a478a99 Refactor the source 2018-10-01 01:21:52 +05:30
charitha
e12e7a3876 Add validation to event retrial 2018-09-30 21:57:29 +05:30
lasanthaDLPDS
1e4d14d837 Fix review managing issues 2018-09-29 23:06:32 +05:30
lasanthaDLPDS
54cee927f2 Fix transaction handeling issue 2018-09-29 23:06:32 +05:30
lasanthaDLPDS
4692eb5f92 Improve review management functionalities 2018-09-29 23:06:32 +05:30
inoshperera
a3b8cef1a2 Fixing connection issue, dao layer fixes 2018-09-29 18:15:58 +05:30
inoshperera
d9d0d0a5b8 add getLifecycleState check 2018-09-29 12:21:23 +05:30
inoshperera
853d095706 conflict fixes 2018-09-29 12:03:11 +05:30
inoshperera
dbc382716a fixing conflics and fixes to app update APIs 2018-09-29 10:41:17 +05:30
inoshperera
7dd7dc8d64 partial fix on app update apis -2 2018-09-29 09:40:31 +05:30
inoshperera
4e7f1e4047 partial fix on app update apis 2018-09-29 09:39:53 +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
lasanthaDLPDS
2c9ea2b5cf Fix lifecycle adding issue 2018-09-28 17:57:04 +05:30
lasanthaDLPDS
b283c1dfde Improve lifecycle management 2018-09-28 04:10:07 +05:30
lasanthaDLPDS
409f6fce14 Fix get lifecycle issue 2018-09-27 18:47:54 +05:30
Milan Perera
53f8014730 Whitelabel devicemgt jaggeryapp 2018-09-27 11:09:13 +05:30
lasanthaDLPDS
f4e1ca6815 Improve publisher APIs 2018-09-27 09:24:31 +05:30
lasanthaDLPDS
abf9c05f0c Improve applications retreving method 2018-09-27 08:15:19 +05:30
lasanthaDLPDS
94d3f1b3b1 Fix SQL issues 2018-09-26 18:02:03 +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
lasanthaDLPDS
6f020076c5 Fix API tags registering issue 2018-09-26 14:22:25 +05:30
lasanthaDLPDS
ea6a644682 Improve app manager functionalities 2018-09-25 18:31:54 +05:30
lasanthaDLPDS
7ecaf232f5 Fix store API deploying issue 2018-09-25 08:08:27 +05:30
lasanthaDLPDS
23e3732ac1 Fix build failure 2018-09-24 14:03:11 +05:30
Inosh Perara
df65b68597 app get by ID 2018-09-24 02:15:28 +00:00
inoshperera
f1e0b1a4fa adding get app by ID 2018-09-23 23:08:45 +05:30
Inosh Perara
107e46a0bc App create fixed 2018-09-23 16:22:38 +00:00
inoshperera
ae476d85df fixing conflicts 2018-09-23 21:30:28 +05:30
inoshperera
4512a4e2d7 working state on happy path app create 2018-09-23 21:17:24 +05:30
lasanthaDLPDS
c7956b7af1 Fix service registering issue 2018-09-23 20:08:52 +05:30
inoshperera
27e4dc14d3 add created related fixes 2018-09-23 16:20:48 +05:30
inoshperera
75008e38b8 Fixes to get create app working 2018-09-23 16:14:13 +05:30
lasanthaDLPDS
b0520ac976 Refactor the source: 2018-09-22 17:52:05 +05:30
lasanthaDLPDS
4562432509 Complete review management 2018-09-22 17:52:05 +05:30
lasanthaDLPDS
3e16ec96b9 Improve review management 2018-09-22 17:52:04 +05:30
inoshperera
2e0bacbd18 Bug fixes in app creation logic 2018-09-22 15:19:44 +05:30
inoshperera
21a87d8b8c fixing app get and few issues in app create 2018-09-21 22:16:36 +05:30
inoshperera
a0030a9b7f adding seriasation ID 2018-09-21 06:49:45 +05:30
inoshperera
b856aa36fe Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2018-09-21 06:41:34 +05:30
inoshperera
874a83cee5 fixing conflicts 2018-09-21 06:40:58 +05:30
inoshperera
a4e17ef99b Adding app install basics WIP 2018-09-21 06:37:59 +05:30
Dharmakeerthi Lasantha
d1095826b8 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Fix DAO layer issues and improve review management

See merge request entgra/carbon-device-mgt!6
 2018-09-20 12:54:33 +00:00
lasanthaDLPDS
48f0636fa1 Fix DAO layer issues and improve review management 2018-09-20 18:21:44 +05:30
Madawa Soysa
9df8660bdf Add package name to ApplicationRelease and change ApplicationType enum 2018-09-20 16:55:34 +05:30
lasanthaDLPDS
d9daffcefc Remove review management tests 2018-09-20 15:21:53 +05:30
geethkokila
106632403e Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-20 15:08:05 +05:30
geethkokila
c23770db33 Fix the osgi and validate issues 2018-09-20 15:07:40 +05:30
lasanthaDLPDS
1bee1a2975 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-20 11:58:56 +05:30
lasanthaDLPDS
1ea47c8361 Improve review mnagement WIP 2018-09-20 11:58:05 +05:30
geethkokila
7630cb0fb1 Fix the osgi issues 2018-09-20 11:52:25 +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
lasanthaDLPDS
f5615c5ec7 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-19 18:46:27 +05:30
lasanthaDLPDS
6da8dada71 Improve comment management 2018-09-19 18:45:58 +05:30
Milan Perera
4c7bd0664d Fix issue in order of get pending operations 2018-09-19 16:30:41 +05:30
geethkokila
4ded86a134 Add app manager osgi fixes 2018-09-19 15:55:11 +05:30
charitha
b5ce0fdd03 Merge branch 'iots-3.3.1' into entgra-master 2018-09-19 13:15:21 +05:30
Milan Perera
7d59c342b2 Application mgt new (#7) 
* Improve lifecycle state management

* Add unit tests for lifecycle management

* Add class level comments to lifecycle management
 2018-09-19 11:21:40 +05:30
lasanthaDLPDS
421dc5edf1 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-19 07:28:45 +05:30
lasanthaDLPDS
6066d93edd Add review management 2018-09-19 07:27:49 +05:30
Milan Perera
6a9cec4c89 Add scopes to publisher mgt API (#5) 2018-09-17 19:28:25 +05:30
inoshperera
1052888605 Test Case for StorageManagementUtilTest (#4) 
* Adding unit test for StorageManagementUtilTest.java

* formatting fixes
 2018-09-16 17:37:25 +05:30
inoshperera
8983fd6d51 formatting fixes 2018-09-16 17:32:41 +05:30
inoshperera
e6f099d43b Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-16 17:26:53 +05:30
inoshperera
a6cdbb856b Adding unit test for StorageManagementUtilTest.java 2018-09-16 17:26:20 +05:30
lasanthaDLPDS
ff96884268 Refactor the source 2018-09-16 08:55:09 +05:30
lasanthaDLPDS
b3874ee1ba Refactor the source 2018-09-16 01:57:08 +05:30
lasanthaDLPDS
f861134ff6 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-15 22:45:26 +05:30
lasanthaDLPDS
4c5cdc75fe Adding application release creating logic 2018-09-15 22:44:24 +05:30
geethkokila
0dea5cd0aa Resolve conflicts 2018-09-15 21:59:51 +05:30
geethkokila
18c3ee23b9 Adding the changes for the app manager 2018-09-15 21:58:02 +05:30
inoshperera
57efe389ac Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-15 17:45:30 +05:30
inoshperera
14ea6dbba8 fixing conflicts 2018-09-15 17:44:13 +05:30
inoshperera
61c0ebc995 Adding unit tests case infrastructure to core and adding unit testcases for ArtifactsParser.java 2018-09-15 17:30:38 +05:30
lasanthaDLPDS
3e2f757c1e Improve lifecycle management 2018-09-15 15:32:52 +05:30
lasanthaDLPDS
34fe427852 Add swagger annotations to ApplicationRelease bean 2018-09-15 13:18:20 +05:30
lasanthaDLPDS
f9ec82e4dc Merge with upstream 2018-09-15 12:50:18 +05:30
geethkokila
34fad87cce Fixing the conflicts 2018-09-15 11:57:29 +05:30
lasanthaDLPDS
a01ecdb9c3 Modify ArtifactParser and get the version of an artifact through ArtifatcParser 2018-09-15 02:22:40 +05:30
inoshperera
2011843736 Adding APK parcing and ipa parsing capability 2018-09-14 22:19:49 +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
lasanthaDLPDS
222225121c Modify isRestricted data type 2018-09-13 13:08:40 +05:30
lasanthaDLPDS
4316cb0ef4 Add javadoc comments and improve logic 2018-09-12 18:20:05 +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
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
lasanthaDLPDS
26568273e5 Improve app creating logic and comment management 2018-09-12 04:13:51 +05:30
lasanthaDLPDS
e5ef68fa3c Improve comment management 2018-09-11 17:39:19 +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
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
lasanthaDLPDS
2fd7601139 Refactor and modify storage management logic 2018-09-10 01:14:35 +05:30
lasanthaDLPDS
c950223283 Refactor the source 2018-09-09 21:21:17 +05:30
lasanthaDLPDS
1cce5d7e34 Improve app managing functionalties and refactor the source 2018-09-08 08:55:53 +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
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
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
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
d54d78a02b Refactoring 2018-08-20 21:16:08 +05:30
charitha
82778f06c6 Add secure web socket proxy to route ws connections in IoTS cluster 2018-08-20 15:44:55 +05:30
lasanthaDLPDS
9379c2ae47 Fix build failure 2018-08-19 15:33:20 +05:30
lasanthaDLPDS
d293b5b1b8 Fix merge conflixts 2018-08-19 15:06:25 +05:30
lasanthaDLPDS
797652b741 Merge branch 'application-mgt-new' of https://github.com/wso2/carbon-device-mgt into application-mgt-new 2018-08-19 13:22:22 +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
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
charitha
2cac0053ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImplTest.java
 2018-08-13 12:20:51 +05:30
abhishekdesilva
870ff031bb Checking for pending operations before adding an operation 2018-08-13 11:15:06 +05:30
WSO2 Builder
02282967ab [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare for next development iteration 2018-08-13 04:48:34 +00:00
WSO2 Builder
7daeb6efb9 [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare release v3.1.32 2018-08-13 04:48:24 +00:00
charitha
d2940bf7a1 Refactoring 2018-08-13 09:44:40 +05:30
charitha
47f619a136 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-08-11 08:29:45 +05:30
charitha
8c0869649a Update alert messages to convey proper meaning 2018-08-10 19:37:05 +05:30
charitha
055d422e23 Publish geo alerts to cdm notifications 2018-08-10 15:26:04 +05:30
Geeth
a553e9aada
Merge pull request #1250 from abhishekdesilva/master 
Add archive pending operations configuration
 2018-08-08 11:33:17 +05:30
abhishekdesilva
fa9a52048e Add archive pending operations configuration 2018-08-08 11:10:56 +05:30
charitha
2a995deeb4 Prevent duplicate alerts & added owner field 2018-08-03 22:31:24 +05:30
charitha
919fedee20 Improved geo-fencing performance 2018-07-31 16:00:12 +05:30
charitha
ead01f837d Fixed issue in Geo fencing 2018-07-26 12:23:47 +05:30
WSO2 Builder
8da1bcb741 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare for next development iteration 2018-07-26 06:48:42 +00:00
WSO2 Builder
9c0cbdc983 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare release v3.1.31 2018-07-26 06:48:31 +00:00
abhishekdesilva
4c067f0f28 Archival/Purging Task Improvement 2018-07-25 21:15:49 +05:30
charitha
2bfd598c67 Add location extraction from device properties and deice type specific location retrieval 2018-07-23 11:35:17 +05:30
charitha
bccb88ab22 Fixed build issue due to okio 2018-07-23 11:35:06 +05:30
charitha
9623fb294a Fixed build issue due to okhttp 2018-07-23 11:34:47 +05:30
Charitha Wijesinghe
d971c62009 Add device event filter API 
See merge request entgra/carbon-device-mgt!2
 2018-07-23 06:02:23 +00:00
lashanfaliq95
d843b71e1f remove stack trace 2018-07-20 16:15:07 +05:30
lashanfaliq95
1fedf9650c remove wildcard imports and log the error msg in filter api 2018-07-20 10:05:18 +05:30
lashanfaliq95
c8d0b10a38 update the device filter api 2018-07-16 18:08:52 +05:30
lashanfaliq95
3a7136abf9 complete the event filter 2018-07-15 10:58:09 +05:30
lashanfaliq95
e1ffd6341d filter implementation which gets all records and based on the timestamp 2018-07-13 17:50:39 +05:30
lashanfaliq95
431342fd0f filter implementation which gets all records 2018-07-11 19:51:12 +05:30
charitha
796acbda16 Add location extraction from device properties and deice type specific location retrieval 2018-07-11 10:28:14 +05:30
lashanfaliq95
c6a1508ee7 add the filter api 2018-07-11 09:26:01 +05:30
charitha
598632fc36 Fixed build issue due to okio 2018-07-07 09:23:44 +05:30
charitha
636e71883c Fixed build issue due to okhttp 2018-07-06 22:40:07 +05:30
WSO2 Builder
0aec365dce [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare for next development iteration 2018-05-15 08:24:46 +00:00
WSO2 Builder
ca890ac346 [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare release v3.1.30 2018-05-15 08:24:36 +00:00
madhawap
b2a12f09e4 Make proxy configuration optional 
As per the current configurations it is mandatory to set a value for http.nonProxyHosts property in order to server to run on 'change-ip' mode. With this modification it is made optional where even without this property IoT server can be run on 'change-ip' mode. 'Change-ip' mode is where server is configured to run on a different IP other than localhost
 2018-05-15 13:23:41 +05:30
Dharmakeerhi Lasantha
bc162d05fd
Merge pull request #1199 from NishadiPrasangini/AppManager 
App manager
 2018-04-23 11:17:34 +05:30
WSO2 Builder
2e5db59398 [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare for next development iteration 2018-04-18 10:06:19 +00:00
WSO2 Builder
964d92eb7f [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare release v3.1.29 2018-04-18 10:06:04 +00:00
Madhawa Perera
b87763dba1
Add capability to WSO2 IOT server to route HTTP/HTTPS calls through Proxy server (#1244) 
* Fix IoT Server HTTP/HTTPS calls bypassing a Proxy server

Since the Feign client is not supporting proxy routing this fix has included okhttp client and pass it to the feigns okkhttp client wrapper in order to pass HTTP/HTTPS call through proxy server if the system proxy properties are set. Further this modifies the apache http client also to pick system properties.

fixes wso2/product-iots#1806

* Remove unwanted comments and commented lines

* Remove the localhost host check

* Add default non proxy hosts

Added localhost as a default non proxy host

* use the version property from parent pom

Use the version property, "github.openfeign.version" from parent pom instead of hard-coding the version range
 2018-04-18 15:18:59 +05:30
WSO2 Builder
79d48bb1a8 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare for next development iteration 2018-03-28 08:36:21 +00:00
WSO2 Builder
f05750b794 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare release v3.1.28 2018-03-28 08:36:10 +00:00
Rasika Perera
ceb2ff5d9c
Merge pull request #1243 from rasika/master 
Hide 'Select All' option when there're only single mandatory claim.
 2018-03-28 13:51:55 +05:30
Rasika Perera
a22b2b324d Hide 'Select All' option when there're only single mandatory claim. 2018-03-28 12:46:26 +05:30
WSO2 Builder
2fcb647957 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare for next development iteration 2018-03-28 05:13:35 +00:00
WSO2 Builder
2f519baf67 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare release v3.1.27 2018-03-28 05:13:25 +00:00
GDLMadushanka
1ecb9b0495 Merge branch 'testCaseFixes' of https://github.com/GDLMadushanka/carbon-device-mgt into testCaseFixes 2018-03-28 10:09:09 +05:30
GDLMadushanka
05cffeb1e7 fix 2018-03-28 10:07:40 +05:30
GDLMadushanka
0fba2f1b24 Fix issues in test-cases 2018-03-28 10:00:09 +05:30
GDLMadushanka
4f591bd41d Fix issues in test-cases 2018-03-28 09:49:21 +05:30
lasanthaDLPDS
c755dc018a Add Application updating functionality 2018-03-28 00:08:42 +05:30
WSO2 Builder
7431cde12a [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare for next development iteration 2018-03-23 05:51:48 +00:00
WSO2 Builder
aa429e230c [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare release v3.1.26 2018-03-23 05:51:38 +00:00
Madawa Soysa
6b579d760e Remove example part of the comment 2018-03-23 11:03:49 +05:30
Madawa Soysa
6b8d555314 Add a delay for data tables server side paging 
DataTables library instantiates an ajax request for each key release when searching/filtering. in a system with a larger dataset, many requests are made to the back end for a longer keyword search which is a huge overload.

Also, sometimes since the request initialized for the first character returns the largest subset of data (if available) this request may take a longer time to process. Since DataTables update the table in the order that the response comes, the final result shown would be the last response received which can be incorrect.

This commit resolves the above issue by enabling a delay before the requests made using DataTables fnSetFilteringDelay plugin.
 2018-03-22 18:33:21 +05:30
lasanthaDLPDS
6c65aef26c Remove unnecessary imports 2018-03-22 00:29:19 +05:30
lasanthaDLPDS
d5b2bfd510 Modify Application and Release validation methods 
Ahis commit contaisns followings. Added a query to get application release when application id and release UUID is passed. Modified application validation method and removed unnecessary logic. Modified Application release validation method aand removed unnecessary logic. As a result of these modifications, modified relevant method calls as well
 2018-03-21 23:53:46 +05:30
lasanthaDLPDS
47a02dc903 Add permision check and app status check for deletion 2018-03-21 17:41:32 +05:30
lasanthaDLPDS
a05c412d77 Copy publisher and store web apps into IoTS webapp folder 
Added p2.inf configuration to copy store and publisher web apps into IoTS webapp folder
 2018-03-20 18:10:49 +05:30
lasanthaDLPDS
0b78df50a7 Add application deleting functionality 
Modified DAO layer. When delete an application it is moved to REMOVED status.
 2018-03-20 17:43:37 +05:30
lasanthaDLPDS
c95733a781 Add iOS applications and Web Clip publishing functionality 
This commit contains followings
Added dependencies for URL validation and plist parsing.
Added version retrieval functionality for iOS application
Added WEB clip publishing functionality.
In order to compatible with above functionalities modified the source
 2018-03-20 17:14:15 +05:30
WSO2 Builder
7620d7ea5d [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare for next development iteration 2018-03-20 06:51:22 +00:00
WSO2 Builder
5fd8aeef89 [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare release v3.1.25 2018-03-20 06:51:13 +00:00
Rasika Perera
49584eb8f2
Merge pull request #1240 from rasika/master 
Fix advanced operationsbar overlapping when multiple tables exists.
 2018-03-20 11:51:31 +05:30
Rasika Perera
5f37af8fd1 Fixes for multiple datatables overlapping function call points 2018-03-20 11:50:44 +05:30
Rasika Perera
9e3b17c65d Fix advanced operationsbar overlapping when multiple tables exists. 2018-03-20 10:17:46 +05:30
lasanthaDLPDS
b45d11bfdc Fix issues in swagger definition 2018-03-20 09:54:24 +05:30
WSO2 Builder
3201dfcfa9 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare for next development iteration 2018-03-20 02:16:46 +00:00
WSO2 Builder
86000e93b2 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare release v3.1.24 2018-03-20 02:16:36 +00:00
Rasika Perera
272d64b0b2 Fix PaginationRequest.getProperty() method doesn't return anything 2018-03-20 07:31:11 +05:30
lasanthaDLPDS
976d0ad60d Modify application retrieval API 
As per the API designing best practices, added offset and limit query parameters for application getting API.
 2018-03-19 20:37:30 +05:30
lasanthaDLPDS
71aa6762ac Refactor APPM DAO Layer 
Refactored the APPM DAO layer. Further verified and added required functionality to compatible with other DBMS, such as Oracle, PostgreSQL, MSSQL
 2018-03-19 18:41:23 +05:30
WSO2 Builder
ac7e71282e [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare for next development iteration 2018-03-16 12:27:13 +00:00
WSO2 Builder
1c135b9e18 [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare release v3.1.23 2018-03-16 12:26:59 +00:00
geethkokila
54fc0be69f Fix the device information delete issue 2018-03-16 17:23:45 +05:30
WSO2 Builder
7dd3f29ff7 [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare for next development iteration 2018-03-16 11:15:13 +00:00
WSO2 Builder
03dd153f6f [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare release v3.1.22 2018-03-16 11:14:57 +00:00
Rasika Perera
4be47123b3
Merge pull request #1235 from rasika/master 
Update carbon-device-mgt dependencies
 2018-03-16 16:21:58 +05:30
WSO2 Builder
db8a5afdf8 [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare for next development iteration 2018-03-16 10:36:01 +00:00
WSO2 Builder
bb0c498b3a [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare release v3.1.21 2018-03-16 10:35:50 +00:00
Rasika Perera
f14564339a Fix formatting issues 2018-03-16 15:39:57 +05:30
Rasika Perera
703a4cbb12 Add further fixes for the jwt-grant dependency issue 2018-03-16 15:37:04 +05:30
Arcane94
f6de4bb424 minor change in a function 2018-03-16 15:17:58 +05:30
WSO2 Builder
10cf201da7 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare for next development iteration 2018-03-16 08:50:22 +00:00
WSO2 Builder
2c73d73860 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare release v3.1.20 2018-03-16 08:50:11 +00:00
WSO2 Builder
7a6e33ca49 Merge commit '790641a2aa9bba74f3dedb0f9a3c3fb9491cfd80' into 6975a622-1dc6-4b54-86ab-b5021d7e0e74 2018-03-16 08:38:14 +00:00
WSO2 Builder
790641a2aa [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare for next development iteration 2018-03-16 08:23:46 +00:00
WSO2 Builder
efb54864c6 [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare release v3.1.19 2018-03-16 08:23:35 +00:00
Rasika Perera
4c8fb7b5c2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-16 13:50:12 +05:30
Rasika Perera
df6e43eac5 Adding privacy policy and cookie policy 2018-03-16 13:49:53 +05:30
Madawa Soysa
e5eeb78d09 Generate nav menu icons based on correct permissions 
This commit fixes the mismatching permissions which are checked while generating navigation menu icons.
- Correct the wrong permission string used for configuration management.
- Introduce a new UI permission for certificate management.
- Move device type link under "owning device permission" which is the permission declared in the JAX-RS implementation.

Resolves wso2/product-iots#1782
 2018-03-16 13:36:38 +05:30
WSO2 Builder
7fe945f1bf [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare for next development iteration 2018-03-15 22:28:55 +00:00
WSO2 Builder
555a349fd6 [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare release v3.1.18 2018-03-15 22:28:45 +00:00
charitha
f62cb4febd Add missing media type 2018-03-16 01:46:41 +05:30
WSO2 Builder
f7f13f2052 [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare for next development iteration 2018-03-15 17:52:55 +00:00
WSO2 Builder
d44ac973cb [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare release v3.1.17 2018-03-15 17:52:45 +00:00
Rasika Perera
6316daa13a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-15 23:07:06 +05:30
Rasika Perera
b865dc7823 Update license header 2018-03-15 23:04:38 +05:30
Rasika Perera
583b17d405 Add login.do, retry.do and consent.do 
This implements following fixes/improvements;
* Adding an intermediate for user to accept consents.
* Fixing issue of not redirected to the consent.do
* Authentication failure page
 2018-03-15 23:02:16 +05:30
WSO2 Builder
a51a3cd6a4 [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare for next development iteration 2018-03-15 16:58:58 +00:00
WSO2 Builder
f416cecb9e [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare release v3.1.16 2018-03-15 16:58:48 +00:00
charitha
481d381ca7 Fixed exception in subscribing APIs 2018-03-15 20:21:18 +05:30
WSO2 Builder
41358a41a5 [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare for next development iteration 2018-03-15 11:37:04 +00:00
WSO2 Builder
d679faecca [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare release v3.1.15 2018-03-15 11:36:53 +00:00
geethkokila
7aab14c07d Fix the path parameter 2018-03-15 16:50:04 +05:30
WSO2 Builder
5a1b4b154e [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare for next development iteration 2018-03-15 09:37:25 +00:00
WSO2 Builder
50232e10a5 [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare release v3.1.14 2018-03-15 09:37:14 +00:00
Ruwan Yatawara
88924ac8d6 Correcting issue with events resource path 2018-03-15 14:31:44 +05:30
WSO2 Builder
f265ddc736 [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare for next development iteration 2018-03-14 20:15:12 +00:00
WSO2 Builder
221fb27c6c [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare release v3.1.13 2018-03-14 20:14:58 +00:00
geethkokila
dbf4ff0132 Add a temporary fix for api subscription issue 2018-03-15 01:28:05 +05:30
WSO2 Builder
7d1183274d [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare for next development iteration 2018-03-14 17:51:27 +00:00
WSO2 Builder
1e875dc00b [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare release v3.1.12 2018-03-14 17:51:16 +00:00
Dharmakeerhi Lasantha
e9e7368b55
Merge pull request #1226 from geethkokila/master 
Fix the api publishing issue
 2018-03-14 23:07:42 +05:30
geethkokila
9dcc9d9ddc Fix the api publishing issue 2018-03-14 23:05:50 +05:30
WSO2 Builder
1c3bca244a [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare for next development iteration 2018-03-14 17:01:33 +00:00
WSO2 Builder
4140ba7e76 [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare release v3.1.11 2018-03-14 17:01:23 +00:00
Rasika Perera
5d1e4ed99e
Merge pull request #1225 from rasika/master 
Adding filter value options for data-dep-status and data-boolean
 2018-03-14 22:16:26 +05:30
Rasika Perera
b04af49594 Fix minor formatting issue 2018-03-14 22:15:16 +05:30
Rasika Perera
f3da8d4a57 Adding filter value options for data-dep-status and data-boolean 2018-03-14 22:07:20 +05:30
WSO2 Builder
d2163025f2 [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare for next development iteration 2018-03-14 15:15:04 +00:00
WSO2 Builder
494b4db66b [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare release v3.1.10 2018-03-14 15:14:53 +00:00
charitha
47de05c2e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 17:50:32 +05:30
charitha
f6d5498240 Add privacy policy consent 2018-03-14 17:50:17 +05:30
WSO2 Builder
31f11433bb [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare for next development iteration 2018-03-14 11:23:00 +00:00
WSO2 Builder
a3773032ce [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare release v3.1.9 2018-03-14 11:22:50 +00:00
Geeth
d69ce0b9a1
Merge pull request #1223 from charithag/master 
Updated API Publisher & Store extensions after bumping versions
 2018-03-14 16:38:37 +05:30
WSO2 Builder
fa014fb838 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare for next development iteration 2018-03-14 10:29:02 +00:00
WSO2 Builder
e2218ed497 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare release v3.1.8 2018-03-14 10:28:52 +00:00
WSO2 Builder
eac2de37b2 Merge commit 'a73300b693013ab64bdf11dab9f626e4837eec04' into 34580e6a-6593-4c6a-8b11-5da48c102194 2018-03-14 10:16:37 +00:00
WSO2 Builder
a73300b693 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare for next development iteration 2018-03-14 09:53:11 +00:00
WSO2 Builder
fa5300cec1 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare release v3.1.7 2018-03-14 09:52:58 +00:00
charitha
3fda0a1459 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 15:14:25 +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
charitha
6f19ca3e20 Fixed test failures 2018-03-14 15:13:27 +05:30
WSO2 Builder
8282e69e12 Merge commit '46c4111b1dbaf85b9c413254f376c651488a5f57' into e61b2ead-a0d6-41af-8fb3-d2c404e569e2 2018-03-14 09:33:55 +00:00
lashanfaliq95
d60b885045 changed the parameters "type" and "deviceId" as required for the last-know api. 2018-03-14 14:44:47 +05:30
WSO2 Builder
46c4111b1d [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare for next development iteration 2018-03-14 09:08:39 +00:00
WSO2 Builder
28ec21a4f3 [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare release v3.1.6 2018-03-14 09:08:27 +00:00
Rasika Perera
5ea66b2125
Merge pull request #1214 from n-jay/dep-ui2 
UI implementation for DEP management of iOS devices
 2018-03-14 14:22:12 +05:30
Rasika Perera
815cea8ab1
Merge pull request #1215 from Arcane94/geoFencing 
Adding geofencing feature to geo devices dashboard
 2018-03-14 14:20:39 +05:30
geethkokila
7cb9685bc6 Fix the api publisher and store update 2018-03-14 14:13:04 +05:30
Ruwan
af4f3302ad
Merge pull request #1222 from rasika/master 
Adding an extension point into the PaginationRequest class
 2018-03-14 13:59:10 +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
Rasika Perera
e996f1f9f0 Adding an extension point into the PaginationRequest class 
This allows other APIs which has additional parameters to be passed into
the backend DAOs
 2018-03-14 13:20:11 +05:30
Arcane94
50a14e4321 Requested changes 2018-03-14 12:05:21 +05:30
Arcane94
e778700a5e Some more license year changes 2018-03-14 12:05:21 +05:30
Arcane94
0aff4193d3 License year changes and comment 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
WSO2 Builder
10f32aa150 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare for next development iteration 2018-03-14 06:01:28 +00:00
WSO2 Builder
b2c969ef85 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare release v3.1.5 2018-03-14 06:01:18 +00:00
Charitha Goonetilleke
6922a8693f
Merge pull request #1221 from geethkokila/master 
Add GDPR fixes
 2018-03-14 05:46:06 +00:00
n-jay
84c683a02b Edit nav-menu to include change DEP management page visibility logic 2018-03-14 11:03:37 +05:30
n-jay
43feaf7bc7 Add DEP management icon to navmenu 
The DEP management page is formed once the iOS plugin has been deployed
within the IoT Home. Till then, any functionality with regards to DEP
management is not present within the server.
An icon in the navmenu allows users to access the DEP management page.

This commit includes the feature where the navmenu detects if the iOS
plugin has been deployed and accordingly displays the icon to access
the DEP management page.
 2018-03-14 10:56:47 +05:30
WSO2 Builder
ffb28d018b [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare for next development iteration 2018-03-14 04:57:03 +00:00
WSO2 Builder
66591d3680 [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare release v3.1.4 2018-03-14 04:56:53 +00:00
geethkokila
ec3f814133 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 10:05:48 +05:30
Charitha Goonetilleke
329e41b04c
Merge pull request #1197 from Arcane94/master 
Fixed https://github.com/wso2/carbon-device-mgt/issues/1194
 2018-03-14 04:25:21 +00:00
n-jay
280a63bdbd Remove UI API scopes from config file 2018-03-13 15:13:22 +05:30
Lashan Faliq
51753ebbbf Merge branch 'master' into master 2018-03-13 14:48:50 +05:30
n-jay
a36a5aa279 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 12:23:41 +05:30
Kamidu Sachith Punchihewa
5bd42415b2
Merge pull request #1209 from lasanthaDLPDS/master 
Fix formatting issues
 2018-03-13 11:05:23 +05:30
n-jay
69ac1edc9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 09:48:19 +05:30
WSO2 Builder
0f272ff4ed [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare for next development iteration 2018-03-13 04:16:58 +00:00
WSO2 Builder
ac9d20af2f [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare release v3.1.3 2018-03-13 04:16:48 +00:00
WSO2 Builder
bbe144e25f [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare for next development iteration 2018-03-12 11:42:26 +00:00
WSO2 Builder
7ee1bdacb6 [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare release v3.1.2 2018-03-12 11:42:16 +00:00
WSO2 Builder
b31c31b410 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare for next development iteration 2018-03-12 11:15:23 +00:00
WSO2 Builder
ab8cd3f8e3 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare release v3.1.1 2018-03-12 11:15:13 +00:00
lasantha
04527696eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-12 16:36:33 +05:30
Rasika Perera
7860e02814
Merge pull request #1217 from lasanthaDLPDS/geet_3.3.0 
Fix OAuth2ScopeValidator Issues
 2018-03-12 16:32:40 +05:30
lasantha
9629101a85 Fix OAuth2ScopeValidator Issues 
Due to the version bumping of the identity component, there were some references to the deprecated methods. Hence removed those and referred approved methods. In addition to that, to compatible with WSO2 cording standards, reformat the source as well.
 2018-03-12 15:31:14 +05:30
WSO2 Builder
748798df4c [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare for next development iteration 2018-03-12 09:51:53 +00:00
WSO2 Builder
e0704671de [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare release v3.1.0 2018-03-12 09:51:43 +00:00
geethkokila
71f1ff96e6 Update device-mgt component version (3.1.0) 2018-03-12 14:57:21 +05:30
n-jay
7eab9e914d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-12 14:29:08 +05:30
n-jay
fedd2a3257 Added iOS DEP management page to navbar 2018-03-12 14:28:24 +05:30
n-jay
1cfcc3a599 Added iOS DEP API scopes in UI config file 2018-03-12 14:27:12 +05:30
WSO2 Builder
9ba315217c [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare for next development iteration 2018-03-12 08:42:09 +00:00
WSO2 Builder
96ee898b50 [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare release v3.0.244 2018-03-12 08:41:56 +00:00