Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

动态添加uedit的时候，第一次可以正常显示编辑框，之后每次都没有显示 #3220

Open
wants to merge 1,036 commits into
base: dev-1.3.6
Choose a base branch
from
Open

动态添加uedit的时候，第一次可以正常显示编辑框，之后每次都没有显示 #3220

wants to merge 1,036 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jun 5, 2014

  1. 成功替换图片后没有触发contentchange

    @campaign
    campaign committed Jun 5, 2014
    Configuration menu
    Copy the full SHA
    2691799 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. 修复LIST中处理li时因缺少选择器而造成全局范围影响的问题

    @csbde
    csbde committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    a7d8974 View commit details
    Browse the repository at this point in the history

  2. [test]

    @worry127722
    worry127722 committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    9901675 View commit details
    Browse the repository at this point in the history

  3. 修复li｛clear:both}前边没有加入选择器，可能会影响全局的css问题

    @campaign
    campaign committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    16281ab View commit details
    Browse the repository at this point in the history

  4. 1.5.0

    @campaign
    campaign committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    55cf0d1 View commit details
    Browse the repository at this point in the history

  5. [test]

    @worry127722
    worry127722 committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    79130b3 View commit details
    Browse the repository at this point in the history

  6. 修复自动保存配置项不起作用问题

    @carsonxu
    carsonxu committed Jun 10, 2014
    2 Configuration menu
    Copy the full SHA
    af08cc9 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/dev-1.4.3' into dev-1.4.3

    @carsonxu
    carsonxu committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    0ffa364 View commit details
    Browse the repository at this point in the history

  8. 添加空串判断

    @techird
    techird committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    858fbb0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #45 from fex-team/dev-1.4.3 

    q
    @worry127722
    worry127722 committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    b640f91 View commit details
    Browse the repository at this point in the history

  10. 添加自动上传的配置项

    @carsonxu
    carsonxu committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    c8e786d View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dev-1.4.3' of https://github.com/worry127722/ueditor in… 

    …to dev-1.4.3
    @worry127722
    worry127722 committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    801302f View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/dev-1.4.4' into dev-1.4.4

    @carsonxu
    carsonxu committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    7dc5c06 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #400 from worry127722/dev-1.4.3 

    Dev 1.4.3
    @yancend
    yancend committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    df18b79 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2014

  1. 明确两个配置节

    techird committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    4b0e19e View commit details
    Browse the repository at this point in the history

  2. 更新权限说明

    techird committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    dd9b517 View commit details
    Browse the repository at this point in the history

  3. Update

    techird committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    1289555 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    techird committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    db4524b View commit details
    Browse the repository at this point in the history

  5. Update README.md

    techird committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    b529d86 View commit details
    Browse the repository at this point in the history

  6. 让表格背景透明

    @carsonxu
    carsonxu committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    350a97d View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/dev-1.4.4' into dev-1.4.4

    @carsonxu
    carsonxu committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    595eccf View commit details
    Browse the repository at this point in the history

  8. 修改自动上传插件

    @carsonxu
    carsonxu committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    cfb8978 View commit details
    Browse the repository at this point in the history

  9. 修改自动上传插件

    @carsonxu
    carsonxu committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    d760421 View commit details
    Browse the repository at this point in the history

  10. 修改自动上传插件

    @carsonxu
    carsonxu committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    6392f3b View commit details
    Browse the repository at this point in the history

  11. 插入图片不提供title属性

    @carsonxu
    carsonxu committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    b5d66c2 View commit details
    Browse the repository at this point in the history

  12. 修复ff下拖文件变成base64的问题

    @carsonxu
    carsonxu committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    048f2cc View commit details
    Browse the repository at this point in the history

  13. ad

    @worry127722
    worry127722 committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    29f2ade View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2014

  1. 6

    @worry127722
    worry127722 committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    c06a77a View commit details
    Browse the repository at this point in the history

  2. 1

    @worry127722
    worry127722 committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    40deaf1 View commit details
    Browse the repository at this point in the history

  3. 1

    @worry127722
    worry127722 committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    971412f View commit details
    Browse the repository at this point in the history

  4. 3

    @worry127722
    worry127722 committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    2c74122 View commit details
    Browse the repository at this point in the history

  5. s

    @worry127722
    worry127722 committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    4268b85 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2014

  1. q

    @worry127722
    worry127722 committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    9a5b95a View commit details
    Browse the repository at this point in the history

  2. fix check or create path

    @techird
    techird committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    464bfba View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2014

  1. Merge remote-tracking branch 'remotes/origin/dev-1.4.4' into dev-1.5.0

    @campaign
    campaign committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    89fd17f View commit details
    Browse the repository at this point in the history

  2. [test]

    @yancend
    yancend committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    ba7c15e View commit details
    Browse the repository at this point in the history

  3. [test]

    @yancend
    yancend committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    f9f6bc0 View commit details
    Browse the repository at this point in the history

  4. [test]迁移用例 到https://github.com/yancend/testDesign/

    @yancend
    yancend committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    45f0ab1 View commit details
    Browse the repository at this point in the history

  5. 修复ff下拖文件变成base64的问题

    @carsonxu
    carsonxu committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    0b4882c View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/dev-1.5.0' into dev-1.5.0

    @carsonxu
    carsonxu committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    38f55e6 View commit details
    Browse the repository at this point in the history

  7. 设置 enableAutoSave 配置项

    @carsonxu
    carsonxu committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    95b3363 View commit details
    Browse the repository at this point in the history

  8. 设置 enableMessageShow 配置项

    @carsonxu
    carsonxu committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    156e818 View commit details
    Browse the repository at this point in the history

  9. 添加 beforeinsertfile 和 afterinsertfile 事件

    @carsonxu
    carsonxu committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    77f0f23 View commit details
    Browse the repository at this point in the history

  10. 添加 beforeinsertvideo 和 afterinsertvideo 事件

    @carsonxu
    carsonxu committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    cb19659 View commit details
    Browse the repository at this point in the history

  11. 修改toolbar按钮

    @carsonxu
    carsonxu committed Jun 18, 2014
    Configuration menu
    Copy the full SHA
    23724e3 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2014

  1. 修改grunt

    @carsonxu
    carsonxu committed Jun 20, 2014
    Configuration menu
    Copy the full SHA
    4bd08a5 View commit details
    Browse the repository at this point in the history

  2. 修改grunt

    @carsonxu
    carsonxu committed Jun 20, 2014
    Configuration menu
    Copy the full SHA
    d679feb View commit details
    Browse the repository at this point in the history

  3. 修改config

    @carsonxu
    carsonxu committed Jun 20, 2014
    Configuration menu
    Copy the full SHA
    ab397c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2014

  1. 修改config

    @carsonxu
    carsonxu committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    a76e96b View commit details
    Browse the repository at this point in the history

  2. 修改config

    @carsonxu
    carsonxu committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    de797fc View commit details
    Browse the repository at this point in the history

  3. 修改config

    @carsonxu
    carsonxu committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    1e509e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2014

  1. 修改远程抓取的代码

    @carsonxu
    carsonxu committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    b336d73 View commit details
    Browse the repository at this point in the history

  2. 修改config

    @carsonxu
    carsonxu committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    c0597ef View commit details
    Browse the repository at this point in the history

  3. 修改上传

    @carsonxu
    carsonxu committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    f00f980 View commit details
    Browse the repository at this point in the history

  4. 修改上传

    @carsonxu
    carsonxu committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    a094fbd View commit details
    Browse the repository at this point in the history

  5. Update addCustomizeButton.js 

    增加一个自定义引用样式例子，原例子里面写的状态反射似乎对新增的按钮似乎无效。
而我写这个自定义引用也只是借用了`blockquote`的状态值。
    @zhoumengkang
    zhoumengkang committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    1c3cbc6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #810 from zhoumengkang/patch-1 

    Update addCustomizeButton.js
    @carsonxu
    carsonxu committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    60a2fc3 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2014

  1. BUG修复 td包含p属性时未清理p的width和height值。会造成表格与后台编辑宽度不一致。

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    a747686 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev-1.5.0' of git://github.com/fex-team/ueditor into fe… 

    …x-team-dev-1.5.0

Conflicts:
	_parse/list.js
    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    9bb2650 View commit details
    Browse the repository at this point in the history

  3. Update list.js

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    dffbd6a View commit details
    Browse the repository at this point in the history

  4. Update list.js

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    349680d View commit details
    Browse the repository at this point in the history

  5. Update list.js

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    44d8c99 View commit details
    Browse the repository at this point in the history

  6. Update list.js

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    df62256 View commit details
    Browse the repository at this point in the history

  7. Update list.js

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    91719bb View commit details
    Browse the repository at this point in the history

  8. Update list.js

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    d46ed0f View commit details
    Browse the repository at this point in the history

  9. 合并官方的list

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    1694f95 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev-1.4.3' of https://github.com/csbde/ueditor into dev… 

    …-1.4.3
    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    014ca42 View commit details
    Browse the repository at this point in the history

  11. 合并官方的list

    @csbde
    csbde committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    400dd4f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2014

  1. 插入img删除title属性

    @carsonxu
    carsonxu committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    e137374 View commit details
    Browse the repository at this point in the history

  2. 插入img删除title属性

    @carsonxu
    carsonxu committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    932c646 View commit details
    Browse the repository at this point in the history

  3. 修改popup样式

    @carsonxu
    carsonxu committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    acae1c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2014

  1. 产生数据中的color默认都格式化为#16进制格式

    @campaign
    campaign committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    9b6f7d6 View commit details
    Browse the repository at this point in the history

  2. 产生数据中的color默认都格式化为#16进制格式

    @campaign
    campaign committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    6b918bd View commit details
    Browse the repository at this point in the history

  3. 产生数据中的color默认都格式化为#16进制格式

    @campaign
    campaign committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    da8a116 View commit details
    Browse the repository at this point in the history

  4. 产生数据中的color默认都格式化为#16进制格式

    @campaign
    campaign committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    0c07f6e View commit details
    Browse the repository at this point in the history

  5. 产生数据中的color默认都格式化为#16进制格式

    @campaign
    campaign committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    2604edc View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2014

  1. 过滤掉word冗余标签

    @campaign
    campaign committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    48da535 View commit details
    Browse the repository at this point in the history

  2. 过滤掉word冗余标签

    @campaign
    campaign committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    9902363 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2014

  1. Merge pull request #826 from csbde/dev-1.4.3 

    BUG修复 td包含p属性时未清理p的width和height值。会造成表格与后台编辑宽度不一致。
    @carsonxu
    carsonxu committed Jul 6, 2014
    Configuration menu
    Copy the full SHA
    7328e15 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2014

  1. 添加了mark标签在dtd中

    @campaign
    campaign committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    e4d12e6 View commit details
    Browse the repository at this point in the history

  2. 扩展的UI组件需要配置toolbars参数才可显示

    @campaign
    campaign committed Jul 18, 2014
    1 Configuration menu
    Copy the full SHA
    69f4737 View commit details
    Browse the repository at this point in the history

  3. 扩展的UI组件需要配置toolbars参数才可显示

    @campaign
    campaign committed Jul 18, 2014
    Configuration menu
    Copy the full SHA
    df841ab View commit details
    Browse the repository at this point in the history

  4. 更新

    @campaign
    campaign committed Jul 18, 2014
    1 Configuration menu
    Copy the full SHA
    33209cc View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2014

  1. 优化快捷上传，清除loader的class

    @carsonxu
    carsonxu committed Jul 19, 2014
    Configuration menu
    Copy the full SHA
    abfd64c View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2014

  1. 修正search/replace的bug

    @campaign
    campaign committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    6bb1464 View commit details
    Browse the repository at this point in the history

  2. Update changelog.md

    techird committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    1cff04b View commit details
    Browse the repository at this point in the history

  3. 添加分号

    @campaign
    campaign committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    127f53a View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/dev-1.5.0' into dev-1.5.0

    @campaign
    campaign committed Jul 23, 2014
    Configuration menu
    Copy the full SHA
    dcd825c View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2014

  1. JSP版本修复上传路径错误的bug

    @HanCong03
    HanCong03 committed Jul 24, 2014
    Configuration menu
    Copy the full SHA
    a71b84d View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2014

  1. Merge remote-tracking branch 'origin/dev-1.4.4' into dev-1.5.0 

    Conflicts:
	_test/testDesign/Manual regression cases.xmind
    @carsonxu
    carsonxu committed Jul 27, 2014
    Configuration menu
    Copy the full SHA
    3d027d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2014

  1. 修复windows平台下的路径bug

    @HanCong03
    HanCong03 committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    7ef4067 View commit details
    Browse the repository at this point in the history

  2. Fixed windows path 

    Signed-off-by: hancong03 <[email protected]>
    hancong03 committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    70105d6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev-1.5.0' of github.com:HanCong03/ueditor into dev-1.5.0

    hancong03 committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    5dce726 View commit details
    Browse the repository at this point in the history

  4. 支持 tel: mailto: 等链接，添加配置项 allowLinkProtocols

    @carsonxu
    carsonxu committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    c51f5ad View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/dev-1.5.0' into dev-1.5.0

    @carsonxu
    carsonxu committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    d4c8d80 View commit details
    Browse the repository at this point in the history

  6. 支持 tel: mailto: 等链接，添加配置项 allowLinkProtocols

    @carsonxu
    carsonxu committed Jul 28, 2014
    Configuration menu
    Copy the full SHA
    573639c View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. 修改版本号

    @campaign
    campaign committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    489a857 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2014

  1. 添加 zeroclipboardready 事件

    @carsonxu
    carsonxu committed Aug 1, 2014
    Configuration menu
    Copy the full SHA
    8c81266 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev-1.4.4' of https://github.com/fex-team/ueditor into … 

    …dev-1.5.0

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
    @carsonxu
    carsonxu committed Aug 1, 2014
    Configuration menu
    Copy the full SHA
    fc53ebd View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. 添加图片拉伸缩放的配置项

    @carsonxu
    carsonxu committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    49e38c7 View commit details
    Browse the repository at this point in the history

  2. 添加 zeroclipboardready 事件

    @carsonxu
    carsonxu committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    c9cf1f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2014

  1. 添加 zeroclipboardready 事件

    @carsonxu
    carsonxu committed Aug 7, 2014
    Configuration menu
    Copy the full SHA
    ea3fb7b View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2014

  1. fix copy plugin bug

    @carsonxu
    carsonxu committed Aug 12, 2014
    Configuration menu
    Copy the full SHA
    7f8da86 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2014

  1. 修复创建编辑器后，快速销毁编辑器后的报错

    @carsonxu
    carsonxu committed Aug 17, 2014
    Configuration menu
    Copy the full SHA
    756a52d View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2014

  1. Update README.md 

    add nodejs url
    @netpi
    netpi committed Aug 23, 2014
    Configuration menu
    Copy the full SHA
    57a7c33 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1210 from netpi/dev-1.5.0 

    增加 nodejs 支持的链接
    @carsonxu
    carsonxu committed Aug 23, 2014
    Configuration menu
    Copy the full SHA
    3263b93 View commit details
    Browse the repository at this point in the history

  3. add ueditor for nodejs

    @carsonxu
    carsonxu committed Aug 23, 2014
    Configuration menu
    Copy the full SHA
    afb28bb View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2014

  1. 修复创建编辑器后，快速销毁编辑器后的报错

    @carsonxu
    carsonxu committed Aug 25, 2014
    Configuration menu
    Copy the full SHA
    442ff41 View commit details
    Browse the repository at this point in the history

  2. 修复 serverparam 的 bug

    @carsonxu
    carsonxu committed Aug 25, 2014
    Configuration menu
    Copy the full SHA
    d5318a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2014

  1. 修复按钮样式优先级不够大的问题

    @carsonxu
    carsonxu committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    796aac7 View commit details
    Browse the repository at this point in the history

  2. 修复按钮样式优先级不够大的问题

    @carsonxu
    carsonxu committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    264455b View commit details
    Browse the repository at this point in the history

  3. 1

    @worry127722
    worry127722 committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    642a933 View commit details
    Browse the repository at this point in the history

  4. 修改测试机地址

    @worry127722
    worry127722 committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    c44b3cd View commit details
    Browse the repository at this point in the history

  5. 修改测试机ip

    @worry127722
    worry127722 committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    16cc518 View commit details
    Browse the repository at this point in the history

  6. 修改测试配置

    @worry127722
    worry127722 committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    c96bcf3 View commit details
    Browse the repository at this point in the history

  7. 修改测试配置

    @worry127722
    worry127722 committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    4587d74 View commit details
    Browse the repository at this point in the history

  8. 修改测试配置

    @worry127722
    worry127722 committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    58bc1be View commit details
    Browse the repository at this point in the history

  9. 修改配置文件

    @worry127722
    worry127722 committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    de72a83 View commit details
    Browse the repository at this point in the history

  10. 恢复 _test 代码

    @carsonxu
    carsonxu committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    18601e8 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2014

  1. 修复在编辑区域打不开 chrome 控制台的问题

    @carsonxu
    carsonxu committed Aug 28, 2014
    Configuration menu
    Copy the full SHA
    7f7050f View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2014

  1. 修改文档

    @carsonxu
    carsonxu committed Sep 1, 2014
    Configuration menu
    Copy the full SHA
    76adeae View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2014

  1. 修改测试文件

    @worry127722
    worry127722 committed Sep 19, 2014
    Configuration menu
    Copy the full SHA
    39100a1 View commit details
    Browse the repository at this point in the history

  2. 修改测试配置

    @worry127722
    worry127722 committed Sep 19, 2014
    Configuration menu
    Copy the full SHA
    ff15810 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. 修复paragraph命令

    @campaign
    campaign committed Sep 24, 2014
    1 Configuration menu
    Copy the full SHA
    b41f1ce View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2014

  1. 添加Content-Type判断

    @carsonxu
    carsonxu committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    759bc65 View commit details
    Browse the repository at this point in the history

  2. 修复word图片上传的单位错误

    @carsonxu
    carsonxu committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    70506f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2014

  1. 去除图片搜索里面编码使用的长字符串

    @carsonxu
    carsonxu committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    7e42882 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. 修正对于大小写的问题

    @campaign
    campaign committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    7f490df View commit details
    Browse the repository at this point in the history

  2. 修改版本为1.5.0

    @campaign
    campaign committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    1f6cae4 View commit details
    Browse the repository at this point in the history

  3. 整理了代码

    @campaign
    campaign committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    67b0ae8 View commit details
    Browse the repository at this point in the history

  4. 修复对嵌套的span标签设置样式时，被嵌套的标签不能正确设置上给定的样式

    @campaign
    campaign committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    311cd80 View commit details
    Browse the repository at this point in the history

  5. 更新版本

    @campaign
    campaign committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    0700522 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2014

  1. 调试测试

    @worry127722
    worry127722 committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    a0c5f5a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev-1.5.0' of https://github.com/fex-team/ueditor into … 

    …dev-1.5.0
    @worry127722
    worry127722 committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    8c8a3f1 View commit details
    Browse the repository at this point in the history

  3. 123

    @worry127722
    worry127722 committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    07362d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2014

  1. d

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    dfcbcff View commit details
    Browse the repository at this point in the history

  2. d

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    3a72493 View commit details
    Browse the repository at this point in the history

  3. dd

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    c194227 View commit details
    Browse the repository at this point in the history

  4. dddd

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    1e3ea0c View commit details
    Browse the repository at this point in the history

  5. ddd

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    9b189e2 View commit details
    Browse the repository at this point in the history

  6. sss

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    88bf4a7 View commit details
    Browse the repository at this point in the history

  7. s

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    ef002ac View commit details
    Browse the repository at this point in the history

  8. d

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    bdb33f7 View commit details
    Browse the repository at this point in the history

  9. d

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    7be7cad View commit details
    Browse the repository at this point in the history

  10. d

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    fd89776 View commit details
    Browse the repository at this point in the history

  11. dd

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    2998fe3 View commit details
    Browse the repository at this point in the history

  12. d

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    98e0f80 View commit details
    Browse the repository at this point in the history

  13. d

    @worry127722
    worry127722 committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    70e685d View commit details
    Browse the repository at this point in the history

  14. d

    @worry127722
    worry127722 committed Nov 19, 2014
    1 Configuration menu
    Copy the full SHA
    39d0a32 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2014

  1. Update table.core.js

    @minikey
    minikey committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    6aac26d View commit details
    Browse the repository at this point in the history

  2. Update Uploader.class.php 

    更新构造函数注释
    @zhichao-poper
    zhichao-poper committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    09b5923 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2014

  1. simpleupload didn't fire *contentChange* event 

    simpleupload didn't trigger the *contentChange* event after the image upload success.
When I use ueditor with angular, I listen to the *contentChange* event to binding the data between editor and model.  When user upload an image, and then just save the model, the model only keep the placeholder image not the server response one.
    @risent
    risent committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    592e973 View commit details
    Browse the repository at this point in the history

  2. Update simpleupload.js

    @risent
    risent committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    73698a3 View commit details
    Browse the repository at this point in the history

  3. Update simpleupload.js

    @risent
    risent committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    24183e5 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2014

  1. 更新test

    @worry127722
    worry127722 committed Dec 3, 2014
    Configuration menu
    Copy the full SHA
    bbbf2c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2014

  1. Update table.core.js 

    如果插入标题行，将标题行插入到thead
    @minikey
    minikey committed Dec 11, 2014
    Configuration menu
    Copy the full SHA
    2dc81ef View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2015

  1. ###优化： 

    * 修改服务端配置文件名称为ueditor.config
* 修改了ConfigManager：服务端配置文件从classes目录读取，如果不存在则从webapp的ueditor目录读取配置，增强ueditor的安全性，防止配置文件被窥探；
* 修改BinaryUploader、Base64Uploader:允许配置存储路径，支持存储路径配置为绝对路径形式。
	具体做法：controller.jsp中，在request作用域内指定变量rootPath和对应的存储跟路径 ,ueditor会优先查找该配置，如果没有则将网站根目录作为rootPath(即原有配置)。
    @StruggleBird
    StruggleBird committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    645f397 View commit details
    Browse the repository at this point in the history

  2. ###优化： 

    * 修改服务端配置文件名称为ueditor.config
* 修改了ConfigManager：服务端配置文件从classes目录读取，如果不存在则从webapp的ueditor目录读取配置，增强ueditor的安全性，防止配置文件被窥探；
* 修改BinaryUploader、Base64Uploader:允许配置存储路径，支持存储路径配置为绝对路径形式。
	具体做法：controller.jsp中，在request作用域内指定变量rootPath和对应的存储跟路径 ,ueditor会优先查找该配置，如果没有则将网站根目录作为rootPath(即原有配置)。

Signed-off-by: StruggleBird <[email protected]>
    @StruggleBird
    StruggleBird committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    c99eabc View commit details
    Browse the repository at this point in the history

  3. ###优化： 

    * 修改服务端配置文件名称为ueditor.config
* 修改了ConfigManager：服务端配置文件从classes目录读取，如果不存在则从webapp的ueditor目录读取配置，增强ueditor的安全性，防止配置文件被窥探；
* 修改BinaryUploader、Base64Uploader:允许配置存储路径，支持存储路径配置为绝对路径形式。
	具体做法：controller.jsp中，在request作用域内指定变量rootPath和对应的存储跟路径 ,ueditor会优先查找该配置，如果没有则将网站根目录作为rootPath(即原有配置)。

Signed-off-by: StruggleBird <[email protected]>
    @StruggleBird
    StruggleBird committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    b873773 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev-1.5.0' of https://github.com/StruggleBird/ueditor i… 

    …nto dev-1.5.0

Conflicts:
	jsp/src/com/baidu/ueditor/upload/Base64Uploader.java
	jsp/src/com/baidu/ueditor/upload/BinaryUploader.java
	jsp/src/com/baidu/ueditor/upload/StorageManager.java
    @StruggleBird
    StruggleBird committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    dd236f0 View commit details
    Browse the repository at this point in the history

  5. Merge

    @StruggleBird
    StruggleBird committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    12b0989 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev-1.5.0' of https://github.com/StruggleBird/ueditor i… 

    …nto dev-1.5.0
    @StruggleBird
    StruggleBird committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    177c02d View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2015

  1. [test]安全修复

    @worry127722
    worry127722 committed Feb 9, 2015
    Configuration menu
    Copy the full SHA
    bae2196 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. [test]安全修复

    @worry127722
    worry127722 committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    2b9a0ae View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2015

  1. Update dialog.js 

    fix an issue that when use custom theme, the cssRules will lost effect.
    @dail
    dail committed Feb 27, 2015
    Configuration menu
    Copy the full SHA
    34dbf89 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. 处理中文双引号不能正常转义 

    处理中文双引号转义问题，如： &ldquo;测试&rdquo;  =>  &amp;ldquo;测试&amp;rdquo;

在 unhtml 与 html 函数中添加中文双引号转义字符
    @badsummer
    badsummer committed May 28, 2015
    Configuration menu
    Copy the full SHA
    146a3b1 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2015

  1. Update Uploader.class.php 

    强迫症，错别字。
    @birdol
    birdol committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    f3bf5c4 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2015

  1. 修正项目在服务器上部署路径与线上访问路径不一致时，上传插件不能正确加载配置的问题 

    rootPath来自于application.getRealPath( "/" )（在controller.jsp中），即来自于服务器本地真实路径，而requestUri来自于request中的访问路径，当两者不一致的时候（如本地路径为localProj，而访问路径为pubProj），会因为拼接出的路经（ConfigManager.originalPath的值）不对而无法加载配置文件，因此应该只取request中的相对路径部分，拼接在本地的绝对路径后面，从而得到配置文件的绝对路径
    @zxeoc
    zxeoc committed Nov 26, 2015
    Configuration menu
    Copy the full SHA
    1bddfba View commit details
    Browse the repository at this point in the history

  2. 修正项目在服务器上部署路径与线上访问路径不一致时，上传插件不能正确加载配置的问题 

    rootPath来自于application.getRealPath( "/" )（在controller.jsp中），即来自于服务器本地真实路径，而requestUri来自于request中的访问路径，当两者不一致的时候（如本地路径为localProj，而访问路径为pubProj），会因为拼接出的路经（ConfigManager.originalPath的值）不对而无法加载配置文件，因此应该只取request中的相对路径部分，拼接在本地的绝对路径后面，从而得到配置文件的绝对路径
    @zxeoc
    zxeoc committed Nov 26, 2015
    Configuration menu
    Copy the full SHA
    17171cd View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2015

  1. A bug in plugin contextmenu 

    Set the value of enableContextMenu first, then get the value, it will
always be true.

So I add a judge to check whether users have set its value, otherwise
its default value is true.
    wuyuying01 committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    e6e09e8 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2016

  1. textarea 名称

    @eecjimmy
    eecjimmy committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    2ac5f09 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. 修改说明

    @taofish
    taofish committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    23f2712 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2016

  1. Merge pull request #2519 from taofish/dev-1.5.0 

    修改说明
    @Phinome
    Phinome committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    3d1d644 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2453 from YuyingWu/dev-1.5.0 

    A bug in plugin contextmenu
    @Phinome
    Phinome committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    92d4e02 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2417 from zxeoc/dev-1.5.0 

    修正项目在服务器上部署路径与线上访问路径不一致时，上传插件不能正确加载配置的问题
    @Phinome
    Phinome committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    d687498 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2389 from birdol/patch-1 

    Update Uploader.class.php
    @Phinome
    Phinome committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    b7aca53 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2239 from fex-team/dev-1.4.3 

    Dev 1.4.3
    @Phinome
    Phinome committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    1f82eb6 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2016

  1. Merge pull request #2503 from eecjimmy/dev-1.5.0 

    textarea 名称
    @Phinome
    Phinome committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    1d58d12 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1869 from StruggleBird/dev-1.5.0 

    针对jsp语言的配置改进
    @Phinome
    Phinome committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    735dda6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1659 from risent/patch-1 

    simpleupload didn't fire *contentChange* event
    @Phinome
    Phinome committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    44dcc0e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1657 from zhuzhichao/patch-4 

    Update Uploader.class.php 更新构造函数错误的注释
    @Phinome
    Phinome committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    36313fc View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. add plugins guide

    @Phinome
    Phinome committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    2205cd3 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. .Net版-多图上传-在线管理：修复服务器返回图片列表不能倒序Bug

    @51mono
    51mono committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    90aff8c View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2016

  1. Merge pull request #2567 from 51mono/51mono-patch-1 

    .Net版-多图上传-在线管理：修复服务器返回图片列表不能倒序Bug
    @Phinome
    Phinome committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    c7c63ae View commit details
    Browse the repository at this point in the history

  2. 更新第三方插件贡献规范

    @Phinome
    Phinome committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    022c101 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. Create ISSUE_TEMPLATE.md 

    新增提 ISSUE 规则模板
    @Phinome
    Phinome committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    1885e6b View commit details
    Browse the repository at this point in the history

  2. Update ISSUE_TEMPLATE.md 

    简化内容
    @Phinome
    Phinome committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    d5cff8b View commit details
    Browse the repository at this point in the history

  3. Update ISSUE_TEMPLATE.md 

    进一步简化内容
    @Phinome
    Phinome committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    93d1405 View commit details
    Browse the repository at this point in the history

  4. Update ISSUE_TEMPLATE.md 

    更新内容
    @Phinome
    Phinome committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    77c068f View commit details
    Browse the repository at this point in the history

  5. Update ISSUE_TEMPLATE.md 

    优化内容排版
    @Phinome
    Phinome committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    b8830b2 View commit details
    Browse the repository at this point in the history

  6. Update ISSUE_TEMPLATE.md 

    优化内容
    @Phinome
    Phinome committed Feb 18, 2016
    1 Configuration menu
    Copy the full SHA
    0df2082 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2016

  1. 更新下载 

    更新下载说明
    @Phinome
    Phinome committed Apr 5, 2016
    Configuration menu
    Copy the full SHA
    22bef96 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2016

  1. Merge pull request #1696 from minikey/patch-2 

    Update table.core.js
    @Phinome
    Phinome committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    b3d8c1c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1650 from minikey/patch-1 

    Update table.core.js
    @Phinome
    Phinome committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    8641e90 View commit details
    Browse the repository at this point in the history

  3. 更新 js 规范 

    更新贡献代码 js 规范
    @Phinome
    Phinome committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    9da60f3 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2016

  1. Merge pull request #2054 from badsummer/dev-1.5.0 

    处理中文双引号不能正常转义 _src/core/utils.js
    @Phinome
    Phinome committed Apr 23, 2016
    Configuration menu
    Copy the full SHA
    d8d20fa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1848 from dail/patch-1 

    Update dialog.js
    @Phinome
    Phinome committed Apr 23, 2016
    Configuration menu
    Copy the full SHA
    48c07a6 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2016

  1. update .file-title height for firefox 

    update .file-title height for firefox , ISSUE = 2769
    @Phinome
    Phinome committed May 11, 2016
    Configuration menu
    Copy the full SHA
    1961726 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2016

  1. 修改image.js本地图片上传 

    修改本地图片上传，当上传文件出现超出大小或格式不允许时，移除文件后文件总数及总大小出错问题。
    @sjshare
    sjshare committed May 16, 2016
    Configuration menu
    Copy the full SHA
    db69aa0 View commit details
    Browse the repository at this point in the history

  2. 修改attachment.js本地文件上传 

    修改本地文件上传，当上传文件超出大小或格式不允许时，点击移除后文件总数及总大小出错bug。
    @sjshare
    sjshare committed May 16, 2016
    Configuration menu
    Copy the full SHA
    ed5b7ef View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. 更改gruntfile和package.json中过时的配置项

    @Dafrok
    Dafrok committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    929a791 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. Merge pull request #2826 from fex-team/dev-2.0.0 

    更改gruntfile和package.json中过时的配置项
    @Dafrok
    Dafrok committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    f58254b View commit details
    Browse the repository at this point in the history

  2. 修改package.json 增加uglify的dependence

    @Dafrok
    Dafrok committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    70d1c64 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. Update Uploader.class.php 

    iconv函数无法将unicode转换为utf-8（会有警告），更换为mb_convert_encoding函数
    @tangtanglove
    tangtanglove authored Jun 20, 2016
    Configuration menu
    Copy the full SHA
    689030e View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2016

  1. Update ISSUE_TEMPLATE.md 

    增加声明
    @Phinome
    Phinome authored Jul 16, 2016
    Configuration menu
    Copy the full SHA
    a83d116 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2016

  1. add FAQ wiki

    @Phinome
    Phinome committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    6b7aaf2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2781 from sjshare/dev-1.5.0 

    修改本地文件上传bug
    @Phinome
    Phinome authored Aug 19, 2016
    Configuration menu
    Copy the full SHA
    55a47f2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2869 from tangtanglove/patch-1 

    Update Uploader.class.php
    @Phinome
    Phinome authored Aug 19, 2016
    Configuration menu
    Copy the full SHA
    75ff96c View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2016

  1. Update README.md

    @Phinome
    Phinome authored Dec 11, 2016
    Configuration menu
    Copy the full SHA
    c79d8ac View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2016

  1. Update buttonicon.css 

    修复在webpack下的bug：
Module not found: Error: Cannot resolve 'file' or 'directory' ../images/charts.png  in
    @lzxb
    lzxb authored Dec 23, 2016
    Configuration menu
    Copy the full SHA
    84d9f78 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2016

  1. Merge pull request #3201 from lzxb/dev-1.5.0 

    Update buttonicon.css
    @Phinome
    Phinome authored Dec 28, 2016
    Configuration menu
    Copy the full SHA
    caa6c01 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2017

  1. 修改htmlParser的正则表达式,增强html解析的容错能力 

    现有的htmlParser 节点正则表达式无法匹配:<div style="text-align:center;font-family:" font-size:14px;"=""><img src="http://hs-album.oss.aliyuncs.com/static/27/78/35/image/20161206/20161206174331_41105.gif" alt="" /><br /></div>
修改正则表达式:
    @houyhea
    houyhea authored Feb 9, 2017
    Configuration menu
    Copy the full SHA
    52d1fa7 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Merge pull request #3205 from houyhea/dev-1.5.0 

    修改htmlParser的正则表达式,增强html解析的容错能力
    @Phinome
    Phinome authored Feb 10, 2017
    Configuration menu
    Copy the full SHA
    fe3fc76 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2017

  1. Fixed autoheight Plugin onscroll error 

    修复 autoheight 插件在 UE 实例销毁后，因 onscroll 事件监听没有正常取消监听导致 me.window 报 undefined 错误的问题
    靳志凯 authored May 26, 2017
    Configuration menu
    Copy the full SHA
    5df3d0a View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Create image.js 

    更改图片尺寸大小bug
    @woleicom
    woleicom authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    039c5cc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3219 from woleicom/dev-1.5.0 

    Create image.js
    @Phinome
    Phinome authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    d282854 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3216 from jinzhk/patch-1 

    修复 autoheight 插件在 destroy 后 onscroll 报错的问题
    @Phinome
    Phinome authored Jun 13, 2017
    Configuration menu
    Copy the full SHA
    15c2e1f View commit details
    Browse the repository at this point in the history

  4. prettier format file

    @Phinome
    Phinome committed Jun 13, 2017
    1 Configuration menu
    Copy the full SHA
    c036aa8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. 注释掉关于表头合并的特殊处理逻辑

    dengxi committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    cb4ca97 View commit details
    Browse the repository at this point in the history

  2. update issue template

    @regrex
    regrex committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    31169ae View commit details
    Browse the repository at this point in the history

  3. update comment

    @regrex
    regrex committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    ff28212 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3221 from regrex/dev-1.5.0 

    干掉关于table表头合并逻辑的特殊处理，该逻辑会导致表头合并出错
    @Phinome
    Phinome authored Jun 14, 2017
    Configuration menu
    Copy the full SHA
    134dd80 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2017

  1. 解决执行 grunt defalut 命令时抛出错误 TypeError: Cannot read property '1' of null

    王锦辉 committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    764276c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3223 from jinhuiWong/dev-1.5.0 

    解决执行 grunt defalut 命令时抛出错误 TypeError: Cannot read property '1' of null
    @Phinome
    Phinome authored Jun 21, 2017
    Configuration menu
    Copy the full SHA
    243eb67 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2017

  1. 优化远 程抓取图片插件(catchremoteimage) 的相关代码： 

    1.支持背景图片的抓取
2.抓取图片时添加loading
3.抓取失败时显示失败的图片而不是不处理
4.事件 catchremotesuccess 添加成功抓取和抓取失败的dom列表参数
    王锦辉 committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    9089cfa View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2017

  1. Merge pull request #3224 from jinhuiWong/dev-1.5.0 

    优化远 程抓取图片插件(catchremoteimage) 的相关代码
    @Phinome
    Phinome authored Jun 26, 2017
    Configuration menu
    Copy the full SHA
    2bfbb07 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2017

  1. fix bug 

    抓取远程图片失败后 _src 应是failIMG , 不然会影响getContent()输出的值
    王锦辉 committed Jul 14, 2017
    Configuration menu
    Copy the full SHA
    985fe52 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2017

  1. Merge pull request #3228 from jinhuiWong/dev-1.5.0 

    fix bug
    @Phinome
    Phinome authored Jul 20, 2017
    Configuration menu
    Copy the full SHA
    4ca8391 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. 添加基于内容的判断方式

    @nwind
    nwind committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    3f3873b View commit details
    Browse the repository at this point in the history

  2. 添加基于内容的判断方式

    @nwind
    nwind committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    b767ad8 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2017

  1. 新增安全通告 

    新增安全通告
    @Phinome
    Phinome authored Sep 5, 2017
    Configuration menu
    Copy the full SHA
    f83e9da View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2017

  1. 修复当图片带有GET参数时，无法本地化的bug 

    例如：
http://img.xiumi.us/xmi/ua/cq5i/i/a662444d6c6b9fe35c5ca77666209612-sz_18655.png?x-oss-process=image/resize,w_640/auto-orient,1/crop,x_58,y_0,w_435,h_139
    @jianzhiyao
    jianzhiyao authored Sep 25, 2017
    Configuration menu
    Copy the full SHA
    62c9761 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. 使用PHP自带方法分析url，并拼接还原为原本的带GET请求url

    @jianzhiyao
    jianzhiyao authored Sep 26, 2017
    Configuration menu
    Copy the full SHA
    9a77b70 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. 修复调整单元格对齐方式会导致textarea元素丢失的问题 

    修复问题：在关闭xss过滤前提下，当选择多个td（td中含有textarea）并修改单元格对齐方式时，td中的textarea会被清空
    LanBin authored Dec 4, 2017
    Configuration menu
    Copy the full SHA
    c4539b9 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2018

  1. 修正大小写问题 

    小写的 timezone_set Asia/chongqing 在 linux 下有问题。
    @conwnet
    conwnet authored Jan 4, 2018
    Configuration menu
    Copy the full SHA
    6dae9c2 View commit details
    Browse the repository at this point in the history

  2. 修复编辑源码状态下，.focus()和.blur()失效的问题 

    ## 问题
编缉源码状态下，`.blur()` 方法无法使编辑器失去焦点；`.focus()` 方法不但无法使编缉器获得焦点，还会使编辑器无法接收键盘操作。

## 解决
修改 source 插件，使用与 `.getContent()` 和 `.setContent()` 相同的处理方式，在开启源码编辑模式时对编辑器的 `.focus()` 和 `.blur()` 方法进行覆盖，并在关闭源码编辑模式时还原。
    @Fenzland
    Fenzland authored Jan 4, 2018
    Configuration menu
    Copy the full SHA
    47ac58b View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Merge pull request #3238 from Fenzland/fix-focus&blur-in-source-mode 

    修复编辑源码状态下，`.focus()`和`.blur()`失效的问题
    @Phinome
    Phinome authored Jan 9, 2018
    Configuration menu
    Copy the full SHA
    708af3e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3237 from conwnet/patch-2 

    修正大小写问题
    @Phinome
    Phinome authored Jan 9, 2018
    Configuration menu
    Copy the full SHA
    5ad9667 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3234 from jianzhiyao/patch-2 

    修复当图片带有GET参数时，无法本地化的bug
    @Phinome
    Phinome authored Jan 9, 2018
    Configuration menu
    Copy the full SHA
    c6beb79 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Merge pull request #3236 from tylanbin/patch-2 

    修复调整单元格对齐方式会导致td中textarea元素丢失的问题
    @Phinome
    Phinome authored Jan 10, 2018
    Configuration menu
    Copy the full SHA
    1b63eb8 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. upgrade apache commons-fileupload jar to fixe old versions bug, causi… 

    …ng ddos
    @Phinome
    Phinome committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    217733b View commit details
    Browse the repository at this point in the history

  2. add apache common-fileupload jar pacakge security alarm

    @Phinome
    Phinome committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    089c7de View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. Update image.js 

    Make the header same with /plugins/autoupload.js
See:
/fex-team/ueditor/blob/089c7dee81cf06bf68a4ff6a362a7dcf4511d78b/_src/plugins/autoupload.js#L119
    @lujiaxing
    lujiaxing authored Jul 18, 2018
    Configuration menu
    Copy the full SHA
    80f01fd View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. Merge pull request #3247 from lujiaxing/patch-1 

    Update image.js to make image uploader send same header with drag-drop-uploading
    @Phinome
    Phinome authored Jul 19, 2018
    Configuration menu
    Copy the full SHA
    6a29341 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2018

  1. .net 后端示例代码有安全风险，暂时删除

    @nwind
    nwind committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    5bf6dbe View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2018

  1. 更新自定义插件开发相关文档说明

    @wonderzhou
    wonderzhou authored Sep 14, 2018
    Configuration menu
    Copy the full SHA
    10bf3d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2018

  1. Merge pull request #3250 from wonderzhou/dev-1.5.0 

    更新二次开发自定义插件相关文档说明
    @Phinome
    Phinome authored Oct 23, 2018
    Configuration menu
    Copy the full SHA
    d013c5a View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. 后端代码只是 demo，有太多安全漏洞，为了避免误用，将不再提供

    @nwind
    nwind committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    e13fa58 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Update README.md

    @nwind
    nwind authored Jan 6, 2023
    Configuration menu
    Copy the full SHA
    c6f029e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3260 from nwind/patch-2 

    Update README.md
    @nwind
    nwind authored Jan 6, 2023
    Configuration menu
    Copy the full SHA
    ea2585b View commit details
    Browse the repository at this point in the history