Commit graph

14013 commits

Author SHA1 Message Date
Kijin Sung
987b78eb1a Merge pull request #232 from kijin/pr/cleanup-ip-allow-deny
관리자 허용 IP 및 사이트 잠금 예외 IP 처리 개선
2016-02-09 11:41:06 +09:00
Kijin Sung
28095d7b6d Prevent infinite redirect and add logout link to sitelock message 2016-02-09 11:37:43 +09:00
Kijin Sung
6db7068245 Add link to sitelock config page in admin dashboard 2016-02-09 11:06:21 +09:00
Kijin Sung
ef22fe3f87 Add sitelock message to default skin 2016-02-09 10:57:06 +09:00
Kijin Sung
95f8bf9a43 Also use system_message template for site lock 2016-02-09 10:55:26 +09:00
Kijin Sung
a2bab6a952 Merge pull request #240 from kijin/pr/chrome-install
#238 크롬에서 설치가 진행되지 않는 버그 수정
2016-02-09 09:51:52 +09:00
Kijin Sung
f038091b37 Fix #238 installer freezing in Chrome 2016-02-09 09:44:19 +09:00
BJRambo
0ea4df4ea7 Merge pull request #236 from SoneYours/pr/add-module-lang
언어파일이 없는 문제점 개선.
2016-02-09 03:02:41 +09:00
qw5414
93ec98844a 언어파일이 없는 문제점 개선. 2016-02-09 02:57:45 +09:00
Kijin Sung
bc33e8f478 Add login form to default system message page 2016-02-09 00:40:24 +09:00
Kijin Sung
69296b3c8c Refine site lock IP range handling 2016-02-08 23:02:11 +09:00
Kijin Sung
dcba0bec58 Change sitelock HTTP code to 503 Service Unavailable 2016-02-08 22:25:56 +09:00
Kijin Sung
605fdec1a2 Allow sitelock immediately after install (#160) 2016-02-08 22:00:17 +09:00
Kijin Sung
9e9b09464f Clean up admin IP whitelist and block at login time 2016-02-08 21:26:43 +09:00
CONORY
ec2bbca41e change logo image 2016-02-08 18:22:24 +09:00
Kijin Sung
a499aa0d1f Fix inconsistent capitalization of Rhymix 2016-02-08 16:31:10 +09:00
Kijin Sung
f58d8f7d06 Merge pull request #231 from kijin/pr/new-config-more-fixes
새 설정 포맷 나머지 정리
2016-02-08 16:00:55 +09:00
Kijin Sung
066f3017c7 Use gzip setting from new config format 2016-02-08 15:50:26 +09:00
Kijin Sung
8a7f509a1a Separate XML lang parser into its own class 2016-02-08 15:46:48 +09:00
Kijin Sung
95bafb094b Clean up config juggling routines 2016-02-08 15:39:28 +09:00
Kijin Sung
bf5942bce5 Merge pull request #211 from kijin/pr/new-config-format
설정 포맷 전반적인 정리 + 관련 기능 다수 개선
2016-02-08 10:09:41 +09:00
Kijin Sung
6b5e95a0c4 Select InnoDB engine automatically if available 2016-02-07 23:13:22 +09:00
Kijin Sung
e59dc59664 Misc fixes to install module 2016-02-07 22:55:52 +09:00
Kijin Sung
bb888a5037 Change nonsense English translation 2016-02-07 22:41:49 +09:00
Kijin Sung
005d507bfa Do not convert date format automatically 2016-02-07 22:39:27 +09:00
Kijin Sung
e55504e1f4 Merge branch 'develop' into pr/new-config-format
Conflicts:
	common/legacy.php
2016-02-07 22:15:27 +09:00
MinSoo Kim
271c93605d Merge pull request #228 from misol/pr/layout-colorpicker
Fix layout_modify.js to submit type=color contents.
2016-02-07 19:33:43 +09:00
MinSoo Kim
78367c0e04 Fix layout_modify.js to submit type=color contents.
- 레이아웃 편집 기능이 자바스크립트에 의존 중
- 의미에 맞는 HTML 이 되도록 수정할 필요가 있음.
- 우선 문제가 생기는 부분을 해결.
2016-02-07 19:26:37 +09:00
CONORY
8dd780a2d0 Merge pull request #227 from conory/develop
#223 zdate()에서 잘못된 배열처리로 인한 오류 수정
2016-02-07 18:43:44 +09:00
conory
d5260bab0d zdate()에서 잘못된 배열처리로 인한 오류 수정 2016-02-07 18:30:53 +09:00
BJRambo
9d3622dcde Merge pull request #225 from SoneYours/pr/fix-bug
stdClass초기화 문제점 개선 by ModuleModel
2016-02-07 17:23:55 +09:00
qw5414
ebcd846826 stdClass초기화 문제점 개선 by ModuleModel 2016-02-07 17:18:54 +09:00
Kijin Sung
2a0396f230 Disable install button when installation is already in progress 2016-02-07 10:29:25 +09:00
Kijin Sung
5a7906252e Do not install if tables already exist 2016-02-07 10:21:40 +09:00
Kijin Sung
0e25456770 Fix failure to display editor skin list 2016-02-06 22:41:55 +09:00
Kijin Sung
78cb8aea17 Merge branch 'develop' into pr/new-config-format 2016-02-06 21:12:10 +09:00
Kijin Sung
93ef1b295f Fix #219 error while loading menu type 2016-02-06 21:05:12 +09:00
MinSoo Kim
184cbf704b Merge pull request #218 from misol/pr/layout-colorpicker
Spectrum 컬러피커 추가 등
2016-02-06 19:11:11 +09:00
MinSoo Kim
f9987347a5 class 명을 기존 jPicker 와 달리 써서 충돌 회피
혹시 한 페이지에 함께 불러오더라도 충돌을 회피함.
2016-02-06 18:46:02 +09:00
MinSoo Kim
3288d504d2 Spectrum 컬러피커 추가 등
- MIT 라이선스의 Spectrum 컬러피커 추가. (기존 jPicker를 대체 - 파일은 그대로 두어서 의존성 문제 회피)
- 색상 선택하는 부분을 전반적으로 다듬음
2016-02-06 17:53:53 +09:00
Kijin Sung
cb6ae04dfd Merge pull request #217 from kijin/pr/filebox-allow-all-extensions
#177 파일박스의 확장자 제한 및 변수값 길이 제한 해제
2016-02-06 15:22:45 +09:00
Kijin Sung
f040c767e3 Merge pull request #216 from kijin/pr/numeric-array-json-encoding
JSON 결과 반환시 산술 배열의 인코딩 호환성 개선
2016-02-06 15:15:37 +09:00
Kijin Sung
bb814dbae8 Allow all extensions and longer comments in filebox 2016-02-06 15:15:18 +09:00
Kijin Sung
e2199f19ec Apply numeric array conversion to every JSON request as well 2016-02-06 15:02:49 +09:00
Kijin Sung
fed4f950bf Fix encoding of numeric arrays in XMLRPC->JSON conversion 2016-02-06 14:57:16 +09:00
MinSoo Kim
4698bcac3e Merge remote-tracking branch 'refs/remotes/rhymix/develop' into develop 2016-02-06 13:56:29 +09:00
Kijin Sung
3c9429896a Merge branch 'develop' into pr/new-config-format 2016-02-06 12:53:53 +09:00
Kijin Sung
1eced59239 Only re-create old config file at install time 2016-02-06 12:53:48 +09:00
Kijin Sung
ede85adf24 Automatically create old config file if it does not exist 2016-02-06 12:49:46 +09:00
Kijin Sung
3b641c1774 Do not leave out any custom configuration 2016-02-06 12:41:12 +09:00