Commit graph

12055 commits

Author SHA1 Message Date
akasima
e2ecc73fba #907 replace to addBack() because andSelf() deprecated 2014-08-13 16:27:13 +09:00
akasima
43fec02555 #903 support select, textarea configure at editor components config 2014-08-13 16:11:51 +09:00
akasima
a01757706d #906 add title attribute to display detail time 2014-08-13 14:32:14 +09:00
akasima
eb3da2617e #900 add error option in exec_json, exec_html 2014-08-13 11:21:03 +09:00
akasima
5ca223ec2b Merge pull request #891 from sejin7940/member_list
관리자 회원목록 페이지에서,  이메일이 이중으로 중복 출력되는 버그 수정
2014-08-13 09:24:34 +09:00
akasima
6de223b8e7 Merge branch 'feature/install_config_file' into develop 2014-08-12 15:54:26 +09:00
akasima
d4a27b1017 Merge branch 'feature/autoinstall_direct' into develop 2014-08-12 15:54:16 +09:00
akasima
72dd48a596 #904 autoinstall without ftp 2014-08-12 15:35:51 +09:00
akasima
565614696f #905 install using config/install.config.php 2014-08-12 15:30:24 +09:00
akasima
51a37345ae Merge pull request #883 from lansi951/remove_getmodel
사용되지 않는 getModel 삭제
2014-08-11 14:10:58 +09:00
sejin7940
da63917185 Update member.admin.view.php 2014-08-09 00:07:57 +09:00
sejin7940
15e6fb36c8 Merge pull request #8 from xpressengine/develop
Develop - 140809
2014-08-09 00:06:07 +09:00
akasima
4d1daeb2d7 modify Authors infomation 2014-08-08 12:30:33 +09:00
sejin7940
e38a23fa6f Merge pull request #7 from xpressengine/develop
Develop - 140808
2014-08-08 06:16:27 +09:00
akasima
ed67b5d983 Merge branch 'develop' of https://github.com/xpressengine/xe-core into develop 2014-08-07 17:19:59 +09:00
akasima
23d961290f Merge pull request #670 from Xpress54/devel-template
#588 템플릿 파일 오류시 오류 정보와 해당 오류가 발생한 템플릿 파일을 출력
2014-08-07 17:19:50 +09:00
akasima
8b62e69470 Merge branch 'feature/router' into develop 2014-08-07 17:01:30 +09:00
akasima
3aedf0df54 Merge pull request #453 from smaker/feature/router
Router 기능 추가
2014-08-07 17:00:14 +09:00
akasima
f0bfbb5179 #40 insert list_order value when create new group 2014-08-06 16:07:10 +09:00
akasima
382093798e #881 text bold tag changed to '<strong>' from '<b>' 2014-08-05 19:07:38 +09:00
akasima
887e328505 Merge branch 'hotfix/1.7.5.7' into develop 2014-08-05 14:30:57 +09:00
akasima
49daa9d95d modify version to 1.7.5.7 2014-08-05 14:29:55 +09:00
akasima
f09a309ee1 #815 remove nickname check by utf8_decode 2014-08-05 14:21:24 +09:00
lansi951
67bef2ff6d 사용되지 않는 getModel 삭제 2014-08-05 11:11:09 +09:00
akasima
60c35b0a60 #824 add request parameter when popup component 2014-08-04 15:21:00 +09:00
akasima
4e409e6195 #882 check search_target perrmition in search_option 2014-08-04 14:06:57 +09:00
sejin7940
748cb99d9f Merge pull request #6 from xpressengine/develop
Develop - 140803
2014-08-03 22:45:00 +09:00
akasima
bfe3194af8 #826 support temporary save at page module 2014-07-31 16:15:01 +09:00
akasima
29f37ed999 #874 multi language support 2014-07-31 14:47:26 +09:00
akasima
b0a50e8be5 #837 remove unnecessary html tags 2014-07-31 14:43:43 +09:00
akasima
d0dbbffd1c #847 모바일(또는 textarea형)에서 댓글 수정시 줄바꿈 유지되도록 수정 restore 2014-07-31 14:03:22 +09:00
akasima
c234affb49 Merge branch 'master' into develop 2014-07-31 13:59:13 +09:00
akasima
9a3eab0bda Revert "#847 모바일(또는 textarea형)에서 댓글 수정시 줄바꿈 유지되도록 수정" 2014-07-31 13:43:27 +09:00
akasima
fa0f15ad1a Merge pull request #847 from sejin7940/comment_mobile
모바일(또는 textarea형)에서 댓글 수정시 줄바꿈 유지되도록 수정
2014-07-30 17:48:05 +09:00
akasima
969622a29c #853 add empty value to select box of member extra vars 2014-07-30 16:29:14 +09:00
akasima
7d3aaf9f01 Merge pull request #863 from qw5414/develop
#857 $widget_info->extra_var 를 new stdClass 처리부분제거
2014-07-30 15:35:16 +09:00
akasima
0847fdce03 Merge branch 'develop' of https://github.com/xpressengine/xe-core into develop 2014-07-30 14:58:35 +09:00
akasima
f382c3615d #872 add send message trigger parameter 2014-07-30 14:58:27 +09:00
akasima
458a710161 Merge pull request #871 from izuzero/develop.8
관리자 계정인데도 문서첨부제한이 적용되는 오류 수정 #870
2014-07-30 10:06:16 +09:00
akasima
bbd0a6a9bf Merge branch 'feature/install.https' into develop 2014-07-30 10:01:17 +09:00
akasima
7acee1050d #861 modified, https install error 2014-07-30 10:00:35 +09:00
izuzero
272ac061d6 관리자 계정인데도 문서첨부제한이 적용되는 오류 수정 2014-07-29 23:51:04 +09:00
akasima
16c2694c19 #869 installController::checkRewriteUsable() modified to support HTTPS 2014-07-29 17:57:34 +09:00
akasima
c70e1db796 Merge branch 'master' into develop 2014-07-28 15:08:59 +09:00
akasima
2c66e6786c modify version to 1.7.5.6 2014-07-28 11:32:44 +09:00
BJRambo
c9dc416c60 #857 $widget_info->extra_var 를 new stdClass 처리부분제거 2014-07-26 09:43:28 +09:00
akasima
b5226da402 Merge branch 'hotfix/1.7.5.6' into develop 2014-07-25 18:28:29 +09:00
akasima
26427a8967 #862 escapeValue()에서 foreach로 처리되록 수정 2014-07-25 18:27:59 +09:00
akasima
3503a896ae #834 message module의 오퓨 페이지 BI 교체 2014-07-23 14:18:28 +09:00
akasima
62b1686665 Merge branch 'master' into develop 2014-07-22 19:28:39 +09:00