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 |
|
charitha
|
664b3d4d43
|
Fix issue in duplicate mapping
|
2016-10-06 20:32:09 +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 |
|
charitha
|
94a50584f4
|
Improve group listing with pagination
|
2016-10-06 16:01:41 +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 |
|
charitha
|
ce5d63925a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-06 11:58:12 +05:30 |
|
charitha
|
e89b4015b6
|
Introduced pagination
|
2016-10-06 11:51:54 +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 |
|
charitha
|
06176898d0
|
Exposed group id to API level
|
2016-10-05 12:20:35 +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 |
|
Megala
|
42a9ba92a6
|
Fixing EMM-1683
|
2016-10-05 10:09:35 +05:30 |
|
charitha
|
f22d392978
|
Upgrade to comply with latest CDMF changes
|
2016-10-04 19:03:07 +05:30 |
|
Megala
|
b7990b9146
|
Fixing problems in retriveing data from secondary user store
|
2016-10-04 17:22:45 +05:30 |
|
Kamidu Sachith Punchihewa
|
c7bd0de033
|
Merge pull request #369 from thusithak/master
Platform configuration style defect fixes
|
2016-10-04 17:09:53 +05:30 |
|
Dilan U. Ariyaratne
|
2d7506d9b8
|
Merge pull request #368 from amalhub/master
Fixing issue: EMM-1537
|
2016-10-04 17:04:55 +05:30 |
|
dilanua
|
dff32af832
|
Adding initial swagger annotations and permissions to Dashboard APIs
|
2016-10-04 16:25:17 +05:30 |
|
dilanua
|
1ca5762c44
|
Uncommenting Dashboard APIs
|
2016-10-04 15:49:29 +05:30 |
|
thusithakalugamage
|
f664749c1f
|
platform configuration style defect fixes
|
2016-10-04 15:22:41 +05:30 |
|
Shavindri
|
3d383b0414
|
test push reverse
|
2016-10-04 13:39:08 +05:30 |
|
Shavindri
|
b77aefa02c
|
test push
|
2016-10-04 13:34:44 +05:30 |
|
kamidu
|
f32caf1833
|
UI fixes in 2.2.0-beta
|
2016-10-04 13:20:09 +05:30 |
|
charitha
|
a0050d8f4d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-04 12:26:29 +05:30 |
|
kamidu
|
7898a7475c
|
UI fixes in 2.2.0-beta
|
2016-10-04 12:24:41 +05:30 |
|