Commit graph

175 commits

Author SHA1 Message Date
bnu
59ce2d5fb2 MINIFY 2015-01-05 14:05:08 +09:00
bnu
4506ea440e Merge branch 'release/1.7.8' into develop
Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
2014-12-09 15:13:08 +09:00
bnu
dbf96c8449 MINIFY 2014-12-09 14:24:56 +09:00
bnu
809dc1001c fix #1080 swfuploader에서 cookie를 읽을 수 없을 때 오류 고침 2014-12-09 00:38:02 +09:00
bnu
5c4b313eeb Merge branch 'master' into develop
Conflicts:
	common/js/common.js
	common/js/xe.js
	common/js/xe.min.js
	modules/editor/skins/xpresseditor/js/xpresseditor.min.js
2014-09-17 14:27:29 +09:00
bnu
9063a8efde minify 2014-09-15 15:45:08 +09:00
lansi951
727682fdde replace andSelf() 2014-09-11 16:09:08 +09:00
bnu
cc84f35c2e #952 관련 swfuploader가 session id의 변경을 반영할 수 있도록 개선 2014-09-04 15:09:20 +09:00
lansi951
e36636dd94 replace andSelf() 2014-08-26 16:41:39 +09:00
akasima
60c35b0a60 #824 add request parameter when popup component 2014-08-04 15:21:00 +09:00
bnu
e3af3a1f38 MINIFY 2014-05-08 12:04:22 +09:00
LI-NA
873a8dd024 이미지 파일 삽입시 빈 줄 추가
<p><br /></p>를 이미지 삽입 시 <img /> 다음 줄에 추가.
(사람마다 다르긴 하겠지만, 주요 포털들의 에디터 및 수많은 경우에 이미지 다음에 빈 줄을 삽입하므로, XE에도 적용되면 어떨가 해서 수정했습니다.)
2014-05-01 14:49:26 +09:00
bnu
0fb9877d01 MINIFY 2014-01-25 17:35:17 +09:00
bnu
c503c57477 #358 editor js minify 2014-01-22 13:54:05 +09:00
bnu
6c5e8fadd0 NOISSUE editor 구성파일 minify 2014-01-21 19:50:39 +09:00
bnu
d330de47df minify js, css 2013-11-23 21:45:02 +09:00
bnu
c7a8468406 minify 갱신. 2013-11-16 22:41:17 +09:00
ngleader
dbc18a4f99 change author
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13180 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-07 02:42:42 +00:00
misol
f70ce644ce Close Connection when there is no connection value.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-09-25 15:29:32 +00:00
flyskyko
0f04bd3f92 merge changes of luminous to maserati (~r12676)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12680 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-04 08:09:07 +00:00
chschy
96c66ef733 issue 2704, Script for error in editor module is wrong
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12285 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-22 08:10:32 +00:00
flyskyko
735c2fa848 UI refactoring communication module
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11983 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-31 05:50:49 +00:00
ovclas
f58c2aad98 merge from maserati (r11600, r11651)
except member_config.html

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11734 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-16 07:14:05 +00:00
misol
48a70b6b47 Issue 1228 , If SSL setting is 'always', set upload_url as request_uri (maybe HTTPS).
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11651 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-10 03:07:28 +00:00
chschy
729fd12891 Issue 2455:[Admin UI Refactoring] Content >WYSIWYG Editor
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11608 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-08 05:18:54 +00:00
flyskyko
bcd610fd9f rollback r11012
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11223 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-13 02:49:17 +00:00
ChanMyeong
b041550c53 issue 2033 fixed. HTML DTD choosing option is removed. Support only HTML5.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11012 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-09 07:36:25 +00:00
flyskyko
894e75d24c rollback r10475, r10476, r10477, r10501, r10502, r10503, r10506
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10514 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-04-02 08:41:15 +00:00
misol
63b87ce1f0 Converting four spaces indent to tab indent at editor template javascripts. According to http://code.google.com/p/xe-core/wiki/PHPCodingConvension#Code_Indenting
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10475 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-26 12:38:29 +00:00
flyskyko
5410dc9e92 issue 1613, fixed a bug, replace fileupload button to swfupload button wrong position
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10405 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-09 06:33:36 +00:00
devjin
1ec19967c8 issue 1605 fixed editor colorset list.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10338 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-06 07:18:14 +00:00
ngleader
37805e4dbb Issue 1586 fixed a bug of adding editor_component attribute automatically after editing on editor
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10286 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-02 07:03:33 +00:00
taggon
540cd6fd37 issue 978: Fixed a bug for resizing an image component
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9948 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-12-13 09:38:30 +00:00
ucorina
22e2949578 Fixed editor - min js not found.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9765 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-10-26 13:00:33 +00:00
taggon
9a753256cf issue 660: Fixed a bug that the flash uploder loads index page
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9750 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-10-26 02:38:40 +00:00
taggon
c1f1dae31c issue 352 : Fixed a wrong url bug for inserted file link
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9640 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-10-13 08:43:25 +00:00
taggon
0c970b4643 issue 93: A button for attaching files is malfunction
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9637 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-10-13 08:04:33 +00:00
taggon
cb605c4ac6 Modify upload script
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9313 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-09-23 09:11:49 +00:00
ChanMyeong
bd7b16fbca Layout Skin, Login Widget ... etc.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9226 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-09-20 07:01:46 +00:00
chschy
abe7b76c98 Add admin editor page (not complated lang file)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9084 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-09-07 08:45:00 +00:00
taggon
8064d65e67 issue 55 : Refactoring flash uploader script
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8528 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-06-21 14:06:17 +00:00
taggon
620b03d184 set svn property - svn:eol-style LF
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8253 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-04-01 06:51:30 +00:00
taggon
dc275813ef #19348216 에디터가 정상 동작하지 않는 버그 수정
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7991 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-12-23 02:13:57 +00:00
taggon
922f4363ca git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7919 201d5d3c-b55e-5fd7-737f-ddc643e51545 2010-11-26 07:26:11 +00:00
taggon
37d945e64f 자동 저장시 콜백 기능 추가
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7888 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-11-24 12:54:59 +00:00
taggon
34b254cb1a 1. XEED와의 호환성을 위해 Fake Interface 지원 추가
2. 자동 저장 후 콜백함수를 호출하도록 수정


git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7884 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-11-24 08:40:47 +00:00
taggon
3c18e97d1d 레거시 코드를 jQuery로 변환
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7858 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-11-18 10:18:29 +00:00
ChanMyeong
8f385a592b Author name update.
NHN
developers@xpressengine.com
http://xpressengine.com/

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7676 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-09-06 06:35:20 +00:00
bnu
40eb9c776e 실수;
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7453 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-05-13 00:34:42 +00:00
bnu
74b787ec07 미디어 썸네일
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7448 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-05-12 05:40:33 +00:00