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

提交一个BUG，在谷哥下设置编辑器的高度 #3215

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

提交一个BUG，在谷哥下设置编辑器的高度 #3215

wants to merge 26 commits into from

Commits on Jul 22, 2013

  1. 用例调整

    yancend committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    74ee0e8 View commit details
    Browse the repository at this point in the history

  2. 调整用例

    yancend committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    c4d3d7e View commit details
    Browse the repository at this point in the history

  3. 调整用例

    yancend committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    0730c6c View commit details
    Browse the repository at this point in the history

  4. ie9,10range问题标注

    yancend committed Jul 22, 2013
    Configuration menu
    Copy the full SHA
    69223db View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2013

  1. [add]by Jinqn 初始化项目

    Jinqn committed Sep 25, 2013
    Configuration menu
    Copy the full SHA
    8fba9bf View commit details
    Browse the repository at this point in the history

  2. [add]by Jinqn

    Jinqn committed Sep 25, 2013
    Configuration menu
    Copy the full SHA
    7ab47ef View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2013

  1. [fix]by Jinqn 修改分页符为 <br dataType="page" />

    Jinqn committed Sep 26, 2013
    Configuration menu
    Copy the full SHA
    cdb42a6 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2013

  1. [fix]恢复到1.2.6.1

    Jinqn committed Sep 27, 2013
    Configuration menu
    Copy the full SHA
    fc33a59 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2013

  1. asp support for dev-1.2.6

    @techird
    techird committed Oct 18, 2013
    Configuration menu
    Copy the full SHA
    ab68c3a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35 from techird/dev-1.2.6 

    asp support for dev-1.2.6
    @campaign
    campaign committed Oct 18, 2013
    Configuration menu
    Copy the full SHA
    134a8a4 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2013

  1. 1.3.5 merge to master

    @campaign
    campaign committed Dec 1, 2013
    Configuration menu
    Copy the full SHA
    3c05b4c View commit details
    Browse the repository at this point in the history

  2. 1.3.5 merge to master

    @campaign
    campaign committed Dec 1, 2013
    Configuration menu
    Copy the full SHA
    9fad64a View commit details
    Browse the repository at this point in the history

  3. 更新readme的下载链接

    @campaign
    campaign committed Dec 1, 2013
    Configuration menu
    Copy the full SHA
    69b8cd9 View commit details
    Browse the repository at this point in the history

  4. 更新readme的下载链接

    @campaign
    campaign committed Dec 1, 2013
    Configuration menu
    Copy the full SHA
    7bccbfc View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2013

  1. merge dev1.3.6

    campaign authored and campaign committed Dec 25, 2013
    Configuration menu
    Copy the full SHA
    2765a93 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2013

  1. Update link.html 

    修复问题：在uEditor中添加了锚点之后，添加a跳转链接的时候，链接地址为#abc的时候，确认之后uEditor会自动加上http://导致链接地址变成http://#abc这样就不能正确链接到相应的锚点abc了。
    @adin283
    adin283 committed Dec 26, 2013
    Configuration menu
    Copy the full SHA
    92f9c6f View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2014

  1. 修复有些文本标签解析错误 

    例如：
UE.htmlparser('<p>>>>dfsdfsdfsd<<<</p>').toHtml()
UE.htmlparser('<</p>').toHtml()
    @hodor-cn
    hodor-cn committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    6539e39 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2014

  1. Update table.cmds.js 

    修改deleterow和deleterow的queryCommandState返回结果，否则会导致即使当前选中范围在表格内，右键菜单中也不会显示“删除当前行”和“删除当前列”
    @AJSoft
    AJSoft committed Mar 8, 2014
    Configuration menu
    Copy the full SHA
    125815f View commit details
    Browse the repository at this point in the history

  2. Update table.cmds.js 

    修改deleterow和deletecol的返回结果，否则会导致即使当前选区在表格中，右键菜单也不会出现“删除当前行”和“删除当前列”
    @AJSoft
    AJSoft committed Mar 8, 2014
    Configuration menu
    Copy the full SHA
    1dd4866 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2014

  1. Merge pull request #122 from hodor-cn/master 

    修复有些文本标签解析错误
    @campaign
    campaign committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    925e2a7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #113 from adin283/master 

    锚链接问题修复
    @campaign
    campaign committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    a6a9496 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2014

  1. Merge pull request #124 from AJSoft/patch-1 

    thanks
    @campaign
    campaign committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    a1c0139 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2014

  1. Merge remote-tracking branch 'origin/dev-1.4.0' 

    Conflicts:
	asp/getRemoteImage.asp
	asp/imageUp.asp
	dialogs/link/link.html
    @carsonxu
    carsonxu committed May 16, 2014
    Configuration menu
    Copy the full SHA
    09d198c View commit details
    Browse the repository at this point in the history

  2. 修改php编码

    @carsonxu
    carsonxu committed May 16, 2014
    Configuration menu
    Copy the full SHA
    fd52226 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2014

  1. Merge remote-tracking branch 'origin/dev-1.4.3' 

    Conflicts:
	php/action_crawler.php
    @carsonxu
    carsonxu committed May 29, 2014
    Configuration menu
    Copy the full SHA
    dced77f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/origin/dev-1.4.3'

    @carsonxu
    carsonxu committed May 29, 2014
    Configuration menu
    Copy the full SHA
    c7f9166 View commit details
    Browse the repository at this point in the history