Commit graph

176 commits

Author SHA1 Message Date
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
khongchi
424edf4b96 NOISSUE 코어내 애드온,모듈,스킨,위젯 버전 1.7로 올림 2013-11-26 15:37:38 +09:00
SMaker
dfd8dc5057 관리자 페이지에서 발생하는 XpressEditor UI 버그 수정
관리자 페이지에서 XpressEditor의 select 박스 가로 폭이 비정상적으로 늘어나는 버그를 수정했습니다.

admin.css에서 min-width 값을 변경하기 때문에 가로폭이 늘어나는군요.크롬에서 디버깅해보니
min-width:auto가 무시되길래 min-wdith 속성을 width 값과 동일하게 64px로 변경했습니다.
2013-11-24 11:04:10 +09:00
bnu
75a2a95ff0 minify js, css 2013-11-24 01:52:23 +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
akasima
736f382b27 #66 install php version check
#16 install rewrite module usable check
#48 htmlspecialchars function params add
2013-11-19 13:32:39 +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
918ca5ae88 Editor file upload button style enhancement.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12753 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-15 01:42:34 +00:00
ChanMyeong
c3e997f99d Bootstrap interoperability enhancement.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12573 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-21 04:52:18 +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
4350af127d UI cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12330 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-29 09:53:24 +00:00
ChanMyeong
3f84c6be34 Editor component UI cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12008 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-31 08:41:53 +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
ChanMyeong
300ae9bf6e Issue 2274 fixed. CSS code '.xpress-editor .tool ul.type{height:21px}' was added.
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11137 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-03 05:23:21 +00:00
ChanMyeong
873ca6fc1f issue 2198 fixed. xpresseditor UI crash issue.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11045 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-20 04:15:35 +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
ChanMyeong
c704b053a1 Issue 2124 fixed. XpressEditor resize option UI issue.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10852 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-09 06:58:06 +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
ChanMyeong
1900af2a7e issue 1606 fixed. WYSIWYG Editor textarea word-break, word-wrap.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10330 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-06 02:48:10 +00:00
flyskyko
206ded7cf9 rollback r10320, r10298, r10276, r10272
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10318 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-05 09:16:55 +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
f18b7c4c0b HTML/CSS code cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10302 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-02 19:05:23 +00:00
ChanMyeong
fef0e92afd HTML/CSS code cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10298 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-02 14:49:25 +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
167c15085f issue 1350 fixed
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10163 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-02-21 08:55:14 +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
devjin
20b23b2487 issue 804 remove min file
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10131 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-02-16 09:06:54 +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