New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync Branche #4

Merged
merged 96 commits into from Oct 12, 2018

Conversation

Projects
None yet
6 participants
@dorami
Owner

dorami commented Oct 12, 2018

Sync Branche

@bjrambo

This comment has been minimized.

Contributor

bjrambo commented on 6ae5c00 Jun 18, 2018

어...어디를 고친걸까..

This comment has been minimized.

Member

bnu replied Jun 18, 2018

2018-06-18 6 21 06

This comment has been minimized.

Contributor

bjrambo replied Jun 18, 2018

122번째줄은 빈칸인거죠?

$output->content = $content->getContent(false, false, true, false, true);

이것만..

bnu and others added some commits Jun 18, 2018

fix xpressengine#2112 가입 인증메일이 만료되었을 때 인증 실패에 따른 문제 고침
- 24시간이 초과되어 인증키 만료 시 새로운 인증 메일 자동 발송
- 기존 인증키는 제거되며, 새로운 인증 키 사용
- 인증 안내 메시지 추가
Merge pull request xpressengine#2271 from kijin/fix/importer
importer 모듈에서 규칙에 맞지 않는 아이디 등이 누락되지 않도록 수정
@kijin

This comment has been minimized.

Contributor

kijin commented on 8d7d0e9 Sep 28, 2018

UploadFileFilter는 클래스 이름만 똑같고 제가 라이믹스에서 완전히 새로 작성한 것이므로, func.inc.php에 새로 추가된 함수들처럼 Copyright를 붙여주시면 감사하겠습니다^^

@kijin

This comment has been minimized.

Contributor

kijin commented on classes/template/TemplateHandler.class.php in 275c304 Oct 8, 2018

XE에서는 그냥 zdate({$var}, {$filter_option})으로 하시면 되는데요.

@dorami dorami merged commit 54b9f05 into dorami:nofollow Oct 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment