Commit graph

13694 commits

Author SHA1 Message Date
Kijin Sung
25fe55df01 Update unit tests for jQuery path change 2016-01-15 13:13:24 +09:00
Kijin Sung
3df47d100a Allow jQuery to be referenced as '$' 2016-01-15 11:52:08 +09:00
Kijin Sung
55c6d5be9b Fix 'jQuery.browser is deprecated' warning in common.js 2016-01-15 11:48:03 +09:00
Kijin Sung
1a9559714d Update HTMLDisplayHandler to use latest jQuery 1.x and 2.x 2016-01-15 11:33:04 +09:00
Kijin Sung
45f17696dd Update jQuery, jQuery Migrate, and jQuery UI 2016-01-15 11:31:40 +09:00
Kijin Sung
ae5234a12c Merge pull request #92 from kijin/pr/admin-credits-to-rhymix
관리 모듈의 XE 로고 및 링크를 라이믹스로 변경
2016-01-15 10:10:28 +09:00
Kijin Sung
3a8942ecca Merge pull request #89 from kijin/pr/fix-menu-again
하위 메뉴가 없는 사이트맵 처리 오류 수정
2016-01-15 10:07:47 +09:00
Kijin Sung
28ed0e2bb1 Replace XE branding in admin layout with RhymiX 2016-01-15 10:00:50 +09:00
Kijin Sung
c434558c81 Fix #87 Error when editing menu 2016-01-15 09:43:25 +09:00
Kijin Sung
30eea708b6 Merge pull request #85 from kijin/pr/context-cleanup
Context 클래스 내의 불필요한 $this 사용 정리
2016-01-14 21:33:48 +09:00
Kijin Sung
ec97087543 Add contact email for security issues 2016-01-14 15:28:40 +09:00
Kijin Sung
16d5af8845 Merge branch 'master' into develop 2016-01-14 13:24:12 +09:00
Kijin Sung
5226402f8c Merge pull request #78 from likulogy/patch-1
엔진엑스 리라이트 규칙 및 설정 가이드 추가
2016-01-14 13:22:13 +09:00
LIKU
50088c2f66 Server-config -> server_config 2016-01-14 13:10:27 +09:00
likulogy
02b1c2924f Rewrite rule 오류 수정
by @kijin
2016-01-14 11:34:12 +09:00
likulogy
ed4e110802 내용 개선 및 rewrite rule 개선 2016-01-14 11:28:02 +09:00
Kijin Sung
fc4b5bc0a8 Clean up more non-static references inside Context class 2016-01-14 10:21:09 +09:00
likulogy
76a2ea9e2b 오타 수정 및 내용 추가
XE -> RhymiX
2016-01-14 00:00:25 +09:00
likulogy
1012e31659 오타 수정
XE -> RhymiX
2016-01-13 23:58:43 +09:00
likulogy
c23c8ee24c 리라이트 규칙 및 가이드 수정
작동 확인함. http://puu.sh/muah4/2c2aa574c3.png
2016-01-13 23:51:43 +09:00
likulogy
73c6b70ac1 nginx rewrite rule configuration guide 2016-01-13 22:11:58 +09:00
LIKU
df8f1f42e0 rhymix nginx rewrite rule 2016-01-13 21:23:21 +09:00
Kijin Sung
4f6d83cf32 Merge pull request #77 from kijin/pr/move-manual
도움말 페이지를 구석으로 치움
2016-01-13 20:22:09 +09:00
Kijin Sung
b4a2a52cfa Move old install/admin manual to subdirectory 2016-01-13 20:16:30 +09:00
Kijin Sung
f9b723e5df Merge pull request #66 from kijin/pr/revert-xeicon
xeicon을 1.0.4 버전으로 되돌림
2016-01-13 15:32:50 +09:00
Kijin Sung
99f576b2f5 Revert xeicon to 1.0.4 (with <i> tag patch) 2016-01-13 15:27:29 +09:00
Kijin Sung
01dd26783f Merge pull request #63 from kijin/pr/xeicon-user-add-workaround
xeicon에서 user-add 아이콘이 없어진 문제를 우회
2016-01-13 10:08:30 +09:00
Kijin Sung
c2b4be8a1c Add xi-user-add as an alias to xi-user 2016-01-13 10:03:34 +09:00
Kijin Sung
489034efb7 Merge pull request #61 from kijin/pr/xeicon-xedition-user-add
XEDITION 레이아웃의 로그인 아이콘 표시 문제 수정
2016-01-13 09:35:59 +09:00
Kijin Sung
f4495ebf09 Replace login icon for compatibility with xeicon v2 2016-01-13 09:30:25 +09:00
Kijin Sung
9d9976387d Merge pull request #60 from kijin/pr/fix-menu-regression
Fix #57 메뉴 편집이 되지 않는 버그 수정
2016-01-13 09:21:31 +09:00
Kijin Sung
edbb2ff93e Fix disappearing menu (also fix multi-level menu) 2016-01-13 09:13:39 +09:00
Kijin Sung
a442e34fa7 Fix disappearing menu (json_encode regression) 2016-01-13 09:00:29 +09:00
Kijin Sung
98ddf05940 Merge pull request #52 from kijin/pr/update-xeicon
XEIcon 업데이트 및 <i> 태그 선택자 개선
2016-01-12 21:26:13 +09:00
Kijin Sung
df87e2f6b1 Merge pull request #53 from kijin/pr/fix-embed-filter
YouTube 등의 iframe을 입력할 수 없는 문제 수정
2016-01-12 19:27:26 +09:00
Kijin Sung
5196ddaf83 Fix incorrect generation of whitelist regexp 2016-01-12 19:23:27 +09:00
Kijin Sung
2be2e8e73e Fix incorrect use of embed filter in HTMLPurifier 2016-01-12 19:13:15 +09:00
Kijin Sung
8b8d32c9dd Fix cookie handling in Context class 2016-01-12 18:17:18 +09:00
Kijin Sung
819562ffd1 Restore xpresseditor.js 2016-01-12 18:06:17 +09:00
Kijin Sung
269c186024 Only apply xeicon to <i> tags that have at least one xi-* class 2016-01-12 14:03:52 +09:00
Kijin Sung
b0bfb9a364 Set up replacement table for path conversions 2016-01-12 14:02:26 +09:00
Kijin Sung
48a5e73bdc Update xeicon to v2.0.0 2016-01-12 14:01:46 +09:00
Kijin Sung
c39706c480 Merge pull request #51 from kijin/pr/stupid-symlinks
Zip으로 다운받은 경우 압축 스크립트가 깨지는 문제 수정
2016-01-12 11:10:49 +09:00
Kijin Sung
c10591e250 Merge pull request #48 from kijin/pr/utf8mb4
MySQL에서 utf8mb4 (이모티콘 등) 지원
2016-01-12 10:53:31 +09:00
Kijin Sung
5f9d6f2a6b Merge pull request #42 from kijin/refactor/functions
일반 함수 리팩토링
2016-01-12 10:53:10 +09:00
Kijin Sung
f41040a4b5 Merge branch 'develop' into pr/stupid-symlinks 2016-01-12 10:11:31 +09:00
Kijin Sung
64b89d7b0d Intercept jQuery.getScript() requests to corrupted symlinks 2016-01-12 10:09:41 +09:00
Kijin Sung
e572b81b8a Merge branch 'develop' into pr/utf8mb4
Conflicts:
	tests/Install/AutoinstallCept.php
2016-01-11 20:03:55 +09:00
Kijin Sung
1476d8d0f4 Also check file content to detect corrupted symlinks 2016-01-11 19:58:50 +09:00
Kijin Sung
c9296ffac6 Merge pull request #50 from kijin/pr/grunt-cleanup
불필요한 테스트용 파일 정리
2016-01-11 19:52:35 +09:00