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 |
|
Harshan Liyanage
|
83c36d4d3c
|
Merge pull request #382 from Megala21/master
Fixing EMM-1717
|
2016-10-10 11:42:17 +05:30 |
|
Megala
|
235e9797d4
|
Fixing EMM-1717
|
2016-10-10 11:36:25 +05:30 |
|
Ruwan
|
9687d554a6
|
Merge pull request #381 from ayyoob/st2
Fixed the issues related to apimgt integration
|
2016-10-09 21:41:27 +04:00 |
|
ayyoob
|
92d30eaadc
|
config update
|
2016-10-09 22:47:17 +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 |
|
Kamidu Sachith Punchihewa
|
8740eae61a
|
Merge pull request #380 from DimalChandrasiri/master
Fix for modal popup overlay bug
|
2016-10-07 14:38:04 +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 |
|
thusithakalugamage
|
11544fab15
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-07 12:09:48 +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 |
|
thusithakalugamage
|
8b221b2fc6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-06 19:48:52 +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 |
|
Kamidu Sachith Punchihewa
|
848e58f094
|
Merge pull request #375 from Megala21/master
Fixing EMM-1587
|
2016-10-06 16:20:57 +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 |
|
Kamidu Sachith Punchihewa
|
7d7977cbdc
|
Merge pull request #374 from madhawap/master
changes to swagger SecurityDefinitionConfigurator and annotations
|
2016-10-06 12:16:00 +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 |
|
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 |
|
Kamidu Sachith Punchihewa
|
4ddc3cddd3
|
Merge pull request #372 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
2016-10-06 11:33:10 +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 |
|
Kamidu Sachith Punchihewa
|
31f9134bac
|
Merge pull request #371 from DimalChandrasiri/master
Datatables serverside paging redirection bug fix
|
2016-10-05 15:26:08 +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 |
|
Harshan Liyanage
|
d09475669e
|
Merge pull request #370 from Megala21/master
Fixing EMM-1596 and EMM-1683
|
2016-10-05 11:44: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 |
|