Rasika Perera
|
3fe18ba4bb
|
Refactoring group sharing modal
|
8 years ago |
Imesh Chandrasiri
|
5525c42eae
|
Removed Unneccsary title and added padding
|
8 years ago |
ayyoob
|
ec3dbd37dd
|
fixed commit comments
|
8 years ago |
ayyoob
|
fede8ec409
|
few changes after testing with authoriser
|
8 years ago |
ayyoob
|
28faf53802
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
8 years ago |
ayyoob
|
59e2a33e4a
|
exposed device access authorisation as a service
|
8 years ago |
ayyoob
|
20e7dd9e86
|
picked icon from features config
|
8 years ago |
ayyoob
|
8a6af051dc
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
8 years ago |
ayyoob
|
a0c8aeb159
|
few changes after testing feature manager implementation
|
8 years ago |
WSO2 Builder
|
19c1b3566d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
cff6e242c8
|
[maven-release-plugin] prepare release v2.0.0
|
8 years ago |
Ace
|
16d2a062da
|
Adding android device-view changes
|
8 years ago |
Ace
|
a0616cf9a2
|
Adding config changes
|
8 years ago |
charitha
|
a6064d2561
|
Update component versions for IoTS-1.0.0 release
|
8 years ago |
charitha
|
40c59c2f16
|
Fix issues in policy UI
|
8 years ago |
charitha
|
589ba9c40b
|
Add missing units
|
8 years ago |
charitha
|
b8d8b35847
|
Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0
|
8 years ago |
sameera910409
|
02eec1033e
|
add group sharing role create functionality
|
8 years ago |
sinthuja
|
2f59f1566c
|
Changing the port to the default port of the analytics pack.
|
8 years ago |
ayyoob
|
44ac6b13b5
|
changes in UI after refactoring
|
8 years ago |
charitha
|
bb60acd105
|
Fix device listing issue
|
8 years ago |
ayyoob
|
33bb9b5a14
|
merged with IoTS-1.0.0 branch
|
8 years ago |
sinthuja
|
a5212213cf
|
Changing the default wbsocket URL to DAS endpoint.
|
8 years ago |
charitha
|
d1a6353195
|
Synced with changes in master
|
8 years ago |
charitha
|
4a115e5d3f
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
8 years ago |
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
|
8 years ago |
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
8 years ago |
kamidu
|
0867b3d075
|
updating the footer
|
8 years ago |
Rasika Perera
|
fbe423b824
|
Using permissionsUtil.hasPermission for clientside permission check
|
8 years ago |
Rasika Perera
|
b1b6b94570
|
Adding permissionsUtil
|
8 years ago |
sameera910409
|
f8f7dd08cd
|
fixed share groups and group analytics in device grouping
|
8 years ago |
Harshan Liyanage
|
261e8c510c
|
Fixed syntax issue in device.js file
|
8 years ago |
kamidu
|
12e609c737
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
0c70c87406
|
fix for EMM-1673
|
8 years ago |
Kamidu Sachith Punchihewa
|
02d3adf51e
|
Merge pull request #401 from madawas/modal-refactor
Refactoring pages to use new modal unit
|
8 years ago |
Kamidu Sachith Punchihewa
|
9d90411189
|
Merge pull request #402 from madawas/EMM-1298
Fix for EMM-1298
|
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 |
sameera910409
|
41f367abfa
|
add group listing and group device listing fixes
|
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 |
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 |
Madawa Soysa
|
f6ee6aeb8d
|
Refactoring pages to use new modal unit
|
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 |
Megala
|
4a71be850c
|
Refactoring code
|
8 years ago |
Rasika Perera
|
b8f623e04a
|
Supporting custom contentTypes for service invoker
|
8 years ago |
Megala
|
d9ec203727
|
Fixing EMM-1755
|
8 years ago |
thusithakalugamage
|
521a30c260
|
Fixing modal dialog markup defects in unit
|
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 |
Megala
|
a04f91cddb
|
Fixing issues related to mapping users and roles from different user stores
|
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 |
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
|
ed70cb02b6
|
Sample implimentation using the new cdmf.ui.modal unit
|
8 years ago |
kamidu
|
2ea21a6fdc
|
renaming public js to match the unit structure
|
8 years ago |
kamidu
|
bfc04a7f16
|
Fixing EMM-EMM-1753
|
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
|
43b1a9f278
|
Fix for EMM-1651
|
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 |
Hasitha Amal De Silva
|
4555819211
|
EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.
|
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 |
kamidu
|
3223e29df9
|
Fix for EMM-1185 , EMM- 1619
|
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 |
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 |
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 |