Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Develop - 140803 #6

Merged
merged 37 commits into from
Aug 3, 2014
Merged

Develop - 140803 #6

merged 37 commits into from
Aug 3, 2014

Conversation

sejin7940
Copy link
Owner

No description provided.

khongchi and others added 30 commits July 8, 2014 13:50
@khongchi
fix typo
b85b7b1
@sejin7940
Update comment.controller.php
b5c23ae
@sejin7940
Update editor.model.php
69124bc
@akasima
#849 게시판 설정 '고급'탭이 기본 활성화 되록 개선
be89e49
@akasima
#850 관리자 좌측 메뉴에서 '설정', '고급' 메뉴 탭이 항상 노출되도록 개선
9368455
@akasima
Merge pull request #848 from sejin7940/editor_grant2
417699e 
#846 에서 지적한 #840 PR 의 오류 수정입니다.
@akasima
#855 모듈 선택기에서 모듈 분류가 있을 경우 리스트 개선
94f9296
@izuzero
공통 CSS 오류 수정
c187b8a
@akasima
Merge pull request #856 from izuzero/develop.7
822d45b 
공통 CSS 오류 수정
@akasima
#839 getRemoteResource 에서 연결 설정을 수정할 수 있도록 처리
66a2440
@akasima
modify version to 1.7.5.4
26b12ae
@akasima
Merge branch 'master' into develop
d24ff73
@akasima
modify version to 1.7.5.5
791149f
@akasima
Merge branch 'develop' of https://github.com/xpressengine/xe-core int…
330b7a7 
…o develop
@akasima
Merge branch 'master' into develop
62b1686
@akasima
#834 message module의 오퓨 페이지 BI 교체
3503a89
@akasima
#862 escapeValue()에서 foreach로 처리되록 수정
26427a8
@akasima
Merge branch 'hotfix/1.7.5.6' into develop
b5226da
@bjrambo
#857 $widget_info->extra_var 를 new stdClass 처리부분제거
c9dc416
@akasima
modify version to 1.7.5.6
2c66e67
@akasima
Merge branch 'master' into develop
c70e1db
@akasima
#869 installController::checkRewriteUsable() modified to support HTTPS
16c2694
@izuzero
관리자 계정인데도 문서첨부제한이 적용되는 오류 수정
272ac06
@akasima
#861 modified, https install error
7acee10
@akasima
Merge branch 'feature/install.https' into develop
bbd0a6a
@akasima
Merge pull request #871 from izuzero/develop.8
458a710 
관리자 계정인데도 문서첨부제한이 적용되는 오류 수정 #870
@akasima
#872 add send message trigger parameter
f382c36
@akasima
Merge branch 'develop' of https://github.com/xpressengine/xe-core int…
0847fdc 
…o develop
@akasima
Merge pull request #863 from qw5414/develop
7d3aaf9 
#857 $widget_info->extra_var 를 new stdClass 처리부분제거
@akasima
#853 add empty value to select box of member extra vars
969622a
sejin7940 added a commit that referenced this pull request Aug 3, 2014
@sejin7940
Merge pull request #6 from xpressengine/develop
748cb99 
Develop - 140803
@sejin7940 sejin7940 merged commit 748cb99 into sejin7940:develop Aug 3, 2014
sejin7940 pushed a commit that referenced this pull request Oct 25, 2014
@YJSoft
Merge pull request #6 from xpressengine/develop
7d869fb 
update
sejin7940 pushed a commit that referenced this pull request Apr 15, 2015
@izuzero
Merge pull request #6 from xpressengine/develop
c6eafb9 
Develop
sejin7940 pushed a commit that referenced this pull request Apr 15, 2015
@dorami
Merge pull request #6 from xpressengine/develop
10e7a65 
Develop
sejin7940 pushed a commit that referenced this pull request Aug 18, 2015
@YJSoft
Merge pull request #6 from xpressengine/develop
19df2de 
Update-1
sejin7940 pushed a commit that referenced this pull request Sep 18, 2016
@bjrambo
Merge pull request #6 from xpressengine/develop
e42d883 
Develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sejin7940 @khongchi @akasima @izuzero @bjrambo