fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-26 05:42:13 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14)

Browse source 
Conflicts:
	classes/context/Context.class.php
	modules/point/tpl/config.html
This commit is contained in:
Kijin Sung 2015-12-02 14:38:23 +09:00
commit a22e69b7ec
59 changed files with 249 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/module/module.controller.php
View file

@ -993,7 +993,7 @@ class moduleController extends module
}
}
$oDB->commit;
$oDB->commit();
return new Object();
}

2
modules/module/tpl/adminFileBox.html
View file

@ -116,3 +116,5 @@
</ul>
</form>
</section>
<div class="admin-forum-container" data-chak-categories="XE설정:파일 박스"></div>

2
modules/module/tpl/category_list.html
View file

@ -58,3 +58,5 @@
<input type="submit" class="x_btn x_btn-primary" value="{$lang->cmd_registration}">
</div>
</form>
<div class="admin-forum-container" data-chak-categories="XE설정:모듈"></div>

1
modules/module/tpl/category_update_form.html
View file

@ -20,3 +20,4 @@
</section>
<!--@end-->
<div class="admin-forum-container" data-chak-categories="XE설정:모듈"></div>

4
modules/module/tpl/module_list.html
View file

@ -59,4 +59,6 @@ jQuery(function($){
$('.dsTg>tbody>tr[data-type1]').prependTo('tbody');
$('.dsTg>tbody>tr[data-type2]').prependTo('tbody');
});
</script>
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:모듈"></div>