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
ayyoob
28faf53802
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
2016-11-19 11:07:00 +05:30
ayyoob
59e2a33e4a
exposed device access authorisation as a service
2016-11-19 11:02:48 +05:30
ayyoob
20e7dd9e86
picked icon from features config
2016-11-17 23:33:04 +05:30
ayyoob
8a6af051dc
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
2016-11-17 18:37:38 +05:30
ayyoob
a0c8aeb159
few changes after testing feature manager implementation
2016-11-17 18:35:40 +05:30
WSO2 Builder
19c1b3566d
[maven-release-plugin] prepare for next development iteration
2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
2016-11-16 12:16:25 +00:00
Ace
16d2a062da
Adding android device-view changes
2016-11-16 15:44:28 +05:30
Ace
a0616cf9a2
Adding config changes
2016-11-16 15:08:43 +05:30
charitha
a6064d2561
Update component versions for IoTS-1.0.0 release
2016-11-16 13:32:13 +05:30
charitha
40c59c2f16
Fix issues in policy UI
2016-11-16 12:46:10 +05:30
charitha
589ba9c40b
Add missing units
2016-11-15 15:59:40 +05:30
charitha
b8d8b35847
Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0
2016-11-15 13:54:59 +05:30
sameera910409
02eec1033e
add group sharing role create functionality
2016-11-15 12:20:58 +05:30
sinthuja
2f59f1566c
Changing the port to the default port of the analytics pack.
2016-11-09 16:12:58 +05:30
ayyoob
415fae8007
fixed update issue
2016-11-08 23:40:28 +05:30
ayyoob
0f66c90660
preload db queries
2016-11-07 01:14:22 +05:30
ayyoob
44ac6b13b5
changes in UI after refactoring
2016-11-07 00:51:08 +05:30
ayyoob
4292442aa5
refactored device type deployer
2016-11-06 17:46:02 +05:30
Ace
5eaca0b1b1
merging with upstream
2016-11-04 20:09:01 +05:30
Ace
2aa1c98d0b
bringing common features to cdmf
2016-11-04 19:12:06 +05:30
charitha
bb60acd105
Fix device listing issue
2016-11-02 12:59:43 +05:30
ayyoob
202e0d5619
merged with origin
2016-11-02 09:44:49 +05:30
ayyoob
33bb9b5a14
merged with IoTS-1.0.0 branch
2016-11-02 06:51:28 +05:30
sinthuja
a5212213cf
Changing the default wbsocket URL to DAS endpoint.
2016-11-01 19:55:22 +05:30
charitha
d1a6353195
Synced with changes in master
2016-11-01 15:41:51 +05:30
charitha
4a115e5d3f
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
2016-11-01 15:01:53 +05:30
Charitha Goonetilleke
e1a1f710a0
Merge pull request #406 from sameeragunarathne/IoTS-1.0.0
...
fixed share groups and group analytics in device grouping
2016-11-01 15:01:38 +05:30
charitha
ac30e7eb3e
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f
[maven-release-plugin] prepare for next development iteration
2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9
[maven-release-plugin] prepare release v1.2.6
2016-10-31 10:32:11 +00:00
kamidu
0867b3d075
updating the footer
2016-10-31 15:39:10 +05:30
Rasika Perera
fbe423b824
Using permissionsUtil.hasPermission for clientside permission check
2016-10-29 23:46:49 +05:30
Rasika Perera
b1b6b94570
Adding permissionsUtil
2016-10-29 23:13:52 +05:30
sameera910409
f8f7dd08cd
fixed share groups and group analytics in device grouping
2016-10-28 14:07:50 +05:30
Harshan Liyanage
261e8c510c
Fixed syntax issue in device.js file
2016-10-27 15:32:38 +05:30
Charitha Goonetilleke
353707c9c7
Merge pull request #404 from sameeragunarathne/IoTS-1.0.0
...
add group listing and group device listing fixes
2016-10-26 17:55:03 +05:30
charitha
1bfba25c5e
Remove user list and role list attributes from group object
...
Move group components to same devicemgt package levels
2016-10-26 17:51:38 +05:30
kamidu
12e609c737
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-26 17:40:05 +05:30
kamidu
0c70c87406
fix for EMM-1673
2016-10-26 17:39:47 +05:30
Kamidu Sachith Punchihewa
02d3adf51e
Merge pull request #401 from madawas/modal-refactor
...
Refactoring pages to use new modal unit
2016-10-26 17:29:50 +05:30
Kamidu Sachith Punchihewa
33874f95b6
Merge pull request #399 from saadsahibjan/master
...
Fix incorrect spacing
2016-10-26 17:28:59 +05:30
Kamidu Sachith Punchihewa
9d90411189
Merge pull request #402 from madawas/EMM-1298
...
Fix for EMM-1298
2016-10-26 17:27:33 +05:30
Kamidu Sachith Punchihewa
a295c88dc0
Merge pull request #405 from Megala21/master
...
Refactoring code
2016-10-26 17:27:04 +05:30
sameera910409
204a0ed943
fixes for the comments of the PR#404
2016-10-26 15:14:53 +05:30
Megala
a088392b2f
Adding css for required fields
2016-10-26 11:58:23 +05:30
sameera910409
fef7c07cb2
add device group deleting and updating fixes
2016-10-26 10:08:48 +05:30
Harshan Liyanage
72522ad759
Fixed SQL syntax issue
2016-10-26 09:49:59 +05:30
Harshan Liyanage
9bf5ca94fb
Fixed SQL syntax issue
2016-10-25 18:50:38 +05:30
sameera910409
41f367abfa
add group listing and group device listing fixes
2016-10-25 17:48:16 +05:30
kamidu
1c2d339fed
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-25 17:22:26 +05:30
kamidu
7212e969d8
Fix for SQL query issue in mysql
2016-10-25 17:22:18 +05:30
Ruwan
072119d7df
Merge pull request #403 from ayyoob/commit-fixes
...
Commit fixes
2016-10-25 15:29:04 +05:30
charitha
5f68953b11
Merge branch 'master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
2016-10-25 14:22:44 +05:30
ayyoob
3140c36f7b
added missing license headers
2016-10-25 13:57:16 +05:30
Harshan Liyanage
1ba2e2f768
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-25 11:51:16 +05:30
Harshan Liyanage
f961b57f9f
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
2016-10-25 11:50:38 +05:30
Madawa Soysa
774eaadb71
EMM-1298: Extracting serial number from the certificate itself when adding a certificate
2016-10-25 11:43:58 +05:30
kamidu
65ed6c2f6e
include owner for the operations api
2016-10-25 11:31:00 +05:30
sinthuja
a6203845c9
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:37:00 +05:30
sinthuja
00e57bd800
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:31:41 +05:30
ayyoob
8293ed43ae
added missing imports
2016-10-24 02:17:20 +05:30
ayyoob
16f6a62dca
refactored DAO handler
2016-10-23 17:37:27 +05:30
ayyoob
fbfb86c53e
refactored DAO handler
2016-10-23 15:45:29 +05:30
ayyoob
d17241e51e
added comments and license
2016-10-23 14:18:15 +05:30
ayyoob
45c0d2d2f5
added logs if device type registration failed
2016-10-23 10:51:14 +05:30
ayyoob
c48f879205
added XmlAccessorType to root pom
2016-10-23 01:24:33 +05:30
ayyoob
e3ef66aa1a
added deployer feature
2016-10-22 22:36:38 +05:30
ayyoob
eeea1c372f
updated configs and Dao
2016-10-22 22:22:34 +05:30
ayyoob
d6090dd812
added device type deployer initial commit
2016-10-22 01:37:01 +05:30
Madawa Soysa
f6ee6aeb8d
Refactoring pages to use new modal unit
2016-10-21 17:19:36 +05:30
Saad Sahibjan
1cb969eb6d
Fix incorrect spacing
2016-10-21 13:52:33 +05:30
Megala
35d6d311a7
Fixing EMM-1763
2016-10-19 11:55:00 +05:30
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
2016-10-18 12:09:16 +00:00
harshanl
370f6de260
Removed applied policy upon removal of the last policy applicable for a device
2016-10-18 17:10:34 +05:30
Kamidu Sachith Punchihewa
fa7c8e85ce
Merge pull request #393 from thusithak/master
...
Fixing modal dialog markup defects in unit
2016-10-18 16:58:48 +05:30
Kamidu Sachith Punchihewa
7666bbfd05
Merge pull request #395 from Megala21/master
...
Fixing EMM-1752 and EMM-1755
2016-10-18 16:58:24 +05:30
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
2016-10-17 14:13:25 +00:00
Megala
3416ae78c4
Fixing the problems in displaying user list when the user names has special chracters
2016-10-17 16:35:58 +05:30
Megala
1ff86289fd
Fixing the problems that happend when we have special chracters in roles
2016-10-17 15:47:32 +05:30
Megala
4ec6883ec8
Merge remote-tracking branch 'upstream/master'
2016-10-17 14:51:20 +05:30
Kamidu Sachith Punchihewa
0d6364d77a
Merge pull request #394 from shavidissa/master
...
Continued adding swagger annotations and created the swagger extensions file
2016-10-17 14:28:07 +05:30
Megala
4a71be850c
Refactoring code
2016-10-17 14:23:55 +05:30
Shavindri
28cb653b06
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
2016-10-17 14:21:30 +05:30
Rasika Perera
b8f623e04a
Supporting custom contentTypes for service invoker
2016-10-17 10:51:39 +05:30
Megala
d9ec203727
Fixing EMM-1755
2016-10-16 13:24:32 +05:30
Megala
d5c62f74dc
Merge remote-tracking branch 'upstream/master'
2016-10-15 21:49:37 +05:30
harshanl
036ed6fe41
Added POLICY_REVOKE operation upon deletion of the last policy
2016-10-14 19:20:11 +05:30
thusithakalugamage
521a30c260
Fixing modal dialog markup defects in unit
2016-10-14 17:57:11 +05:30
harshanl
73539362d4
Refactored PolicyAdministratorPointImpl
2016-10-14 17:33:41 +05:30
harshanl
6e1fdabaad
EMM-1342:Added policy revoke operation
2016-10-14 17:13:43 +05:30
Megala
d90d51d412
Merge remote-tracking branch 'upstream/master'
2016-10-14 16:04:01 +05:30
Megala
e55b3a6d5f
Fixes related to having special characters in role name
2016-10-14 16:03:14 +05:30
kamidu
39bc2e6747
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-14 15:20:14 +05:30
kamidu
1af8184889
positioning modal content
2016-10-14 15:20:05 +05:30
thusithakalugamage
3aae81d9e4
resolving conflicts - removing deprecated modal related methods
2016-10-14 14:16:53 +05:30
thusithakalugamage
47ca8942b6
resolving conflicts - removing deprecated modal related methods
2016-10-14 14:11:49 +05:30
thusithakalugamage
308eeb6cf8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-14 13:52:42 +05:30
harshanl
a89b50197f
EMM-1757:Fixed admin device-detail view issue
2016-10-14 13:21:51 +05:30
Megala
a04f91cddb
Fixing issues related to mapping users and roles from different user stores
2016-10-14 10:59:56 +05:30
harshanl
954a2eb870
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-14 10:14:12 +05:30
Megala
87150f5074
Fixing secondary role deletion
2016-10-14 00:01:15 +05:30
Megala
2195a164e5
Merge remote-tracking branch 'upstream/master'
2016-10-13 21:28:51 +05:30
kamidu
6886233bb9
removing unnecessary and improving styling in modal unit
2016-10-13 19:53:54 +05:30
thusithakalugamage
6667a41378
resolving conflicts
2016-10-13 19:03:44 +05:30
harshanl
24c38602b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-13 17:11:42 +05:30
harshanl
51910ee67a
EMM-1675:Added policy revoke operation
2016-10-13 17:11:36 +05:30
Megala
0756294724
Merge remote-tracking branch 'upstream/master'
2016-10-13 17:01:32 +05:30
Megala
d8555c34ab
Fixing issues related with roles of secondary user store
2016-10-13 16:58:22 +05:30
kamidu
bbfa1c334d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-13 15:16:31 +05:30
kamidu
ed70cb02b6
Sample implimentation using the new cdmf.ui.modal unit
2016-10-13 15:16:09 +05:30
Kamidu Sachith Punchihewa
cce4428a9d
Merge pull request #390 from shavidissa/master
...
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
2016-10-13 14:01:49 +05:30
Shavindri
c64581dc59
Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
2016-10-13 13:45:02 +05:30
Kamidu Sachith Punchihewa
cb825a7f26
Merge pull request #389 from susinda/master
...
Device delete implemented (only in api level) for iot and the fix for the EMM-1715
2016-10-13 12:25:56 +05:30
kamidu
2ea21a6fdc
renaming public js to match the unit structure
2016-10-13 12:22:07 +05:30
susinda
ca68181541
Fixing NPE of EMM-1715
2016-10-13 12:11:37 +05:30
susinda
eb20d1fc1c
Device delete implemented (only in api level) for iot
2016-10-13 12:02:00 +05:30
kamidu
959e3a63af
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-13 11:17:32 +05:30
kamidu
bfc04a7f16
Fixing EMM-EMM-1753
2016-10-13 11:17:15 +05:30
hasuniea
2128f08658
fixing EMM-1750
2016-10-13 10:00:08 +05:30
Rasika Perera
790ca36443
Removed unnecessary debug log
2016-10-13 08:22:37 +05:30
Rasika Perera
135b6e8881
Fixing device view page
2016-10-13 08:16:51 +05:30
kamidu
c4a0ac4bf3
Enable centralized modal handling unit for cdmf
2016-10-12 17:39:31 +05:30
kamidu
6605a86bf7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-12 16:11:00 +05:30
kamidu
43b1a9f278
Fix for EMM-1651
2016-10-12 16:09:28 +05:30
charitha
528687bde3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-12 12:59:41 +05:30
charitha
0498c68ca5
Add validation to maximum limit value
...
(cherry picked from commit 4ed757f)
2016-10-12 12:57:57 +05:30
Megala
4999b84169
Reformatting code
2016-10-12 09:41:43 +05:30
Megala
5b96e1b849
Fixing EMM-1333
2016-10-12 09:38:11 +05:30
thusithakalugamage
fa3db47400
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-11 18:36:56 +05:30
thusithakalugamage
48337ee16c
[EMM-1618] - related improvements on remaining occurences
2016-10-11 18:35:47 +05:30
Rasika Perera
2340611a9b
Removing mdm specific dependencies from CDMF
2016-10-11 15:41:25 +05:30
Milan Perera
da4a558d87
Merge pull request #387 from ayyoob/st2
...
added gateway mode to decide to which oauth app to use.
2016-10-11 15:35:26 +05:30
ayyoob
2f58e0ba15
added gateway mode to decide to which oauth app to use.
2016-10-11 15:15:50 +05:30
Kamidu Sachith Punchihewa
ecc70ead08
Merge pull request #385 from hastef88/emm1726
...
EMM-1726
2016-10-11 11:12:57 +05:30
Kamidu Sachith Punchihewa
af4989e56d
Merge pull request #384 from shavidissa/master
...
swagger annotations and definition update continued for device type, …
2016-10-11 11:12:16 +05:30
Hasitha Amal De Silva
4555819211
EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.
2016-10-11 11:01:30 +05:30
Shavindri
0842dcb2bb
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
2016-10-11 10:33:05 +05:30
Milan Perera
bb60caa171
Merge pull request #383 from ayyoob/st2
...
fixed api name for device type
2016-10-10 20:51:40 +05:30
ayyoob
93c1725e32
fixed api name for device type
2016-10-10 20:47:31 +05:30
charitha
e53b0c3860
Fix group count listing in dashboard
2016-10-10 20:00:39 +05:30
kamidu
8c94e83431
Fix for Jira : EMM-1682 and EMM-1653
2016-10-10 18:27:53 +05:30
kamidu
2f852d84f4
Fix for the issue : EMM policy updating issue
2016-10-10 16:37:37 +05:30
charitha
a2c0526b40
Fix typo
2016-10-10 15:34:18 +05:30
charitha
670ca7c228
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
2016-10-10 15:29:10 +05:30
kamidu
836ed2bc1c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-10 14:16:00 +05:30
kamidu
3223e29df9
Fix for EMM-1185 , EMM- 1619
2016-10-10 14:15:52 +05:30
Megala
235e9797d4
Fixing EMM-1717
2016-10-10 11:36:25 +05:30
ayyoob
852ea00403
refactored method name
2016-10-09 19:10:43 +05:30
ayyoob
5727886ea1
few changes after apimgt integration
2016-10-09 03:16:02 +05:30
hasuniea
05e95e2675
fix the EMM-1702
2016-10-07 15:48:43 +05:30
Imesh Chandrasiri
125b827f4f
Fix for modal popup overlay bug
2016-10-07 14:27:00 +05:30
Kamidu Sachith Punchihewa
a8e7396589
Merge pull request #377 from DimalChandrasiri/master
...
Parameterized datatable sorting function
2016-10-07 13:10:35 +05:30
Kamidu Sachith Punchihewa
6dafd11ca9
Merge pull request #379 from thusithak/master
...
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-07 13:10:20 +05:30
harshanl
4ce9c95044
Changed getOperations API to return operation list of removed devices
2016-10-07 12:34:42 +05:30
thusithakalugamage
84a7d5517f
EMM-1685] - fix and few other related improvements
2016-10-07 12:31:46 +05:30
Imesh Chandrasiri
bce1d9e060
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-07 10:11:35 +05:30
Imesh Chandrasiri
3e4c1f9121
Parametarized datatable sorting function
2016-10-07 10:11:21 +05:30
Kamidu Sachith Punchihewa
5e6d8e667d
Merge pull request #376 from thusithak/master
...
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-06 22:46:51 +05:30
kamidu
131bcd48f9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-06 22:33:15 +05:30
kamidu
cc6922bfad
Fix for EMM-1680
2016-10-06 22:33:08 +05:30
charitha
664b3d4d43
Fix issue in duplicate mapping
2016-10-06 20:32:09 +05:30
harshanl
4bcf350236
EMM-1678:Updated the oauth component versions
2016-10-06 19:43:23 +05:30
thusithakalugamage
1a1f79b1b4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-06 17:46:59 +05:30
thusithakalugamage
ac27349dae
Header nav menu responsiveness improvements
2016-10-06 17:45:55 +05:30
kamidu
fc902ba602
fix database extended issue
2016-10-06 17:25:47 +05:30
thusithakalugamage
a56aac7b87
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-06 16:42:20 +05:30
thusithakalugamage
909e7836ca
Header nav menu responsiveness improvements
2016-10-06 16:41:31 +05:30
kamidu
fc50b851bc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-06 16:26:55 +05:30
kamidu
4bbb378d26
conicting solving
2016-10-06 16:26:50 +05:30
charitha
94a50584f4
Improve group listing with pagination
2016-10-06 16:01:41 +05:30
Megala
c022f51467
Fixing EMM-1587
2016-10-06 15:44:53 +05:30
kamidu
e2ee797462
Fix for EMM-1700
2016-10-06 12:20:07 +05:30
madhawap
16b334b0b3
changes to swagger SecurityDefinitionConfigurator and annotations
2016-10-06 12:13:27 +05:30
madhawap
7b8518a9db
changes to swagger SecurityDefinitionConfigurator and annotations
2016-10-06 11:59:20 +05:30
charitha
ce5d63925a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-06 11:58:12 +05:30
charitha
e89b4015b6
Introduced pagination
2016-10-06 11:51:54 +05:30
Kamidu Sachith Punchihewa
06e70c8326
Merge pull request #373 from shavidissa/master
...
swagger annotations and definitions changes for role management, configuration management and application management(admin)
2016-10-06 11:33:31 +05:30
Shavindri
f0164b5a01
swagger annotations and definitions changes for role management, configuration management and application management(admin)
2016-10-06 10:12:25 +05:30
thusithakalugamage
2ae60cc415
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-05 19:18:22 +05:30
thusithakalugamage
88ec5246ec
[EMM-1694] - Header responsive issues fix
2016-10-05 19:17:51 +05:30
kamidu
1fe74905f2
Fix for the redirection and ui related issues
2016-10-05 18:11:46 +05:30
Imesh Chandrasiri
ebad678bab
Datatables serverside paging redirection bug fix
2016-10-05 15:08:34 +05:30
kamidu
8c98accd18
Fixing conflitcs
2016-10-05 12:24:23 +05:30
kamidu
c6fffb0b3a
Fixies for the ui issues in EMM -beta
2016-10-05 12:22:32 +05:30
charitha
06176898d0
Exposed group id to API level
2016-10-05 12:20:35 +05:30
Megala
e77d8b8b29
Adding isEmpty check
2016-10-05 11:34:05 +05:30
Megala
0642cc10d7
Reformatting code
2016-10-05 10:52:40 +05:30
Megala
f9204add08
Merge remote-tracking branch 'upstream/master'
2016-10-05 10:10:12 +05:30
Megala
42a9ba92a6
Fixing EMM-1683
2016-10-05 10:09:35 +05:30
charitha
f22d392978
Upgrade to comply with latest CDMF changes
2016-10-04 19:03:07 +05:30
Megala
b7990b9146
Fixing problems in retriveing data from secondary user store
2016-10-04 17:22:45 +05:30
Kamidu Sachith Punchihewa
c7bd0de033
Merge pull request #369 from thusithak/master
...
Platform configuration style defect fixes
2016-10-04 17:09:53 +05:30
Dilan U. Ariyaratne
2d7506d9b8
Merge pull request #368 from amalhub/master
...
Fixing issue: EMM-1537
2016-10-04 17:04:55 +05:30
dilanua
dff32af832
Adding initial swagger annotations and permissions to Dashboard APIs
2016-10-04 16:25:17 +05:30
dilanua
1ca5762c44
Uncommenting Dashboard APIs
2016-10-04 15:49:29 +05:30
thusithakalugamage
f664749c1f
platform configuration style defect fixes
2016-10-04 15:22:41 +05:30
Shavindri
3d383b0414
test push reverse
2016-10-04 13:39:08 +05:30
Shavindri
b77aefa02c
test push
2016-10-04 13:34:44 +05:30
kamidu
f32caf1833
UI fixes in 2.2.0-beta
2016-10-04 13:20:09 +05:30
charitha
a0050d8f4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-04 12:26:29 +05:30
kamidu
7898a7475c
UI fixes in 2.2.0-beta
2016-10-04 12:24:41 +05:30
charitha
d1d6eefd17
Upgrading grouping backend
2016-10-04 12:24:40 +05:30
amalhub
c87c5a8322
Fixing issue: EMM-1537
2016-10-04 11:14:39 +05:30
harshanl
f0f0182d20
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-03 18:28:43 +05:30
harshanl
a4538a6d6c
Removed unnecessary params from paginated queries
2016-10-03 18:27:20 +05:30
Rasika Perera
35c23174be
Fixing android sense download issue
2016-10-03 16:05:49 +05:30
Rasika Perera
0290c710e1
Fixing enrollment url for device types
2016-10-03 16:05:49 +05:30
Harshan Liyanage
13d9bdfb53
Merge pull request #367 from Megala21/master
...
[EMM-1129]Fixing SSO problem
2016-10-03 15:42:13 +05:30
Megala
359bd8f317
Fixing tenant loading problem
2016-10-03 15:15:27 +05:30
harshanl
672de3a09e
Device status change fix for iOS
2016-10-03 14:57:46 +05:30
Megala
e8eb0123c7
Fixing the tenant loading problem when sso is enabled
2016-10-03 14:18:43 +05:30
harshanl
befb5b0ad8
EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
2016-10-03 14:13:06 +05:30
amalhub
8b4649b4e5
Fixing issue: EMM-1537
2016-10-03 11:39:03 +05:30
Megala
a0586ca977
Adding comment
2016-10-03 11:34:00 +05:30
Megala
e5870e1306
Fixing the problem of common log out
2016-10-02 23:15:25 +05:30
Megala
b10c323582
Fixing the problem in login
2016-10-02 21:26:13 +05:30
Megala
bacd7ccfd2
Merge remote-tracking branch 'upstream/master'
2016-10-01 22:02:35 +05:30
Megala
4af2a37d9d
Fixing SSO problem
2016-10-01 22:00:59 +05:30
harshanl
406d49ad61
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-30 18:43:38 +05:30
harshanl
399ef2fc06
Windows getOpending operations fix
2016-09-30 15:33:59 +05:30
kamidu
5595100cc2
UI fixes in role and policy management
2016-09-30 15:10:34 +05:30
harshanl
9d31590e83
Windows getPending operations fix
2016-09-30 14:27:11 +05:30
harshanl
10f8b12b88
OperationManagerImpl Code refactored
2016-09-30 11:39:15 +05:30
harshanl
f9ba45f439
Fixed the device status changing issue when there are multiple enrollments for the same device
2016-09-30 11:04:28 +05:30
harshanl
b1e140b58e
Removed unnecessary imports
2016-09-30 10:58:00 +05:30
Chatura Dilan Perera
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
2016-09-29 20:32:59 +05:30
warunalakshitha
25ed0cf370
Fix build issue with swagger version
2016-09-29 18:28:09 +05:30
Rasika Perera
3b68ccb4ba
Merge pull request #365 from rasika/iots-ga
...
Merge iot-ga branch
2016-09-29 15:21:17 +05:30
Megala
400199e965
Merge remote-tracking branch 'upstream/master'
2016-09-29 14:18:24 +05:30
Megala
38677f84e8
Fixing SQL syntax problem
2016-09-29 14:09:44 +05:30
Harshan Liyanage
cd06637546
Merge pull request #364 from Megala21/master
...
Correcting the problem related with oracle syntax
2016-09-29 14:06:49 +05:30
Megala
12aed521e5
Refactoring code
2016-09-29 13:57:06 +05:30
Megala
2cdaf5aa21
Reverting changes made to generic implementations and moving them to oracle specific ones
2016-09-29 13:44:33 +05:30
Megala
ecc87f370c
Fixing oracle error
2016-09-29 13:19:33 +05:30
Rasika Perera
b2eb715fb7
REsolving conflicts
2016-09-29 13:01:01 +05:30
Rasika Perera
5c8c28d28c
Merge pull request #1 from warunalakshitha/master
...
upgrade product iot to carbon 4.4.9
2016-09-29 11:24:05 +05:30
charitha
e6c4053135
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-29 11:12:52 +05:30
charitha
da0977bd85
Fix SQL error when could happen due to large response payloads
2016-09-29 11:12:28 +05:30
Megala
47d6268c9e
Correcting the problem related with oracle syntax
2016-09-29 01:43:33 +05:30
warunalakshitha
397c1daa2a
Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
2016-09-29 00:40:58 +05:30
Rasika Perera
237b9a7078
Creating api endpoint to retrieve features of a device-type
2016-09-28 23:42:44 +05:30
Rasika Perera
b2f31be1d6
Fixing iot operation bar not listing operations
2016-09-28 23:42:15 +05:30
Megala
cd50fe88bc
Reformatting the code
2016-09-28 16:22:59 +05:30
Megala
45cda92082
Merge remote-tracking branch 'upstream/master'
2016-09-28 15:33:42 +05:30
Megala
82be4ef5a8
Fixing oracle script issues
2016-09-28 15:15:24 +05:30
dilanua
7596f7876d
Improving device view info.retrieval - UI
2016-09-28 14:11:00 +05:30
Rasika Perera
6d4ddf7b54
Removed info log on view device
2016-09-27 23:19:14 +05:30
Rasika Perera
1bae3d2213
Fixing policy retrieve api
2016-09-27 22:06:48 +05:30
Rasika Perera
99fee36f2c
Fixing error when properties is null
2016-09-27 21:13:00 +05:30
amalhub
428ce25b6f
Fixing issue: https://wso2.org/jira/browse/EMM-1646
2016-09-27 20:46:00 +05:30
harshanl
9467efe0f6
Fixed notification issue
2016-09-27 17:54:31 +05:30
kamidu
1a9ca2d59e
Fix for Jira issue: EMM-1635
2016-09-27 15:41:47 +05:30
Rasika Perera
12c8483b4b
Changes to devices policy
2016-09-27 15:28:06 +05:30
kamidu
174555b387
Fix for EMM-1627
2016-09-27 11:29:34 +05:30
Rasika Perera
056f6d2f4e
Adding proper error message when no device type is avaialble
2016-09-27 04:49:07 +05:30
Imesh Chandrasiri
de63beaaa6
Roles listing icon resize fix
2016-09-26 20:04:14 +05:30
Imesh Chandrasiri
5e7d3a00ad
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
2016-09-26 20:02:44 +05:30
dilanua
8232bf7484
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633
2016-09-26 19:52:18 +05:30
Imesh Chandrasiri
5954fd9070
EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode
2016-09-26 19:41:20 +05:30
Imesh Chandrasiri
2c0df21491
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
2016-09-26 19:37:43 +05:30
