nagoon97 6a102d544e conflicts resolved ... git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11386 201d5d3c-b55e-5fd7-737f-ddc643e51545		2012-09-19 11:17:54 +00:00
..
conf	issue 2498 when access to the page not a dashboard,	2012-09-19 02:44:43 +00:00
lang	issue 63. make it able to use checking is_logged status in menu grant	2012-07-27 09:49:27 +00:00
queries	issue 2498 new admin menu develop	2012-09-18 13:00:18 +00:00
ruleset	issue 1234 if not exists module instance, should not showed in add menu form	2011-12-29 07:24:37 +00:00
schemas	issue 2366, Delete a module when delete menu	2012-09-13 08:26:03 +00:00
tpl	conflicts resolved	2012-09-19 11:17:54 +00:00
menu.admin.controller.php	issue 2506 when add menu item, return json page after proc	2012-09-19 08:08:35 +00:00
menu.admin.model.php	issue 2498 new admin menu develop	2012-09-18 13:00:18 +00:00
menu.admin.view.php	issue 2498 when access to the page not a dashboard,	2012-09-19 02:44:43 +00:00
menu.class.php	issue 2366, Delete a module when delete menu	2012-09-13 08:26:03 +00:00
menu.mobile.php	add phpDoc comment in menu module	2012-06-25 09:30:08 +00:00