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,698 Commits 31 Branches 461 Tags 183 MiB
e7e8cb62b6
Commit Graph

3698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rasika Perera
63cb0e1fde Adding swagger annotations and scope for /effective-policy 2017-01-12 22:42:44 +05:30
Rasika Perera
3cc176c121 Fixing permission for certificates:verify 2017-01-12 22:42:43 +05:30
Rasika Perera
09aae93fc1 Adding perm:admin:certificates:verify scope 2017-01-12 22:42:43 +05:30
Rasika Perera
e2ecd3c12b Merge pull request #542 from milanperera/release-2.0.x 
Changed logs to warn
 2017-01-12 20:52:37 +05:30
Milan Perera
6abf65695d Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 20:27:15 +05:30
Milan Perera
d9ea6af775 Changed logs to warn 2017-01-12 20:26:46 +05:30
ayyoob
d4ec0705e7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 19:09:12 +05:30
ayyoob
cdd144237f removed unused parameter 2017-01-12 19:09:01 +05:30
Ayyoob Hamza
91f8ac1341 Merge pull request #541 from milanperera/release-2.0.x 
Fixed NPE occurred due to scope mapping
 2017-01-12 19:08:14 +05:30
Milan Perera
311fe7810f Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 19:02:30 +05:30
Milan Perera
21c50c9a55 Fixed NPE occurred due to scope mapping 2017-01-12 19:01:57 +05:30
ayyoob
2fbaf31b93 fixed permission and assigned environment variables for url context 2017-01-12 18:13:43 +05:30
ayyoob
93ae646c50 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 11:13:49 +05:30
ayyoob
de957bec29 few changes after testing the cluster 2017-01-12 11:12:28 +05:30
Rasika Perera
e05600607a Merge pull request #540 from madawas/release-2.0.x 
Refactoring policy view and edit units
 2017-01-11 22:39:53 +05:30
Rasika Perera
c7d489cf2c Merge pull request #538 from madawas/IOTS-377 
IOTS-377 : Fixing VFA icon not visible issue
 2017-01-11 22:33:45 +05:30
Rasika Perera
9bd409e502 Merge pull request #536 from DimalChandrasiri/release-2.0.x 
Updating font wso2 to version 1.2.1
 2017-01-11 21:26:03 +05:30
Madawa Soysa
a28458cf13 Refactoring policy view and edit units 
Refactored the units policy.view and policy.edit to be consistant with policy.create unit. Related to IOTS-296
 2017-01-11 18:34:03 +05:30
Rasika Perera
bb7286c2d5 Merge pull request #539 from milanperera/release-2.0.x 
Fixed permissions adding issue
 2017-01-11 14:45:24 +05:30
Milan Perera
f25e82f4ec Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-11 14:42:08 +05:30
Milan Perera
98ea97d890 Fixed permissions adding issue 2017-01-11 14:41:54 +05:30
Imesh Chandrasiri
957224b905 Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x 2017-01-11 14:40:48 +05:30
Imesh Chandrasiri
d686a9ea57 Updating font wso2 to version 1.2.1 - Commit 2 2017-01-11 14:39:59 +05:30
Madawa Soysa
8a7d0bb3aa IOTS-377 : Fixing VFA icon not visible issue 
Fixes IOTS-377
 2017-01-11 14:03:12 +05:30
Rasika Perera
83868303dd Merge branch 'release-2.0.x' into release-2.0.x 2017-01-11 13:26:53 +05:30
Rasika Perera
8311828c5d Merge pull request #537 from ayyoob/release-2.0.x 
updated ui config
 2017-01-11 13:18:04 +05:30
Imesh Chandrasiri
f1954c4f10 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-11 13:06:14 +05:30
ayyoob
0d721a226b updated ui config 2017-01-11 12:41:34 +05:30
Imesh Chandrasiri
3230a4e269 Updating font wso2 to version 1.2.1 2017-01-11 11:11:33 +05:30
Rasika Perera
300de93626 Merge pull request #535 from rasika/release-2.0.x 
IOTS-376 : Fixing cannot delete a device
 2017-01-11 09:14:42 +05:30
Rasika Perera
ef2a1b84a2 IOTS-376 : Fixing cannot delete a device 2017-01-11 09:12:46 +05:30
kamidu
4588cfbed4 Fixing the permission management issue in EMM console 2017-01-10 17:22:42 +05:30
Rasika Perera
bc01e5e1e9 Merge pull request #534 from ruwany/wip 
Adding api for renaming devices
 2017-01-10 16:22:17 +05:30
Ace
c6d186aa1a Adding missing fix 2017-01-10 16:19:57 +05:30
Ace
bd45b27cc9 Merging with upstream 2017-01-10 16:17:58 +05:30
Ace
643acd7827 Adding api for renaming devices 2017-01-10 16:16:31 +05:30
ayyoob
471e634790 merged with upstream 2017-01-10 12:11:03 +05:30
ayyoob
06977295ea merged with upstream 2017-01-10 12:00:13 +05:30
Chatura Dilan
649d38849d Merge pull request #533 from milanperera/release-2.0.x 
Fixed scopes related issue in SAML Grant type in devicemgt jaggery app
 2017-01-10 11:43:23 +05:30
Milan Perera
562631cc1d Fixed scopes related issue in SAML Granttype 2017-01-10 11:36:45 +05:30
Rasika Perera
8edde9a0f1 Merge pull request #532 from charithag/release-2.0.x 
Fixes for Release 2.0.x
 2017-01-10 10:26:27 +05:30
charitha
cb7ff7f66a Change package name to lower case 2017-01-10 10:18:28 +05:30
ayyoob
819074833f added missing components 
(cherry picked from commit b35e0dd)
 2017-01-10 10:15:27 +05:30
ayyoob
9d5061230c fixing test failures 
(cherry picked from commit ac8dae7)
 2017-01-10 10:15:14 +05:30
charitha
c909144589 Add select2 controller to select roles to share a group 2017-01-10 10:00:48 +05:30
ayyoob
ac8dae7ed0 fixing test failures 2017-01-10 09:27:10 +05:30
ayyoob
505f281f9d Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-10 03:12:44 +05:30
ayyoob
b35e0dd2fa added missing components 2017-01-10 03:09:42 +05:30
Rasika Perera
e1228b408a Removed [httpsWebURL] from config.json 2017-01-09 16:36:11 +05:30
Rasika Perera
9afffc6571 Merge pull request #530 from charithag/release-2.0.x 
Add select2 controller to select roles to share a group
 2017-01-09 15:04:28 +05:30