Commit graph

8264 commits

Author SHA1 Message Date
Kijin Sung
8ee10fe9b2 Fix division by zero during page calculation in DocumentModel 2016-02-19 15:44:26 +09:00
Kijin Sung
6ab309c8c4 Merge branch 'xpressengine/master' into develop
Conflicts:
	classes/context/Context.class.php
	classes/security/Purifier.class.php
	config/config.inc.php
	libs/phpmailer/phpmailer.php
	modules/admin/tpl/_header.html
	modules/admin/tpl/config_ftp.html
	modules/communication/communication.controller.php
	modules/layout/tpl/layout_modify.html
	modules/module/module.model.php
2016-02-18 20:01:52 +09:00
bnu
3c269225d5 forum chak 제거 2016-02-18 17:17:43 +09:00
qw5414
160129879a 쪽지 발송시 이메일로 험깨 발송되는 콘텐츠의 필터링 보충 추가 (xe1.8.16) 2016-02-18 16:49:15 +09:00
qw5414
d06483fb16 문서제목에 대한 보안 추가 보안 2016-02-18 16:36:08 +09:00
bnu
642de6805f syntax error 수정 2016-02-18 16:35:43 +09:00
bnu
b77a94b91f 설치 및 확인되지 않은 호환성 문제가 있어 일부 되돌림 2016-02-18 16:30:40 +09:00
bnu
2cbf72f19a Merge branch 'php7' of https://github.com/kijin/xe-core into pr/1814 2016-02-18 16:29:17 +09:00
bnu
6cb5733cad #1859 문서 제목에 대한 htmlspecialchars() 적용 2016-02-18 13:20:59 +09:00
bnu
8ac578d7b9 #1858 쪽지 발송 시 이메일로 함께 발송하는 콘텐츠의 필터링 추가
- 이메일로 전송되는 본문에 대한 필터링 적용
2016-02-18 13:14:02 +09:00
Kijin Sung
0b388cdd99 Fix missing default parameter in addonAdminController 2016-02-18 08:52:27 +09:00
Kijin Sung
65517735e0 Clean up common_layout.html and merge with mobile_layout.html 2016-02-17 16:20:57 +09:00
Kijin Sung
be83a34b1e Merge pull request #278 from kijin/pr/fix-csrf-false-positive
#275 기본 URL 변경에 따른 오류 해소
2016-02-16 14:34:53 +09:00
Kijin Sung
e1341584d3 Merge pull request #268 from kijin/pr/debugger
편리한 디버그 기능 추가
2016-02-16 14:33:44 +09:00
Kijin Sung
1e69d7404a Fix input of slow log thresholds less than 1 2016-02-16 13:12:13 +09:00
qw5414
f1801a4982 비회원의 닉네임이 나타나지 않던 문제점 개선 2016-02-16 11:20:32 +09:00
Kijin Sung
516479cf20 Migrate addon, trigger, and widget logging functions to Debug class 2016-02-16 11:01:45 +09:00
Kijin Sung
a009ef62c6 Merge pull request #276 from SoneYours/develop
피라미터가 없어도 오류없도록 고침
2016-02-15 20:16:30 +09:00
Kijin Sung
19469a7b0d After changing the default URL, redirect to new default URL 2016-02-15 20:16:03 +09:00
Kijin Sung
63bddd0c9a Fix #273 'msg_is_not_manager' message and broken styles 2016-02-15 19:35:32 +09:00
qw5414
a292ef29e9 피라미터가 없어도 오류없도록 고침 2016-02-15 15:00:12 +09:00
Kijin Sung
7c4fc37dd3 Make debug log filename configurable 2016-02-15 14:28:57 +09:00
Kijin Sung
05e9961b10 Fix outdated license and community links 2016-02-14 22:14:59 +09:00
Kijin Sung
b806a899bb Merge branch 'develop' into pr/debugger 2016-02-14 20:03:40 +09:00
Kijin Sung
4e2535624d Use separate debug files and prevent direct access 2016-02-13 21:11:05 +09:00
BJRambo
448bf25660 Merge pull request #265 from SoneYours/pr/fixed-communication
커뮤니케이션 맴버 애드온을 삭제하고, 커뮤니케이션 모듈을 생성 (기본값 사용함)
2016-02-13 12:48:26 +09:00
Kijin Sung
6b4d69bcc2 Remove old debug constants 2016-02-13 11:19:13 +09:00
Kijin Sung
e04efdd03e Do not display meaningless debug information 2016-02-13 10:40:40 +09:00
qw5414
47860db6e4 닉네임 변경을 기록하지 않을경우 회원메뉴를 추가하지 않도록 개선 2016-02-13 10:29:11 +09:00
qw5414
0c9fa7400f 관리자 페이지일경우 사용하지 않음. 2016-02-13 10:12:10 +09:00
qw5414
29044a98bf 커뮤니케이션 맴버 모듈을 삭제하고, 커뮤니케이션 모듈을 생성 (기본값 사용함) 2016-02-13 09:30:04 +09:00
Kijin Sung
ac8460d782 Finalize debug data format and allow all statistics to be collected 2016-02-12 21:31:38 +09:00
Kijin Sung
81ef35a887 Make the error page more flexible 2016-02-12 14:12:22 +09:00
Kijin Sung
fb4361a657 Merge branch 'develop' into pr/debugger 2016-02-12 09:52:12 +09:00
BJRambo
1e828dcf21 Merge pull request #253 from SoneYours/develop
#197 설정값을 분리
2016-02-11 19:53:37 +09:00
Kijin Sung
55c6d9dbab Add admin interface to control debug settings 2016-02-11 16:31:24 +09:00
Kijin Sung
eb84b57658 Fix #248 missing index.html in manual link 2016-02-11 15:31:51 +09:00
Kijin Sung
f3d3122787 Make object cache configurable via the admin UI 2016-02-11 13:32:55 +09:00
qw5414
a4dbf16746 실수로 정리되지 않은 코드 정리.. 2016-02-11 13:17:40 +09:00
qw5414
f4d8f613fe 추가 설정 분리 및, 글 기간 보호 기능 추가 2016-02-11 13:14:47 +09:00
Kijin Sung
225f02cac2 Also update sites table when default_url is updated 2016-02-11 13:05:28 +09:00
Kijin Sung
cbd75382fe Merge branch 'develop' into pr/misc-optimizations 2016-02-11 11:11:01 +09:00
Kijin Sung
d166ea3a82 Fix #259 trying to set a nonexistent config value 2016-02-11 11:09:15 +09:00
Kijin Sung
4dbb0239c6 Use object cache for widgets as well 2016-02-11 10:51:45 +09:00
Kijin Sung
80f2dd7a8a Replace is_a() and is_subclass_of() with instanceof 2016-02-11 09:57:08 +09:00
Kijin Sung
bc06367edf Fix #258 missing fields in member search list 2016-02-11 09:07:13 +09:00
Kijin Sung
6343538b2d Merge branch 'develop' into pr/reorganize-admin-menu 2016-02-10 20:24:12 +09:00
Kijin Sung
11c9c8928e Ensure consistency between the default URL and SSL/port settings 2016-02-10 17:07:48 +09:00
qw5414
77a998c10a #197 설정값을 분리 2016-02-10 13:15:14 +09:00
Kijin Sung
079b04684a Fix #249 double-escape of site title and HTML footer 2016-02-10 11:36:13 +09:00