Commit graph

885 commits

Author SHA1 Message Date
chschy
e8dc9e135f Issue 2383:Admin UI Refactoring - Advanced - Modules
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11616 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-08 07:04:59 +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
51bb8d1985 merger from branch luminous (~r11576)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-04 05:04:23 +00:00
flyskyko
9f5e25a15e merge from branch 1.5.3.2 (~r11282)
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-19 07:56:40 +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
devjin
42eb19ae10 merge from 1.5.3.2(r11162 ~ r11201)
and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-11 02:52:49 +00:00
nagoon97
815e6b5bef Issue 2314: Image rendering problem in IE8 when there's a delay during the loading is fixed.
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11144 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-03 10:13:55 +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
ovclas
8d0778b601 issue 2311 copy additional setting when module is copied.
And skin vars also.


git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11116 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-29 09:58:53 +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
devjin
5ce19ccbcb issue 2226 modified a error that the image not show in list gallery.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11009 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-09 04:40:53 +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
ovclas
011120e5e0 issue 2112 improve setRedirectUrl method
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10828 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-04 06:00:47 +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
ovclas
f7330acf02 reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 06:27:55 +00:00
ovclas
3afad81016 reverse merge rollback
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10714 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 02:38:33 +00:00
ovclas
b52d9f1129 reverse merge from 1.6.0 (r10668)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10683 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-16 07:15:02 +00:00
ChanMyeong
c2645caf8a issue 1849 fix. Thanks to vn21.net.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10598 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-04-23 09:21:53 +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
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
62bb2eaf2a added language code
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10440 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-16 05:00:07 +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
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
chschy
3a57aab83e issue 1309 fixed bug in image gallery with IE8.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10357 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-07 05:47:58 +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
ovclas
edde04ca5f issue 711 show movie in mobile enviroment
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10339 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-06 07:27:12 +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
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
5ef08c16ec issue 69 fixed. Thanks to chojunsik.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10301 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-02 15:47:49 +00:00
ChanMyeong
8f30f855d5 HTML/CSS code cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10300 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-03-02 15:23:12 +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
ngleader
bf295c4d07 issue 775 modifed proc page of editor component config
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10264 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-02-29 04:56:54 +00:00
devjin
4ed8173b3f issue 1036 fixed image_link editor component (image align)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10242 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-02-28 07:58:42 +00:00
ChanMyeong
1995b27848 issue 1187 fixed. .xe_content { word-break:break-all } Thanks to sannedul.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10234 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-02-28 05:57:40 +00:00
ChanMyeong
875bad8da1 issue 998 review. CSS format cleaning.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10176 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-02-22 10:04:23 +00:00
ovclas
1311154be8 issue 1368 should not overwrite editor_sequence
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10174 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-02-22 09:08:28 +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