Skip to content

Commit 2262efa

Browse files
author
bnu
committed
Merge branch 'release/1.11.6'
2 parents b119a5f + 1e002a3 commit 2262efa

File tree

474 files changed

+5837
-5762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

474 files changed

+5837
-5762
lines changed

‎COPYRIGHT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Copyright (C) NAVER <http://www.navercorp.com>
1+
Copyright (C) XEHub <https://www.xehub.io>

‎Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = function(grunt) {
22
"use strict";
33

4-
var banner = '/*! Copyright (C) NAVER <http://www.navercorp.com> */\n';
4+
var banner = '/*! Copyright (C) XEHub <https://www.xehub.io> */\n';
55
var banner_xe_js = banner + '/**!\n * @concat modernizr.js + common.js + js_app.js + xml2json.js + xml_handler.js + xml_js_filter.js\n * @brief XE Common JavaScript\n **/\n';
66

77
grunt.file.defaultEncoding = 'utf8';

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) NAVER <http://www.navercorp.com>
1+
Copyright (C) XEHub <https://www.xehub.io>
22

33
XE is an opensource and being developed in the opensource project.
44
For more information, please see the link below.

‎README.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,18 @@ XpressEngine은 여러분들의 개발 참여를 기다립니다.
2727
* MYSQL version 4.1 or greater (But recommend MYSQL >= 5.x) , MS-SQL, CUBRID
2828
* XML Library
2929
* GD Library
30+
* Fileinfo Extension
3031
* ICONV
3132
* session.auto_start = Off (php.ini)
3233

33-
## Maintainers
34-
@akasima @bnu @jhyeon1010 @khongchi @findstar @ngleader
35-
3634
## Contributors
37-
http://www.xpressengine.com/contributors
35+
https://www.xpressengine.com/contributors
3836

3937
## Support
40-
* Official site (Korean) : http://www.xpressengine.com/
38+
* Official site (Korean) : https://www.xpressengine.com
4139

4240
## License
43-
Copyright 2014 NAVER Corp. <http://www.navercorp.com>
41+
Copyright 2014 XEHub. <https://www.xehub.io>
4442

4543
This program is free software; you can redistribute it and/or
4644
modify it under the terms of the GNU Lesser General Public

‎addons/adminlogging/adminlogging.addon.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
2-
/* Copyright (C) NAVER <http://www.navercorp.com> */
2+
/* Copyright (C) XEHub <https://www.xehub.io> */
33

44
if(!defined('__XE__'))
55
exit();
66

77
/**
88
* @file adminlogging.addon.php
9-
* @author NAVER (developers@xpressengine.com)
9+
* @author XEHub (developers@xpressengine.com)
1010
* @brief admin log
1111
*/
1212
$logged_info = Context::get('logged_info');

‎addons/adminlogging/conf/info.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<version>1.7</version>
1717
<date>2013-11-27</date>
1818

19-
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
20-
<name xml:lang="ko">NAVER</name>
21-
<name xml:lang="jp">NAVER</name>
22-
<name xml:lang="en">NAVER</name>
23-
<name xml:lang="vi">NAVER</name>
24-
<name xml:lang="zh-CN">NAVER</name>
25-
<name xml:lang="es">NAVER</name>
26-
<name xml:lang="ru">NAVER</name>
27-
<name xml:lang="ge">NAVER</name>
28-
<name xml:lang="zh-TW">NAVER</name>
19+
<author email_address="developers@xpressengine.com" link="https://www.xehub.io">
20+
<name xml:lang="ko">XEHub</name>
21+
<name xml:lang="jp">XEHub</name>
22+
<name xml:lang="en">XEHub</name>
23+
<name xml:lang="vi">XEHub</name>
24+
<name xml:lang="zh-CN">XEHub</name>
25+
<name xml:lang="es">XEHub</name>
26+
<name xml:lang="ru">XEHub</name>
27+
<name xml:lang="ge">XEHub</name>
28+
<name xml:lang="zh-TW">XEHub</name>
2929
</author>
3030
</addon>

‎addons/autolink/autolink.addon.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
2-
/* Copyright (C) NAVER <http://www.navercorp.com> */
2+
/* Copyright (C) XEHub <https://www.xehub.io> */
33

44
if(!defined('__XE__'))
55
exit();
66

77
/**
88
* @file autolink.addon.php
9-
* @author NAVER (developers@xpressengine.com)
9+
* @author XEHub (developers@xpressengine.com)
1010
* @brief Automatic link add-on
1111
*/
1212
if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")

‎addons/autolink/autolink.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @file autolink.js
33
* @brief javascript code for autolink addon
4-
* @author NAVER (developers@xpressengine.com)
4+
* @author XEHub (developers@xpressengine.com)
55
*/
66
(function($){
77
var protocol_re = '(https?|ftp|news|telnet|irc|mms)://';
@@ -77,4 +77,4 @@
7777
});
7878

7979
xe.registerPlugin(new AutoLink());
80-
})(jQuery);
80+
})(jQuery);

‎addons/autolink/autolink.spec.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
},
6060
"#test9 - don't include parenthesis" : function() {
6161
value_of( $('#test9 a').length ).should_be(1);
62-
value_of( $('#test9 a').attr('href') ).should_be('http://www.naver.com');
62+
value_of( $('#test9 a').attr('href') ).should_be('http://xpressengine.com');
6363
},
6464
"#test10 - include tild" : function() {
6565
value_of( $('#test10 a').length ).should_be(1);
@@ -105,8 +105,8 @@
105105
</div>
106106
<div id="test7">http://mygony.com</div>
107107
<div id="test8">Go to http://mygony.com</div>
108-
<div id="test9">Naver(http://www.naver.com)</div>
108+
<div id="test9">XEHub(http://xpressengine.com)</div>
109109
<div id="test10">User homepage : http://www.xpressengine.com:8000/~user/?mid=def should be a link.</div>
110110
</div>
111111
</body>
112-
</html>
112+
</html>

‎addons/autolink/conf/info.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
<version>1.7</version>
4040
<date>2013-11-27</date>
4141

42-
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
43-
<name xml:lang="ko">NAVER</name>
44-
<name xml:lang="jp">NAVER</name>
45-
<name xml:lang="en">NAVER</name>
46-
<name xml:lang="vi">NAVER</name>
47-
<name xml:lang="zh-CN">NAVER</name>
48-
<name xml:lang="es">NAVER</name>
49-
<name xml:lang="ru">NAVER</name>
50-
<name xml:lang="ge">NAVER</name>
51-
<name xml:lang="zh-TW">NAVER</name>
42+
<author email_address="developers@xpressengine.com" link="https://www.xehub.io">
43+
<name xml:lang="ko">XEHub</name>
44+
<name xml:lang="jp">XEHub</name>
45+
<name xml:lang="en">XEHub</name>
46+
<name xml:lang="vi">XEHub</name>
47+
<name xml:lang="zh-CN">XEHub</name>
48+
<name xml:lang="es">XEHub</name>
49+
<name xml:lang="ru">XEHub</name>
50+
<name xml:lang="ge">XEHub</name>
51+
<name xml:lang="zh-TW">XEHub</name>
5252
</author>
5353
</addon>

‎addons/captcha/captcha.addon.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
2-
/* Copyright (C) NAVER <http://www.navercorp.com> */
2+
/* Copyright (C) XEHub <https://www.xehub.io> */
33

44
if(!defined("__XE__")) exit();
55

66
/**
77
* @file captcha.addon.php
8-
* @author NAVER (developers@xpressengine.com)
8+
* @author XEHub (developers@xpressengine.com)
99
* @brief Captcha for a particular action
1010
* English alphabets and voice verification added
1111
* */

‎addons/captcha/captcha.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ var calledArgs = null;
159159
var $div = $('<div style="z-index:1000;position:absolute; width:310px;' + top_left + ' background:#fff; border:3px solid #ccc;">'+
160160
'<form method="post" action="">'+
161161
'<div style="position:relative; margin:25px 20px 15px 20px">'+
162-
'<img src="about:blank" id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block; width:240px; height:50px; border:1px solid #b0b0b0" />'+
162+
'<img id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block; width:240px; height:50px; border:1px solid #b0b0b0" />'+
163163
'<button type="button" class="reload" title="" style="position:absolute; top:0; left:245px; width:25px; height:25px; padding:0; overflow:visible; border:1px solid #575757; background:#747474 url('+request_uri + 'addons/captcha/img/icon.gif) no-repeat center 5px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button>'+
164164
'<button type="button" class="play" title="" style="position:absolute; top:27px; left:245px; width:25px; height:25px; padding:0; overflow:visible; border:1px solid #575757; background:#747474 url('+request_uri + 'addons/captcha/img/icon.gif) no-repeat center -20px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button>'+
165165
'</div>'+

0 commit comments

Comments
 (0)