Commit graph

432 commits

Author SHA1 Message Date
bnu
283480dbf6 Merge pull request #1074 from izuzero/develop-XMLRequest
XML Request에서 object 및 array child argument를 전송할 수 없는 문제 해결
2014-12-29 14:04:26 +09:00
bnu
10b91d8ef4 fix #1084 Modernizr 추가
- Version : 2.8.3 (Custom Build)
- Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexboxlegacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-cssclasses-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load-cssclassprefix:modernizr!
2014-12-24 13:56:12 +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
f7ae32e39b MINIFY 2014-12-08 13:36:02 +09:00
izuzero
c2511530a7 XML Request에서 object 및 array child argument를 전송할 수 없는 문제 해결 2014-12-05 16:45:39 +09:00
bnu
a7bab7c926 #1069 handlebarsjs를 JS 플러그인으로 추가
- runtime 별도 추가 함
2014-11-29 16:20:47 +09:00
bnu
d4e10dd338 Merge branch 'release/1.7.8' into develop 2014-11-24 16:30:02 +09:00
Solid0
4b56f1b777 #1012 multimedia_link XSS 취약점 2014-10-20 19:03:22 +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
1ae495c2d2 minify 2014-09-17 14:00:39 +09:00
bnu
60fa4ab4e8 #920 메뉴 항목 선택이 안 되는 문제 수정 2014-09-17 13:51:52 +09:00
bnu
9063a8efde minify 2014-09-15 15:45:08 +09:00
akasima
9bb610ff3a #908 attach ajax event to document element 2014-09-11 19:07:33 +09:00
akasima
7253faa731 #920 click event change to 'event, touchstart' for mobile popup_menu 2014-09-11 18:59:53 +09:00
akasima
ef50e140e5 #920 click event change to 'event, touchstart' for mobile popup_menu 2014-08-23 15:06:51 +09:00
akasima
71d97e631c #908 attach ajax event to document element 2014-08-13 16:52:43 +09:00
akasima
eb3da2617e #900 add error option in exec_json, exec_html 2014-08-13 11:21:03 +09:00
akasima
bfe3194af8 #826 support temporary save at page module 2014-07-31 16:15:01 +09:00
bnu
e3af3a1f38 MINIFY 2014-05-08 12:04:22 +09:00
akasima
caec71ed91 #471 xe.min.js 2014-02-13 16:38:26 +09:00
akasima
37f5b93e40 #471 checkbox 다중선택시 문제 처리 2014-02-13 11:39:51 +09:00
bnu
0fb9877d01 MINIFY 2014-01-25 17:35:17 +09:00
bnu
be78d9e349 #358 minify x.js 2014-01-22 15:33:33 +09:00
bnu
a11988e437 #358 HTML5 Shiv 업데이트. v3.7.0 2014-01-22 13:54:05 +09:00
bnu
a5a3af7462 #358 사용하지 않는 파일 제거 2014-01-22 13:54:05 +09:00
bnu
64657cd52e NOISSUE displayMultimedia()의 allowScriptAccess 속성 변경 2014-01-12 22:45:01 +09:00
bnu
711cd1ea35 Merge commit '154fc79e99' into develop
Conflicts:
	classes/security/EmbedFilter.class.php
	common/js/common.js
	common/js/xe.min.js
	config/config.inc.php
2014-01-06 11:23:59 +09:00
bnu
8191a184a8 revert r12601 2014-01-06 01:11:35 +09:00
bnu
bff1217303 NOISSUE Minify 2014-01-03 11:10:00 +09:00
bnu
68517aa681 jQuery에 종속 된 exec_json()을 global에 등록.
* window.exec_json(action, data, callback_success, callback_error)
2013-11-30 21:37:02 +09:00
bnu
2e3c0c6568 jQuery와 jQuery-Migrate 파일을 병합
* 모바일 페이지에서 두 파일을 동시에 로드하지 않을 때 문제 해결.
2013-11-30 20:02:46 +09:00
bnu
75a2a95ff0 minify js, css 2013-11-24 01:52:23 +09:00
bnu
1aa4c8e9a7 #3 jQueqy, jQuery UI 업데이트
* jQuery : v1.10.2(lt IE 9) & v2.0.3
* jQuery UI : v1.10.3
* jQuery Migrate : v1.2.1
2013-11-24 00:27:16 +09:00
bnu
c7a8468406 minify 갱신. 2013-11-16 22:41:17 +09:00
bnu
f94852935a #60 css, js 코드 정리. 2013-11-16 20:52:46 +09:00
bnu
ca8a8711ed minify common/js/*.js 2013-11-15 15:47:47 +09:00
bnu
ab021d75c7 fixed #31 r12836에서 제거한 레이어 팝업 메뉴에서 새 창으로 띄우도록 변경. 2013-11-15 11:14:00 +09:00
akasima
bce0a0b6d4 copyright add to php files
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13186 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-08 05:52:51 +00: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
ngleader
2d3f149b5a merge from 1.7.3.5(r13153:r13167)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-09-29 23:32:39 +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
7b862b97fe Anchor focus target {outline:0} removed.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12752 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-14 06:24:57 +00:00
ChanMyeong
02f56601e2 Common popup size(width) adjust. 650px -> 800px
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12740 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-13 05:12:18 +00:00
flyskyko
174255a2fb issue 2878, minify
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12628 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-31 02:28:04 +00:00
flyskyko
cc47d2b247 merge from branch luminous (version 1.5.4.2, ~r12561)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-30 05:53:14 +00:00
ChanMyeong
5f83837088 page anchor: focus moved to target area.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12601 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-29 06:07:28 +00:00
nagoon97
08920ced60 fixed typo
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12590 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-25 07:39:49 +00:00
nagoon97
08f5471854 use error code < -1000 as cusom msg
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12589 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-25 07:38:45 +00:00
nagoon97
d255f503b8 0.5 sec delay before blur layer show up -> 1.0 sec
added x_btn-primary class to the ok button on the common dialog for 'enter key' compatibility



git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12585 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-24 09:30:57 +00:00
nagoon97
71db99a4b8 Site selector added to menu selector
Graphs added to dashboard



git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12496 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-31 10:03:35 +00:00