Harshan Liyanage
|
9bf5ca94fb
|
Fixed SQL syntax issue
|
8 years ago |
sameera910409
|
41f367abfa
|
add group listing and group device listing fixes
|
8 years ago |
kamidu
|
1c2d339fed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
7212e969d8
|
Fix for SQL query issue in mysql
|
8 years ago |
Ruwan
|
072119d7df
|
Merge pull request #403 from ayyoob/commit-fixes
Commit fixes
|
8 years ago |
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
|
8 years ago |
Harshan Liyanage
|
1ba2e2f768
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Harshan Liyanage
|
f961b57f9f
|
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
|
8 years ago |
Madawa Soysa
|
774eaadb71
|
EMM-1298: Extracting serial number from the certificate itself when adding a certificate
|
8 years ago |
kamidu
|
65ed6c2f6e
|
include owner for the operations api
|
8 years ago |
ayyoob
|
8293ed43ae
|
added missing imports
|
8 years ago |
ayyoob
|
d17241e51e
|
added comments and license
|
8 years ago |
ayyoob
|
45c0d2d2f5
|
added logs if device type registration failed
|
8 years ago |
ayyoob
|
d6090dd812
|
added device type deployer initial commit
|
8 years ago |
Madawa Soysa
|
f6ee6aeb8d
|
Refactoring pages to use new modal unit
|
8 years ago |
Saad Sahibjan
|
1cb969eb6d
|
Fix incorrect spacing
|
8 years ago |
Megala
|
35d6d311a7
|
Fixing EMM-1763
|
8 years ago |
WSO2 Builder
|
27a2c9b979
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
eae935f91c
|
[maven-release-plugin] prepare release v1.2.5
|
8 years ago |
Kamidu Sachith Punchihewa
|
fa7c8e85ce
|
Merge pull request #393 from thusithak/master
Fixing modal dialog markup defects in unit
|
8 years ago |
Kamidu Sachith Punchihewa
|
7666bbfd05
|
Merge pull request #395 from Megala21/master
Fixing EMM-1752 and EMM-1755
|
8 years ago |
WSO2 Builder
|
6a55e1be83
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
11c2e59f61
|
[maven-release-plugin] prepare release v1.2.4
|
8 years ago |
Megala
|
3416ae78c4
|
Fixing the problems in displaying user list when the user names has special chracters
|
8 years ago |
Megala
|
1ff86289fd
|
Fixing the problems that happend when we have special chracters in roles
|
8 years ago |
Megala
|
4ec6883ec8
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Kamidu Sachith Punchihewa
|
0d6364d77a
|
Merge pull request #394 from shavidissa/master
Continued adding swagger annotations and created the swagger extensions file
|
8 years ago |
Megala
|
4a71be850c
|
Refactoring code
|
8 years ago |
Shavindri
|
28cb653b06
|
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
|
8 years ago |
Rasika Perera
|
b8f623e04a
|
Supporting custom contentTypes for service invoker
|
8 years ago |
Megala
|
d9ec203727
|
Fixing EMM-1755
|
8 years ago |
Megala
|
d5c62f74dc
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
thusithakalugamage
|
521a30c260
|
Fixing modal dialog markup defects in unit
|
8 years ago |
harshanl
|
6e1fdabaad
|
EMM-1342:Added policy revoke operation
|
8 years ago |
Megala
|
d90d51d412
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
e55b3a6d5f
|
Fixes related to having special characters in role name
|
8 years ago |
kamidu
|
39bc2e6747
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
1af8184889
|
positioning modal content
|
8 years ago |
thusithakalugamage
|
3aae81d9e4
|
resolving conflicts - removing deprecated modal related methods
|
8 years ago |
thusithakalugamage
|
47ca8942b6
|
resolving conflicts - removing deprecated modal related methods
|
8 years ago |
thusithakalugamage
|
308eeb6cf8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
a89b50197f
|
EMM-1757:Fixed admin device-detail view issue
|
8 years ago |
Megala
|
a04f91cddb
|
Fixing issues related to mapping users and roles from different user stores
|
8 years ago |
harshanl
|
954a2eb870
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Megala
|
87150f5074
|
Fixing secondary role deletion
|
8 years ago |
Megala
|
2195a164e5
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
kamidu
|
6886233bb9
|
removing unnecessary and improving styling in modal unit
|
8 years ago |
thusithakalugamage
|
6667a41378
|
resolving conflicts
|
8 years ago |
harshanl
|
24c38602b8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
51910ee67a
|
EMM-1675:Added policy revoke operation
|
8 years ago |
Megala
|
0756294724
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
d8555c34ab
|
Fixing issues related with roles of secondary user store
|
8 years ago |
kamidu
|
bbfa1c334d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
ed70cb02b6
|
Sample implimentation using the new cdmf.ui.modal unit
|
8 years ago |
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
|
8 years ago |
Shavindri
|
c64581dc59
|
Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
|
8 years ago |
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
|
8 years ago |
kamidu
|
2ea21a6fdc
|
renaming public js to match the unit structure
|
8 years ago |
susinda
|
eb20d1fc1c
|
Device delete implemented (only in api level) for iot
|
8 years ago |
kamidu
|
959e3a63af
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
bfc04a7f16
|
Fixing EMM-EMM-1753
|
8 years ago |
hasuniea
|
2128f08658
|
fixing EMM-1750
|
8 years ago |
Rasika Perera
|
790ca36443
|
Removed unnecessary debug log
|
8 years ago |
Rasika Perera
|
135b6e8881
|
Fixing device view page
|
8 years ago |
kamidu
|
c4a0ac4bf3
|
Enable centralized modal handling unit for cdmf
|
8 years ago |
kamidu
|
6605a86bf7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
43b1a9f278
|
Fix for EMM-1651
|
8 years ago |
charitha
|
528687bde3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
charitha
|
0498c68ca5
|
Add validation to maximum limit value
(cherry picked from commit 4ed757f)
|
8 years ago |
Megala
|
4999b84169
|
Reformatting code
|
8 years ago |
Megala
|
5b96e1b849
|
Fixing EMM-1333
|
8 years ago |
thusithakalugamage
|
fa3db47400
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
thusithakalugamage
|
48337ee16c
|
[EMM-1618] - related improvements on remaining occurences
|
8 years ago |
Rasika Perera
|
2340611a9b
|
Removing mdm specific dependencies from CDMF
|
8 years ago |
Milan Perera
|
da4a558d87
|
Merge pull request #387 from ayyoob/st2
added gateway mode to decide to which oauth app to use.
|
8 years ago |
ayyoob
|
2f58e0ba15
|
added gateway mode to decide to which oauth app to use.
|
8 years ago |
Kamidu Sachith Punchihewa
|
ecc70ead08
|
Merge pull request #385 from hastef88/emm1726
EMM-1726
|
8 years ago |
Kamidu Sachith Punchihewa
|
af4989e56d
|
Merge pull request #384 from shavidissa/master
swagger annotations and definition update continued for device type, …
|
8 years ago |
Hasitha Amal De Silva
|
4555819211
|
EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.
|
8 years ago |
Shavindri
|
0842dcb2bb
|
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
|
8 years ago |
Milan Perera
|
bb60caa171
|
Merge pull request #383 from ayyoob/st2
fixed api name for device type
|
8 years ago |
ayyoob
|
93c1725e32
|
fixed api name for device type
|
8 years ago |
charitha
|
e53b0c3860
|
Fix group count listing in dashboard
|
8 years ago |
kamidu
|
8c94e83431
|
Fix for Jira : EMM-1682 and EMM-1653
|
8 years ago |
charitha
|
a2c0526b40
|
Fix typo
|
8 years ago |
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
|
8 years ago |
kamidu
|
836ed2bc1c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
3223e29df9
|
Fix for EMM-1185 , EMM- 1619
|
8 years ago |
Megala
|
235e9797d4
|
Fixing EMM-1717
|
8 years ago |
ayyoob
|
5727886ea1
|
few changes after apimgt integration
|
8 years ago |
hasuniea
|
05e95e2675
|
fix the EMM-1702
|
8 years ago |
Imesh Chandrasiri
|
125b827f4f
|
Fix for modal popup overlay bug
|
8 years ago |
Kamidu Sachith Punchihewa
|
a8e7396589
|
Merge pull request #377 from DimalChandrasiri/master
Parameterized datatable sorting function
|
8 years ago |
Kamidu Sachith Punchihewa
|
6dafd11ca9
|
Merge pull request #379 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
8 years ago |
harshanl
|
4ce9c95044
|
Changed getOperations API to return operation list of removed devices
|
8 years ago |
thusithakalugamage
|
84a7d5517f
|
EMM-1685] - fix and few other related improvements
|
8 years ago |
Imesh Chandrasiri
|
bce1d9e060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Imesh Chandrasiri
|
3e4c1f9121
|
Parametarized datatable sorting function
|
8 years ago |
Kamidu Sachith Punchihewa
|
5e6d8e667d
|
Merge pull request #376 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
8 years ago |
kamidu
|
131bcd48f9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
cc6922bfad
|
Fix for EMM-1680
|
8 years ago |
charitha
|
664b3d4d43
|
Fix issue in duplicate mapping
|
8 years ago |
harshanl
|
4bcf350236
|
EMM-1678:Updated the oauth component versions
|
8 years ago |
thusithakalugamage
|
1a1f79b1b4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
thusithakalugamage
|
ac27349dae
|
Header nav menu responsiveness improvements
|
8 years ago |
kamidu
|
fc902ba602
|
fix database extended issue
|
8 years ago |
thusithakalugamage
|
909e7836ca
|
Header nav menu responsiveness improvements
|
8 years ago |
kamidu
|
fc50b851bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
4bbb378d26
|
conicting solving
|
8 years ago |
charitha
|
94a50584f4
|
Improve group listing with pagination
|
8 years ago |
kamidu
|
e2ee797462
|
Fix for EMM-1700
|
8 years ago |
madhawap
|
16b334b0b3
|
changes to swagger SecurityDefinitionConfigurator and annotations
|
8 years ago |
madhawap
|
7b8518a9db
|
changes to swagger SecurityDefinitionConfigurator and annotations
|
8 years ago |
charitha
|
ce5d63925a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
charitha
|
e89b4015b6
|
Introduced pagination
|
8 years ago |
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)
|
8 years ago |
Shavindri
|
f0164b5a01
|
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
8 years ago |
thusithakalugamage
|
2ae60cc415
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
thusithakalugamage
|
88ec5246ec
|
[EMM-1694] - Header responsive issues fix
|
8 years ago |
kamidu
|
1fe74905f2
|
Fix for the redirection and ui related issues
|
8 years ago |
Imesh Chandrasiri
|
ebad678bab
|
Datatables serverside paging redirection bug fix
|
8 years ago |
kamidu
|
8c98accd18
|
Fixing conflitcs
|
8 years ago |
kamidu
|
c6fffb0b3a
|
Fixies for the ui issues in EMM -beta
|
8 years ago |
charitha
|
06176898d0
|
Exposed group id to API level
|
8 years ago |
Megala
|
e77d8b8b29
|
Adding isEmpty check
|
8 years ago |
Megala
|
0642cc10d7
|
Reformatting code
|
8 years ago |
Megala
|
f9204add08
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
42a9ba92a6
|
Fixing EMM-1683
|
8 years ago |
charitha
|
f22d392978
|
Upgrade to comply with latest CDMF changes
|
8 years ago |
Megala
|
b7990b9146
|
Fixing problems in retriveing data from secondary user store
|
8 years ago |
Kamidu Sachith Punchihewa
|
c7bd0de033
|
Merge pull request #369 from thusithak/master
Platform configuration style defect fixes
|
8 years ago |
Dilan U. Ariyaratne
|
2d7506d9b8
|
Merge pull request #368 from amalhub/master
Fixing issue: EMM-1537
|
8 years ago |
dilanua
|
dff32af832
|
Adding initial swagger annotations and permissions to Dashboard APIs
|
8 years ago |
dilanua
|
1ca5762c44
|
Uncommenting Dashboard APIs
|
8 years ago |
thusithakalugamage
|
f664749c1f
|
platform configuration style defect fixes
|
8 years ago |
kamidu
|
f32caf1833
|
UI fixes in 2.2.0-beta
|
8 years ago |
charitha
|
a0050d8f4d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
7898a7475c
|
UI fixes in 2.2.0-beta
|
8 years ago |
charitha
|
d1d6eefd17
|
Upgrading grouping backend
|
8 years ago |
amalhub
|
c87c5a8322
|
Fixing issue: EMM-1537
|
8 years ago |
harshanl
|
f0f0182d20
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
a4538a6d6c
|
Removed unnecessary params from paginated queries
|
8 years ago |
Rasika Perera
|
35c23174be
|
Fixing android sense download issue
|
8 years ago |
Rasika Perera
|
0290c710e1
|
Fixing enrollment url for device types
|
8 years ago |
Harshan Liyanage
|
13d9bdfb53
|
Merge pull request #367 from Megala21/master
[EMM-1129]Fixing SSO problem
|
8 years ago |
Megala
|
359bd8f317
|
Fixing tenant loading problem
|
8 years ago |
harshanl
|
672de3a09e
|
Device status change fix for iOS
|
8 years ago |
Megala
|
e8eb0123c7
|
Fixing the tenant loading problem when sso is enabled
|
8 years ago |
harshanl
|
befb5b0ad8
|
EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
|
8 years ago |
amalhub
|
8b4649b4e5
|
Fixing issue: EMM-1537
|
8 years ago |