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
3,364 Commits 31 Branches 461 Tags 183 MiB
f4b3313ad7
Commit Graph

2679 Commits

Author SHA1 Message Date
Hasunie
b9e0b099a1 fixing device update issue 2016-12-07 08:37:00 +05:30
charitha
7368b2cf64 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-06 19:09:24 +05:30
charitha
8348002f66 Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x 2016-12-06 19:07:21 +05:30
Charitha Goonetilleke
e137644677 Merge pull request #467 from madawas/IOTS-296 
IOTS-296: Genaralizing policy view UI
 2016-12-06 19:06:19 +05:30
charitha
161fe62a08 Fix for https://wso2.org/jira/browse/IOTS-323 2016-12-06 18:59:43 +05:30
Ace
34225bd9da fixing operations loading spinner and other ui issues 2016-12-06 17:13:56 +05:30
Menaka Jayawardena
84a0b398fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-06 14:44:05 +05:30
Menaka Jayawardena
ca2a79a001 Added entries for portal app in config files. 2016-12-06 14:43:05 +05:30
Ace
872bd88c6e Merging with upstream 2016-12-06 13:34:48 +05:30
Ace
8cc0ba56c1 Adding changes to descriptor 2016-12-06 13:29:59 +05:30
Madawa Soysa
de95c99ea7 IOTS-296: Genaralizing policy view UI 
This commit inclued the generic policy view UI unit
 2016-12-06 12:17:46 +05:30
Hasunie
631ea6e80f Merge pull request #465 from harshanL/release-2.0.x 
Added security filters to devicemgt jaggery app
 2016-12-06 12:12:14 +05:30
Harshan Liyanage
24c0966dce Merge pull request #462 from madawas/IOTS-322 
IOTS-322: Infroming users when device types are not installed
 2016-12-06 12:06:21 +05:30
Harshan Liyanage
b4eb86e985 Added security filters to devicemgt jaggery app 2016-12-06 11:54:31 +05:30
Rasika Perera
e8d8373d46 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-06 11:36:18 +05:30
Rasika Perera
4c1fb558d3 Fixing sso infinite redirection 2016-12-06 10:50:46 +05:30
Madawa Soysa
1d1f399477 IOTS-322: Infroming users when device types are not installed 
Currently policy platfom selection page is empty if no device types are installed. This will add an meaningful message to user if no device types are added.

This commit resolves IOTS-322
 2016-12-05 16:59:25 +05:30
Imesh Chandrasiri
f8d03e992e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-05 14:35:59 +05:30
Imesh Chandrasiri
09fa48c4c2 Removed fade-edge class from template markups for better listing readability 2016-12-05 14:35:36 +05:30
Charitha Goonetilleke
22990087a0 Merge pull request #459 from GPrathap/release-2.0.x 
removed hardcoded validity period while creating application in APIM
 2016-12-05 12:50:33 +05:30
charitha
78d0172d5d Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x 2016-12-05 12:35:58 +05:30
charitha
ee5459dc79 Fix for https://wso2.org/jira/browse/IOTS-321 2016-12-05 12:35:33 +05:30
Rasika Perera
2cfff85ee2 Merge pull request #458 from ruwany/release-2.0.x 
Adding content-type to descriptor
 2016-12-05 10:51:22 +05:30
Ace
7eaee141e0 Adding content-type to descriptor 2016-12-05 10:34:11 +05:30
GPrathap
7807ed77da removed hardcoded validity period while creating application in APIM 2016-12-05 09:50:10 +05:30
GPrathap
6e69fc8e84 changed application creation endpoint 2016-12-05 09:48:26 +05:30
Madawa Soysa
5c356914e8 IOTS-296: Commenting and refactoring 2016-12-02 16:52:05 +05:30
WSO2 Builder
228b24ca79 [maven-release-plugin] prepare for next development iteration 2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55 [maven-release-plugin] prepare release v2.0.2 2016-12-01 12:10:10 +00:00
charitha
a8fff3736a Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 17:12:24 +05:30
charitha
1c8e4b8de7 Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
 2016-12-01 17:12:10 +05:30
Charitha Goonetilleke
67a73189e1 Merge pull request #456 from rasika/IoTS-1.0.0 
Fixing iOS UI issues
 2016-12-01 17:03:21 +05:30
Rasika Perera
bec0f58e38 Adding semi-colon on context variable on service invoker Js 2016-12-01 16:50:06 +05:30
Rasika Perera
884bbe66b5 Adding iOS enrollment path into config.json 2016-12-01 16:50:06 +05:30
Rasika Perera
098ae372f7 Adding new css class for device type view image 2016-12-01 16:50:06 +05:30
charitha
3b97b3296e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 16:47:05 +05:30
Megala
ed325ee576 Adding dashboard feature 2016-12-01 16:41:35 +05:30
Chatura Dilan
82d865b104 Merge pull request #453 from madhawap/release-2.0.x 
Seperate out task operations
 2016-12-01 16:39:29 +05:30
geethkokila
fbfbed7060 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 16:36:23 +05:30
geethkokila
20ca76640d Adding changes for the grouping and ownership changes 2016-12-01 16:35:59 +05:30
madhawap
2b00645779 refactored code 2016-12-01 16:31:27 +05:30
charitha
e718ab5504 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 15:30:29 +05:30
charitha
cad686b43c Bug fixes & UI/UX improvements 2016-12-01 15:28:39 +05:30
madhawap
bec4ae681d Seperate out task operations 2016-12-01 15:28:22 +05:30
Madawa Soysa
b2650e439c Fix issue with policy wrapper group select 2016-12-01 15:23:00 +05:30
Madawa Soysa
345fdc0ced IOTS-296: Removing ownership selection when policy creation 
Removes ownership selection when creating and editing policies. Ownership management is done by the groups.
 2016-12-01 12:34:15 +05:30
Hasunie
1d6bf23d67 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-01 09:15:37 +05:30
Hasunie
529bde822c fixing property string mapper issue 2016-12-01 09:12:33 +05:30
Hasunie
1b5bae3e46 adding required authorization property 2016-12-01 08:59:19 +05:30
charitha
efb2695286 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-11-30 18:15:48 +05:30
geethkokila
0879a75f7b Fixing the serializing issue of device groups. 2016-11-30 17:46:01 +05:30
charitha
d9b670ef19 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-11-30 17:11:18 +05:30
charitha
564cece94b Bug fixes 2016-11-30 17:11:01 +05:30
Charitha Goonetilleke
e1d2d8a73f Merge pull request #447 from ruwany/release-2.0.x 
Adding android operations bar related changes
 2016-11-30 17:08:08 +05:30
Ace
6126776fcf Adding android operations bar related changes 2016-11-30 16:51:30 +05:30
Madawa Soysa
8cdc8cfb24 IOTS-296: Refactoring Policy create/edit units 2016-11-30 14:18:57 +05:30
charitha
3cb13e18a5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-11-30 14:03:59 +05:30
Charitha Goonetilleke
d9763ff5b7 Merge pull request #445 from GPrathap/release-2.0.x 
added creating an application for WebSocket
 2016-11-30 13:05:36 +05:30
GPrathap
64ce41f571 added creating an application for WebSocket 2016-11-30 12:44:26 +05:30
GPrathap
c969013ca2 added new property : validity Period 2016-11-30 12:33:36 +05:30
charitha
a8e4a5f6fc Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-11-30 11:46:18 +05:30
Charitha Goonetilleke
bf48f57f84 Merge pull request #442 from DimalChandrasiri/release-2.0.x 
Validation error fix
 2016-11-30 11:41:01 +05:30
Charitha Goonetilleke
c84d7fd13d Merge pull request #440 from DimalChandrasiri/IoTS-1.0.0 
Data table fix when list view
 2016-11-30 11:40:27 +05:30
charitha
4c60c90537 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-11-30 11:30:07 +05:30
Madawa Soysa
c61cd484a0 IOTS-296: Adding group selection capability when adding a policy 
This commit introduces the device group select capabilty and saving the policy when creating and editing policies.
 2016-11-29 18:34:25 +05:30
Imesh Chandrasiri
a56b953fcb Validation error fix 2016-11-29 13:32:29 +05:30
Madawa Soysa
a4ca74c6c0 IOTS-296: Generalizing policy UI for policy edit 
This commit removes device type specific  client side logic and UI components from the `cdmf.unit.policy.edit` unit.
 2016-11-28 16:36:12 +05:30
Madawa Soysa
7aada58472 IOTS-296: Fixing issue with device type icon 
This commit fixes an issue which is unable to load device type icons in the policy listing page.
 2016-11-28 16:36:12 +05:30
Madawa Soysa
0dfde40b7c IOTS-296: Generalizing policy UI for policy create wizard 
This commit is done to seperate policy related client side logic and UIs from device type specific logics.
This is a part of creating self contained plugins  for device types.

This commit generalizes the policy creation wizard in the CDMF core and removes device type specific UIs and client side logic from the core. Also, this introduces a generic policy configuration UI in a new unit.
 2016-11-28 16:36:12 +05:30
Imesh Chandrasiri
d90c9ab68a Data table fix when list view 2016-11-28 11:33:16 +05:30
charitha
431ce58c65 Merge with release-2.0.x branch 2016-11-25 14:24:20 +05:30
charitha
1bcea7cc1b Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group 2016-11-25 14:22:00 +05:30
WSO2 Builder
8431b30ddc [maven-release-plugin] prepare for next development iteration 2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14 [maven-release-plugin] prepare release v2.0.1 2016-11-25 07:43:34 +00:00
Rasika Perera
4789aafd28 Minor ui changes to the group listing 2016-11-25 12:28:48 +05:30
Charitha Goonetilleke
027498895a Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0 
Merging UI fixes
 2016-11-25 11:48:23 +05:30
Imesh Chandrasiri
54bb91d428 IoT Build UI Fixes 2016-11-25 11:19:14 +05:30
Rasika Perera
03f965adf6 Decrease group listing page loading time with lazy roles listing 2016-11-25 11:18:17 +05:30
Imesh Chandrasiri
07a0dee2d9 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-25 11:18:15 +05:30
Rasika Perera
05453e7379 Removed 'role' suffix from roles listing page 2016-11-25 10:35:45 +05:30
Rasika Perera
ce4b389df0 Merge branch 'IoTS-1.0.0' of https://github.com/charithag/carbon-device-mgt into IoTS-1.0.0 2016-11-25 08:23:20 +05:30
Rasika Perera
aaade2363c Adding new api to create combined roles 2016-11-25 08:18:10 +05:30
Rasika Perera
3fe18ba4bb Refactoring group sharing modal 2016-11-25 08:17:39 +05:30
charitha
ca5d96df67 Add test cases to verify DAO functionality 2016-11-24 13:29:25 +05:30
Rasika Perera
54211bc3cc Fixing minor issues on GroupDAO 2016-11-24 09:58:42 +05:30
Imesh Chandrasiri
5525c42eae Removed Unneccsary title and added padding 2016-11-23 16:43:16 +05:30
charitha
a2db592d69 Updated group management APIs and service 2016-11-23 14:06:24 +05:30
charitha
726bbcd35d Merged with upstream 2016-11-23 13:51:50 +05:30
Madawa Soysa
55bc5042bb Merge pull request #422 from madawas/grouping-policy 
Generalize Policy Implementation - Creating system groups based on ownership
 2016-11-23 10:00:17 +05:30
charitha
c07d77b85d Updated group sharing model 2016-11-22 21:13:18 +05:30
ayyoob
ec3dbd37dd fixed commit comments 2016-11-22 15:03:23 +05:30
Madawa Soysa
2f431504fe creating groups from ownership and changing group owner 
This commit includes following changes,
Creating groups using the device ownership
Changing the default system group owner to wso2.system.user
 2016-11-22 13:25:27 +05:30
ayyoob
e3849ef21e removed feature lifecycle implementation 2016-11-21 20:49:27 +05:30
ayyoob
3fb42ef32e Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-21 19:16:32 +05:30
ayyoob
fede8ec409 few changes after testing with authoriser 2016-11-21 19:13:59 +05:30
Madawa Soysa
8ab73ce07d fixing issue with javadocs 2016-11-21 16:16:33 +05:30
Madawa Soysa
2164a30f88 changing group owner to super user 
Changing the owner of the default system generated groups from the group creator to the super user of the system.
 2016-11-21 16:16:00 +05:30
Madawa Soysa
c29bf24a75 Adding mobile devices to default groupes based on device ownership 
Adding mobile devices to default system generated groups based on the device ownership (BYOD, COPE)
 2016-11-21 09:21:44 +05:30
GPrathap
6efc5bc1ed removed @API and @Permission annotations 2016-11-20 19:10:45 +05:30
ayyoob
fe263efe60 changed device access verification approach 2016-11-20 02:37:37 +05:30