Kamidu Sachith Punchihewa
|
33874f95b6
|
Merge pull request #399 from saadsahibjan/master
Fix incorrect spacing
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
9d90411189
|
Merge pull request #402 from madawas/EMM-1298
Fix for EMM-1298
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
a295c88dc0
|
Merge pull request #405 from Megala21/master
Refactoring code
|
8 years ago |
sameera910409
|
204a0ed943
|
fixes for the comments of the PR#404
|
8 years ago |
Megala
|
a088392b2f
|
Adding css for required fields
|
8 years ago |
|
sameera910409
|
fef7c07cb2
|
add device group deleting and updating fixes
|
8 years ago |
Harshan Liyanage
|
72522ad759
|
Fixed SQL syntax issue
|
8 years ago |
|
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 |
|
Megala
|
a0586ca977
|
Adding comment
|
8 years ago |
|
Megala
|
e5870e1306
|
Fixing the problem of common log out
|
8 years ago |
|
Megala
|
b10c323582
|
Fixing the problem in login
|
8 years ago |
|
Megala
|
bacd7ccfd2
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
|
Megala
|
4af2a37d9d
|
Fixing SSO problem
|
8 years ago |
|
harshanl
|
406d49ad61
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
harshanl
|
399ef2fc06
|
Windows getOpending operations fix
|
8 years ago |
|
kamidu
|
5595100cc2
|
UI fixes in role and policy management
|
8 years ago |
|
harshanl
|
9d31590e83
|
Windows getPending operations fix
|
8 years ago |
|
harshanl
|
10f8b12b88
|
OperationManagerImpl Code refactored
|
8 years ago |
|
harshanl
|
f9ba45f439
|
Fixed the device status changing issue when there are multiple enrollments for the same device
|
8 years ago |
Chatura Dilan Perera
|
c16cc4cae1
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
Chatura Dilan Perera
|
ed4bca7032
|
[maven-release-plugin] prepare release v1.2.2
|
8 years ago |
warunalakshitha
|
25ed0cf370
|
Fix build issue with swagger version
|
8 years ago |
Rasika Perera
|
3b68ccb4ba
|
Merge pull request #365 from rasika/iots-ga
Merge iot-ga branch
|
8 years ago |
|
Megala
|
400199e965
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
|
Megala
|
38677f84e8
|
Fixing SQL syntax problem
|
8 years ago |
|
Harshan Liyanage
|
cd06637546
|
Merge pull request #364 from Megala21/master
Correcting the problem related with oracle syntax
|
8 years ago |
|
Megala
|
12aed521e5
|
Refactoring code
|
8 years ago |
|
Megala
|
2cdaf5aa21
|
Reverting changes made to generic implementations and moving them to oracle specific ones
|
8 years ago |
|
Megala
|
ecc87f370c
|
Fixing oracle error
|
8 years ago |
|
Rasika Perera
|
b2eb715fb7
|
REsolving conflicts
|
8 years ago |
|
Rasika Perera
|
5c8c28d28c
|
Merge pull request #1 from warunalakshitha/master
upgrade product iot to carbon 4.4.9
|
8 years ago |
|
charitha
|
e6c4053135
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
charitha
|
da0977bd85
|
Fix SQL error when could happen due to large response payloads
|
8 years ago |
|
Megala
|
47d6268c9e
|
Correcting the problem related with oracle syntax
|
8 years ago |
|
warunalakshitha
|
397c1daa2a
|
Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
|
8 years ago |
|
Rasika Perera
|
237b9a7078
|
Creating api endpoint to retrieve features of a device-type
|
8 years ago |
|
Rasika Perera
|
b2f31be1d6
|
Fixing iot operation bar not listing operations
|
8 years ago |
|
Megala
|
cd50fe88bc
|
Reformatting the code
|
8 years ago |
|
Megala
|
45cda92082
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
|
Megala
|
82be4ef5a8
|
Fixing oracle script issues
|
8 years ago |
|
dilanua
|
7596f7876d
|
Improving device view info.retrieval - UI
|
8 years ago |
|
Rasika Perera
|
6d4ddf7b54
|
Removed info log on view device
|
8 years ago |
|
Rasika Perera
|
1bae3d2213
|
Fixing policy retrieve api
|
8 years ago |
|
Rasika Perera
|
99fee36f2c
|
Fixing error when properties is null
|
8 years ago |
|
amalhub
|
428ce25b6f
|
Fixing issue: https://wso2.org/jira/browse/EMM-1646
|
8 years ago |
|
harshanl
|
9467efe0f6
|
Fixed notification issue
|
8 years ago |
|
kamidu
|
1a9ca2d59e
|
Fix for Jira issue: EMM-1635
|
8 years ago |
|
Rasika Perera
|
12c8483b4b
|
Changes to devices policy
|
8 years ago |
|
kamidu
|
174555b387
|
Fix for EMM-1627
|
8 years ago |
|
Rasika Perera
|
056f6d2f4e
|
Adding proper error message when no device type is avaialble
|
8 years ago |
|
Imesh Chandrasiri
|
de63beaaa6
|
Roles listing icon resize fix
|
8 years ago |
|
Imesh Chandrasiri
|
5e7d3a00ad
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
|
dilanua
|
8232bf7484
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633
|
8 years ago |
|
Imesh Chandrasiri
|
5954fd9070
|
EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode
|
8 years ago |
|
Imesh Chandrasiri
|
2c0df21491
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
|
Rasika Perera
|
56a81e431c
|
Removed extra license headers
|
8 years ago |
|
Rasika Perera
|
6bfe166b5d
|
Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username
|
8 years ago |
|
Rasika Perera
|
54c518a4fd
|
Making datatables-extended to get context path from global js variable
|
8 years ago |
|
Rasika Perera
|
77720dd61a
|
Fixing devices listing page styling issue.
|
8 years ago |
|
Rasika Perera
|
1bef7a38ef
|
Minor style fix for wr-hidden-operations
|
8 years ago |
|
kamidu
|
225268bd78
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
kamidu
|
0ab9db2afd
|
Fix for EMM-1575
|
8 years ago |
|
dilanua
|
378dd4084c
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585
|
8 years ago |
|
harshanl
|
1a12838b7c
|
Fixed issue in NotificationDAO due to invalid column name
|
8 years ago |
|
Rasika Perera
|
4c4eba93d8
|
Returning correct representation of the device to template.
|
8 years ago |
|
Rasika Perera
|
cef865f53a
|
Parsing deviceType configs with %https.ip% and %http.ip%
|
8 years ago |
|
Rasika Perera
|
a61be7a7ec
|
Enable group management api
|
8 years ago |
|
Rasika Perera
|
b5b4f508b0
|
Fixing NPE when fetching opeartion
|
8 years ago |
|
Rasika Perera
|
f2af4bd078
|
Fixing undefined exception when device properties not available
|
8 years ago |
|
harshanl
|
27a9eeb692
|
Removed unnecessary DM service
|
8 years ago |
|
harshanl
|
f24242fb8a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
harshanl
|
dd03d0b740
|
Added device status change upon inactivity mechanism
|
8 years ago |
|
Ruwan
|
0c92f80e68
|
Merge pull request #361 from ruwany/carbon-kernel-4.4.7
Migrating kernel/apim/appm/identity to latest versions
|
8 years ago |
|
Rasika Perera
|
ccf4b6492c
|
Fixing devices listing issue
|
8 years ago |
|
Rasika Perera
|
3e2731a772
|
Fixing invoker service return nothing on httpClient requests.
|
8 years ago |
|
dilanua
|
ebead1249c
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
8 years ago |
|
dilanua
|
87a03e8312
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
8 years ago |
|
dilanua
|
71424c4bb7
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1613
|
8 years ago |
|
dilanua
|
e3256417a3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
dilanua
|
a4b39f92e5
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1593
|
8 years ago |
|
harshanl
|
5a6120d6fa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
dilanua
|
92aa413773
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
dilanua
|
f7a38b2313
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1612
|
8 years ago |
|
Ace
|
154a6082ce
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
|
8 years ago |
|
harshanl
|
17127c3846
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
Rasika Perera
|
98ab29fe94
|
Fixing virtual firealarm device agent download
|
8 years ago |
|
Rasika Perera
|
eb5a36ef42
|
Supporting stream download on service invoker
|
8 years ago |
|
Rasika Perera
|
4691bedbc5
|
Fixes to devices listing
|
8 years ago |
|
Rasika Perera
|
1d3f5f39a7
|
Adding custom headers support to invoker util
|
8 years ago |
|
Imesh Chandrasiri
|
f8b08849cd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
|
Imesh Chandrasiri
|
3d5b6cd89f
|
Removing unwanted url params from datatable serverside search
|
8 years ago |
|
harshanl
|
12713f3301
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
Rasika Perera
|
e71d3947cb
|
Adding intuitive error when specified notification provider is not found
|
8 years ago |
|
Rasika Perera
|
513015c1b5
|
Changing context path /emm into /devicemgt on cdmf base app
|
8 years ago |
|
Rasika Perera
|
0fb87f3aa2
|
Fixing device types not shown issue
|
8 years ago |
|
Rasika Perera
|
9148c3baea
|
Fixing dashboard styling issues
|
8 years ago |
|
harshanl
|
108ea98677
|
Refactor policy mgt components and fixed add operations for invalid devices from task service
|
8 years ago |
|
harshanl
|
c967fc34d0
|
Fixed EMM-1513
|
8 years ago |
|
Ace
|
5f90587564
|
Synching with master
|
8 years ago |
|
Chatura Dilan Perera
|
7395c76408
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
8 years ago |
|
Ace
|
33d8829540
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
|
8 years ago |
|
dilanua
|
81c684be50
|
Refactoring user-menu - UI
|
8 years ago |
|
dilanua
|
d8e057abdd
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
|
8 years ago |
|
dilanua
|
6fea974c90
|
Refactoring notifications side-pane - UI
|
8 years ago |
|
dilanua
|
ce1a063688
|
Refactoring notifications side-pane - UI
|
8 years ago |
|
dilanua
|
9a095fa670
|
Refactoring change password modal - UI
|
8 years ago |
|
Ace
|
87ad1e0e71
|
Fixing intermittent jackson bind issue
|
8 years ago |
|
dilanua
|
b16f0fd592
|
Refactoring change password modal - UI
|
8 years ago |
|
Ace
|
099ffd6a74
|
Updating velocity dependencies to OSGI enabled bundle version
|
8 years ago |
|
Chatura Dilan Perera
|
50d8885f8b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
Chatura Dilan Perera
|
a00d6aafd4
|
[maven-release-plugin] prepare release v1.2.1
|
8 years ago |
|
harshanl
|
75df243a33
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
Ace
|
6a8a5cbd5a
|
Merging with master
|
8 years ago |
|
harshanl
|
4169d3b2bd
|
Fixed EMM-1554
|
8 years ago |
|
dilanua
|
b4e4b114a5
|
Updating dashboard title
|
8 years ago |
|
dilanua
|
e8571b7b65
|
Updating operation-mod with windows operation apis
|
8 years ago |
|
dilanua
|
408e10a890
|
Changing admin dashboard name to 'Navigating Dashboard' - UI
|
8 years ago |
|
dilanua
|
713c8ac4d8
|
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
|
8 years ago |
|
dilanua
|
cd66f64945
|
Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI
|
8 years ago |
|
dilanua
|
37131afb4a
|
Adding radio:checked and input[type=hidden] support to operation mod - UI
|
8 years ago |
|
dilanua
|
e4dae67fea
|
Changing permissions - /devices/any to /devices/any-device
|
8 years ago |
|
dilanua
|
58f8656e94
|
Changing permissions - /devices/owning to /devices/owning-device
|
8 years ago |
|
Rasika Perera
|
d9b25eda08
|
Adding deviceName into notifications
|
8 years ago |
|
Dilan U. Ariyaratne
|
1651ade4a7
|
Merge pull request #357 from thusithak/master
Theme migration - 2.2.0 alpha defect fixes
|
8 years ago |
|
Dilan U. Ariyaratne
|
df7c54b1af
|
Merge pull request #356 from DimalChandrasiri/theme-migration
Model Fixes
|
8 years ago |
|
thusithakalugamage
|
2f5d90cb6c
|
[EMM-1571] Add policies page wizard styling and layout defects
|
8 years ago |
|
harshanl
|
5b0e99aeff
|
Fixed EMM-1562
|
8 years ago |
|
harshanl
|
78cab76101
|
Fixed EMM-1531
|
8 years ago |
|
Imesh Chandrasiri
|
1599b84e54
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
|
Imesh Chandrasiri
|
e2576b21a8
|
Adding default button class to modal popups
|
8 years ago |
|
kamidu
|
a448959fe0
|
Fix for EMM-1548
|
8 years ago |
|
Ace
|
1dfb8e22e1
|
Updating to latest appm/apim/identity dependencies
|
8 years ago |
|
kamidu
|
e2d0f7d040
|
Fix for EMM-1559
|
8 years ago |
|
Imesh Chandrasiri
|
3e5064feed
|
Fix for datatable icon size change on pagination
|
8 years ago |
|
Imesh Chandrasiri
|
9573bce48f
|
Fix for datatable icon size change on pagination
|
8 years ago |
|
Imesh Chandrasiri
|
317252ebb0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
|
Rasika Perera
|
1d7546916c
|
Changes to the policiesCount, rolesCount, usersCount methods
|
8 years ago |
|
Rasika Perera
|
0fab418187
|
Fixing invalid device count and group count
|
8 years ago |
|
Imesh Chandrasiri
|
b56fb667b7
|
Modal fixes
|
8 years ago |
|
kamidu
|
d7c7315f16
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
kamidu
|
70dd5ded77
|
Fix for the policy edit internal server issue
|
8 years ago |
|
Dilan U. Ariyaratne
|
3cbaecfbbf
|
Merge pull request #355 from DimalChandrasiri/theme-migration
Data Table CSS Removed from custom.desktop file
|
8 years ago |
|
thusithakalugamage
|
144dd92c47
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
thusithakalugamage
|
d2a44647dd
|
[EMM-1549] - Heading defect fix
|
8 years ago |
|
dilanua
|
00d79c9ece
|
Changing certificates breadcrumb name from certificate to certificates - UI
|
8 years ago |
|
Imesh Chandrasiri
|
7a452d09ab
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
|
Imesh Chandrasiri
|
e3b230937e
|
Remove data table styles
|
8 years ago |
|
thusithakalugamage
|
4cb5238112
|
[EMM-1543] styling defect fix
|
8 years ago |
|
thusithakalugamage
|
3b3962b772
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
thusithakalugamage
|
0273a6e369
|
responsive tab panel component - markup rewrite for uuf
|
8 years ago |
|
dilanua
|
6aa01d2e7a
|
Fixing NPE issue in token-protected-service-invokers - UI
|
8 years ago |
