fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity
13414 commits 3 branches 212 tags 117 MiB
Commit graph

13414 commits

This branch
This branch
All branches
Author SHA1 Message Date
CONORY
550c8739e6 Merge pull request #4 from kijin/feature/userid-or-email 
아이디 또는 메일 주소로 로그인할 수 있도록 허용
 2015-12-18 14:27:01 +09:00
Kijin Sung
3469a3bdbf 아이디 또는 메일 주소로 로그인할 수 있도록 허용 2015-12-18 14:21:45 +09:00
CONORY
de0c54ff37 Merge pull request #3 from kijin/php7 
PHP7 호환성 개선
 2015-12-18 14:15:15 +09:00
CONORY
890a5dbfe9 Merge pull request #2 from kijin/crazymerge 
Crazymerge
 2015-12-18 13:25:41 +09:00
CONORY
a198f97a0c Update README.md 2015-12-18 12:52:13 +09:00
CONORY
459847a991 Update README.md 2015-12-18 12:48:09 +09:00
CONORY
8f0ea5482e Update README.md 2015-12-18 12:47:46 +09:00
CONORY
e7ca59dab4 Merge pull request #1 from izuzero/develop-new-feature 
module.updateModulePartConfig 함수 추가
 2015-12-18 12:09:07 +09:00
CONORY
87e6983f4b Update README.md 2015-12-18 11:39:41 +09:00
Kijin Sung
9b341a85b8 Merge #1802 $modified_timed -> $modified_time by qkrcjfgus33 
* pr/1802:
  $modified_timed -> $modified_time
 2015-12-15 10:01:06 +09:00
Kijin Sung
ee59467d80 Merge #1782 모듈 복제 시, 설정값이 이미 존재하는 모듈을 복제하는 경우 실패 by imjanghyuk 
* pr/1782:
  모듈 복제 시, 설정값이 있는 모듈은 복제가 정상적으로 되지 않는 문제 해결
 2015-12-15 10:01:05 +09:00
Kijin Sung
dbb8629e0a Merge branch 'fix/profile-image-mtime' into crazymerge 2015-12-15 09:54:47 +09:00
Kijin Sung
6f4fa03dc0 프로필 이미지 URL에 filemtime을 추가하여 변경시 캐시 갱신 유도 2015-12-14 21:48:23 +09:00
Kijin Sung
5f5377fe85 Merge branch 'develop' into php7 2015-12-09 13:14:01 +09:00
Kijin Sung
470e4f2a7a Merge branch 'develop' into crazymerge 2015-12-09 13:13:02 +09:00
bnu
78be4d5626 Merge branch 'release/1.8.15' into develop 2015-12-08 17:25:21 +09:00
bnu
77da93a6ef version 1.8.15 2015-12-08 17:24:56 +09:00
bnu
c4ea86bd05 Merge branch 'develop' of github.com:xpressengine/xe-core into develop 2015-12-08 17:23:01 +09:00
Kijin Sung
be5c3c21bf Merge branch 'develop' into php7 2015-12-08 16:14:06 +09:00
Kijin Sung
1f9cf71ff9 Merge branch 'develop' into crazymerge 2015-12-08 16:13:47 +09:00
bnu
ca4e83ab45 Merge pull request #1735 from qkrcjfgus33/patch-2 
getDbInfo -> getDBInfo
 2015-12-08 16:08:07 +09:00
bnu
412c7ed132 Merge pull request #1762 from qkrcjfgus33/patch-7 
autoload 적용으로 필요없어진 상수 삭제
 2015-12-08 16:07:04 +09:00
bnu
ed32faf059 Merge pull request #1763 from qkrcjfgus33/patch-8 
fix #1690 $GLOBALS['HTTP_RAW_POST_DATA'] 버그 수정
 2015-12-08 16:05:24 +09:00
Kijin Sung
69cce1e4a0 Fix uninitialized stdClass warning 2015-12-08 15:53:06 +09:00
Kijin Sung
d117147d76 Fix regression with HTTP_RAW_POST_DATA 2015-12-08 15:50:52 +09:00
bnu
c1eab055bc fix #1813 레이아웃 미리보기 동작에 CSRF/XSS 방어 및 embed URL에 'act' parameter 사용 제한 
- `layoutView::dispLayoutPreview()`에 XSS/CSRF 방어
- src, href, style 등 HTML attribute에 'act'를 포함하는 URL을 사용할 수 없도록 제한
 2015-12-08 15:11:55 +09:00
Kijin Sung
da0b1bad47 Unconditionally set HTTP_RAW_POST_DATA to avoid SimpleXML warnings 2015-12-08 14:24:38 +09:00
Kijin Sung
41809cfb69 Fix unsupported /e modifier in preg_replace function call 2015-12-08 14:10:28 +09:00
Kijin Sung
6473115ed3 Fix incompatible signatures of inherited methods 2015-12-08 14:07:42 +09:00
Kijin Sung
f6c226a0b7 Merge branch 'pr/1763' into php7 2015-12-08 14:07:16 +09:00
Kijin Sung
7642d1c6b0 Merge #1763 fix #1690 $GLOBALS['HTTP_RAW_POST_DATA'] by qkrcjfgus33 
* pr/1763:
  fix #1690 $GLOBALS['HTTP_RAW_POST_DATA'] 버그 수정
 2015-12-08 11:51:31 +09:00
Kijin Sung
a22e69b7ec Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14) 
Conflicts:
	classes/context/Context.class.php
	modules/point/tpl/config.html
 2015-12-02 14:38:23 +09:00
qkrcjfgus33
01c4a5e833 $modified_timed -> $modified_time 
잘못된 변수명 변경
 2015-11-12 14:34:05 +09:00
bnu
ca0fb36fb8 Merge branch 'release/1.8.14' into develop 2015-11-09 16:15:22 +09:00
bnu
8b3ce51317 version 1.8.14 2015-11-09 16:14:57 +09:00
bnu
96364fdcca 쪽지 목록에서 다중 선택 후 삭제를 실행할 수 없는 문제 고침 2015-11-09 16:08:30 +09:00
bnu
1d12b76a86 MINIFY 2015-11-09 15:58:27 +09:00
bnu
73c5935599 fix error 2015-11-09 15:53:50 +09:00
bnu
4010d00d79 Merge branch 'feature/forum-chak' into develop 2015-11-09 15:40:12 +09:00
bnu
9984d123ee forum chak 추가 2015-11-09 15:39:32 +09:00
bnu
ab8d571dd4 #1795 보완 2015-11-09 14:59:10 +09:00
bnu
1c2c5387df Merge branch 'develop' of github.com:xpressengine/xe-core into develop 2015-11-06 17:08:05 +09:00
bnu
ed1b324534 Merge pull request #1795 from qw5414/deletedDoc 
선택적SSL설정에서 글 삭제시 문제점 나타나는 부분 고침
 2015-11-06 17:07:01 +09:00
YJSoft
961deaf3ea fix #1796 에디터 컴포넌트와 위젯의 스타일도 체크함 2015-11-06 17:06:40 +09:00
bnu
5fc1ee52f3 Merge pull request #1780 from kijin/fix/xedition-login-ssl 
SSL 선택적 사용시 XEDITION 레이아웃의 로그인 팝업에 SSL이 적용되지 않는 문제 수정
 2015-11-04 15:22:36 +09:00
BJRambo
87bab69497 fixed Deleted Redirect 2015-10-28 02:52:49 +09:00
BJRambo
9b76d6dfd9 Merge pull request #11 from xpressengine/develop 
Develop
 2015-10-28 02:50:45 +09:00
bnu
b00771c13e Merge branch 'release/1.8.13' into develop 2015-10-23 16:10:34 +09:00
bnu
7222e3d1d2 version 1.8.13 2015-10-23 16:10:08 +09:00
bnu
31dafd9482 Merge pull request #1774 from YJSoft/fix/uitest 
그룹 관리의 누락된 폼 아이디 추가
 2015-10-23 16:01:46 +09:00