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 |
|
akasima
|
434c2b6ce9
|
#881 text bold tag changed to '<strong>' from '<b>'
|
2014-09-01 08:03:45 +09:00 |
|
akasima
|
e2ecc73fba
|
#907 replace to addBack() because andSelf() deprecated
|
2014-08-13 16:27:13 +09:00 |
|
akasima
|
382093798e
|
#881 text bold tag changed to '<strong>' from '<b>'
|
2014-08-05 19:07:38 +09:00 |
|
bnu
|
0fb9877d01
|
MINIFY
|
2014-01-25 17:35:17 +09:00 |
|
bnu
|
ab716fc7f1
|
#359 단락에디터(dreditor) 제거
move to https://github.com/xpressengine/xe-editor-dreditor
|
2014-01-22 13:58:46 +09:00 |
|
bnu
|
0ea0e78599
|
minify
|
2013-11-24 00:38:49 +09:00 |
|
bnu
|
ff5221f0fe
|
Merge pull request #77 from largeden/develop
제목, 본문 내용 없이 첨부파일만 등록하고 다시 접근 시 자동저장 된 항목을 불러오도록 개선
|
2013-11-23 05:03:05 -08:00 |
|
bnu
|
d330de47df
|
minify js, css
|
2013-11-23 21:45:02 +09:00 |
|
largeden
|
f7fea869f5
|
[자동저장패치] 제목, 본문 내용없이 첨부파일만 등록하고 다시 접근 시 자동저장 활성화
|
2013-11-20 21:06:00 +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 |
|
ChanMyeong
|
5e4bac58ac
|
Issue 159 fixed. Editor auto resize crash button UI fix.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12756 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2013-02-15 02:28:42 +00:00 |
|
ChanMyeong
|
9eff548371
|
UI cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12570 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2013-01-17 06:42:16 +00:00 |
|
nagoon97
|
06b41e6d10
|
Editor's bug in auto expand fixed
Admin UI enhancement - full setup save
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12390 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-12-13 01:36:05 +00:00 |
|
ChanMyeong
|
009997e2a9
|
Issue 2591 fixed. Editor checkbox UI bug fix.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11764 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-10-17 10:25:27 +00:00 |
|
chschy
|
fcbf5902db
|
issue 1292: merged & compressed js files for the fix made in rev10736
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10842 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-07-06 08:36:59 +00:00 |
|
nagoon97
|
8b35151990
|
issue 1292: The bug was fixed "incorrectly" in Rev10383. And due to the fix, it was having problems with contents such as "<A><A></A><SPAN></SPAN></A>". The problematic fix is rolled-back and the issue 1292 is fixed in a different manner. (Now closing tags for unary tags such as EMBED are simply removed)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10736 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-24 10:10:09 +00:00 |
|
ChanMyeong
|
0e804c1b52
|
Issue 1730: 1.5.2 에서 업데이트 현황이 있는 경우 관리자페이지 첫화면 깨지는 버그 수정법
Issue 1731: [1.5.2] 여전히 아이패드(iPad)로 글을 쓸 때, 글이 본문 틀 밖으로 벗어납니다.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10454 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-22 08:45:02 +00:00 |
|
flyskyko
|
a0c4134699
|
issue 1185, trim iframe body after init, add new line after </p>
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10396 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-08 07:40:45 +00:00 |
|
devjin
|
970d989575
|
issue 1151 refixed.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10390 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-08 06:31:49 +00:00 |
|
flyskyko
|
9677cdf70f
|
issue 1292, minify js
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10388 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-08 05:37:30 +00:00 |
|
flyskyko
|
14c2459992
|
issue 1292 fixed close tag error.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10383 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-08 05:26:01 +00:00 |
|
flyskyko
|
d9f04b3c1b
|
Correcting differece between original and merged files
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10382 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-08 02:09:57 +00:00 |
|
ChanMyeong
|
d8ce5b5a4a
|
issue 671 fixed. Touch oriented device(ex: iPad, iPhone...) UX enhancement.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10346 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-06 10:55:17 +00:00 |
|
devjin
|
f8dd9888f6
|
issue 671 added function of editor resize by contents height
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10316 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-05 09:04:39 +00:00 |
|
ChanMyeong
|
0877657962
|
HTML/CSS code cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10296 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-02 12:31:14 +00:00 |
|
ngleader
|
9fb40fc28f
|
fixed a typo
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10287 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-03-02 07:33:21 +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 |
|
devjin
|
db91f58564
|
issue 1151 fixed
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10152 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-02-21 06:34:29 +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 |
|
ChanMyeong
|
796cdd0eaa
|
#577 textarea editor UI css width fixed. Thanks to digirave.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9910 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-12-07 09:42:02 +00:00 |
|
taggon
|
6f799d981f
|
issue 1009: Fixed a bug of 'insert special characters' feature
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9909 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-12-07 05:59:16 +00:00 |
|
taggon
|
f1fb3e7303
|
issue 1030: Add xe_textarea.min.js file
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9906 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-12-07 05:33:02 +00:00 |
|
ovclas
|
b5797f1b78
|
issue 988: close unpaired tags
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9893 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-11-30 07:23:50 +00:00 |
|
taggon
|
db0deabda0
|
issue 707: Remove codes that changes URL in hyperlinks
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9758 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-10-26 09:04:40 +00:00 |
|
taggon
|
228f07a906
|
Add minified javascripts
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9752 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-10-26 06:47:07 +00:00 |
|
taggon
|
a8886b674b
|
issue 684: Workaround for a bug that XpressEditor changes YouTube embedding script
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9745 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-10-26 01:47:06 +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
|
29bdacf29e
|
#19017489 url(PATH) 형태의 텍스트 저장시 url(PATH)undefined 와 같이 문자열이 덧붙여지는 버그 수정
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8140 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-03-07 10:06:56 +00:00 |
|
taggon
|
49185f2401
|
r8135 보완
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8136 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-03-07 07:06:07 +00:00 |
|
taggon
|
086f2ea882
|
#19603892 XpressEditor에서 찾기/바꾸기 기능 제거
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8135 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-03-07 07:03:38 +00:00 |
|
taggon
|
ca8306b18a
|
#18800257 링크 사용시 HUSKY_TMP.MARKER 와 같은 문자가 링크에 포함되던 버그 수정(for IE)
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8125 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-02-25 05:13:30 +00:00 |
|
taggon
|
c63410745a
|
#19518918 단락편집기를 XE Core로 통합
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8081 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2011-02-09 06:29:09 +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 |
|
haneul
|
e03a4d888e
|
rollback [7504]
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7509 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2010-06-14 09:24:50 +00:00 |
|
bnu
|
bf9e0b41c3
|
#18938485 - 에디터에서 XE URL이 잘못 입력되는 문제 수정
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7504 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2010-06-10 05:44:27 +00:00 |
|
taggon
|
ec733ca7d1
|
#18832818 찾기/바꾸기 창이 나타나지 않는 오류 수정 (Thanks to 파이델)
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7411 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2010-04-29 06:43:21 +00:00 |
|
haneul
|
d9e885e090
|
do not check change of content
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7389 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2010-04-23 11:49:45 +00:00 |
|