fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-01 16:22:41 +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

4
modules/member/conf/module.xml
View file

@ -62,8 +62,8 @@
<action name="procMemberSaveDocument" type="controller" standalone="true" />
<action name="procMemberDeleteSavedDocument" type="controller" standalone="true" />
<action name="procMemberFindAccount" type="controller" ruleset="findAccount" standalone="true" />
<action name="procMemberFindAccountByQuestion" type="controller" standalone="true" />
<action name="procMemberFindAccount" type="controller" method="GET|POST" ruleset="findAccount" standalone="true" />
<action name="procMemberFindAccountByQuestion" type="controller" method="GET|POST" standalone="true" />
<action name="procMemberAuthAccount" type="controller" method="GET|POST" standalone="true" />
<action name="procMemberAuthEmailAddress" type="controller" method="GET|POST" standalone="true" />
<action name="procMemberResendAuthMail" type="controller" ruleset="resendAuthMail" standalone="true" />

2
modules/member/tpl/default_config.html
View file

@ -88,3 +88,5 @@
<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
</div>
</form>
<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>

2
modules/member/tpl/design_config.html
View file

@ -50,3 +50,5 @@
<script>
jQuery(function() { doGetSkinColorset("{$config->skin}"); });
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>

2
modules/member/tpl/group_list.html
View file

@ -103,3 +103,5 @@
<p class="x_pull-right">{$lang->add_group_image_mark}: <a href="{getUrl('', 'module','admin', 'act', 'dispModuleAdminFileBox')}" target="_blank">{$lang->link_file_box}</a></p>
</div>
</section>
<div class="admin-forum-container" data-chak-categories="XE설정:회원 그룹"></div>

2
modules/member/tpl/insert_member.html
View file

@ -129,3 +129,5 @@
});
})(jQuery);
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:회원 정보"></div>

2
modules/member/tpl/login_config.html
View file

@ -62,3 +62,5 @@ jQuery(function($){
}).change();
});
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>

2
modules/member/tpl/member_list.html
View file

@ -206,3 +206,5 @@ jQuery(function($){
});
});
</script>
<div class="admin-forum-container" data-chak-categories="XE설정:회원 목록"></div>

2
modules/member/tpl/signup_config.html
View file

@ -217,3 +217,5 @@
#userDefine{max-width:60%;margin-left:-30%}
}
</style>
<div class="admin-forum-container" data-chak-categories="XE설정:회원 설정"></div>