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

ueditor导入导出word #3230

Open
wants to merge 51 commits into
base: dev-2.0.0
Choose a base branch
from
Open

ueditor导入导出word #3230

wants to merge 51 commits into from

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 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. 添加基于内容的判断方式

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

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

    wuduoyi 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 后端示例代码有安全风险，暂时删除

    wuduoyi 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，有太多安全漏洞，为了避免误用，将不再提供

    wuduoyi 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

    吴多益 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
    吴多益 authored Jan 6, 2023
    Configuration menu
    Copy the full SHA
    ea2585b View commit details
    Browse the repository at this point in the history