Code

Dev#576

Code

Open

shuixiaobin wants to merge 94 commits intomasterfex-team/umeditor:masterfrom devfex-team/umeditor:devCopy head branch name to clipboard

+332-61,796

Commits

Commits on Mar 26, 2014

• 修改b/i/u的query错误问题

  carsonxu

  committed
  c14593b

Commits on Mar 27, 2014

• 视频插件转换规则整理

  carsonxu

  committed
  02b5053

• 调整combox样式

  carsonxu

  committed
  f355173

Commits on Mar 28, 2014

• 搜索地点出错

  carsonxu

  committed
  c136e41

• point变量没有var

  carsonxu

  committed
  4e925a7

• 调整下啦菜单的样式

  carsonxu

  committed
  85b026a

• 修改下拉菜单演示

  carsonxu

  committed
  04d915a

• 修改宽度设置,保留%的宽度

  carsonxu

  committed
  2beb2e0

• 事件jquery return false改为e.preventDefault()

  carsonxu

  committed
  5235475

Commits on Mar 31, 2014

• bootstrap里的box-sizing是border-box

  Show description for 6b2cc4c
  carsonxu

  committed
  6b2cc4c

Commits on Apr 1, 2014

• 修改图片上传bug

  carsonxu

  committed
  ddfef11

Commits on Apr 2, 2014

• 修复拖拽改变大小,再bootstrap下出错

  carsonxu

  committed
  ee8676f

• 修改拖拽改变图片大小的样式

  carsonxu

  committed
  776200f

• 修改dialog

  carsonxu

  committed
  e81f7dc

• Merge pull request #2 from fex-team/dev

  Show description for 5fe7b26
  worry127722

  committed
  5fe7b26

• Delete encodings.xml

  worry127722

  committed
  7df465e

• Delete misc.xml

  worry127722

  committed
  4cab0ef

• Delete modules.xml

  worry127722

  committed
  cc1b128

• Delete umeditor.iml

  worry127722

  committed
  dfb60f9

• Delete vcs.xml

  worry127722

  committed
  fc79d2d

• Delete README.md

  worry127722

  committed
  b42af6c

• 1

  worry127722

  committed
  0bb5ca7

• Merge branch 'dev' of https://github.com/worry127722/umeditor into dev

  worry127722

  committed
  572941a

• Create README.md

  worry127722

  committed
  2e43508

• Update README.md

  worry127722

  committed
  4c4df0e

• Update README.md

  worry127722

  committed
  75b4878

• Update README.md

  worry127722

  committed
  9acd2cf

• new Editor会在render报错

  carsonxu

  committed
  5c5d1a5

• Merge remote-tracking branch 'remotes/fex-umeditor/dev' into dev

  worry127722

  committed
  cb652b3

• 完善测试用例

  worry127722

  committed
  8265b8f

Commits on Apr 3, 2014

• Merge pull request #41 from worry127722/dev

  Show description for 3c62245
  yancend

  committed
  3c62245

• [test]调整用例

  yancend

  committed
  01b8da4

• Merge branch 'dev' of https://github.com/fex-team/umeditor into dev

  yancend

  committed
  4d29c83

• [test]改掉用例里面用得保留字 start

  yancend

  committed
  93017c9

Commits on Apr 4, 2014

• 完善用例在IE8,11中的错误

  worry127722

  committed
  6e1b572

• 完善测试用例

  worry127722

  committed
  77923c6

Commits on Apr 8, 2014

• Merge pull request #4 from fex-team/dev

  Show description for 0eba68e
  worry127722

  committed
  0eba68e

Commits on Apr 14, 2014

• 修复IE8下,编辑器不聚焦时,插入html报错

  carsonxu

  committed
  0164d23

• 修复chrome 34下,domutils里的removeAttrbutes方法报错

  carsonxu

  committed
  8a2a444

• Merge remote-tracking branch 'origin/dev' into dev

  carsonxu

  committed
  ba6b21b

• 添加编辑区域的重置样式

  carsonxu

  committed
  376ab61

Commits on Apr 15, 2014

• Merge pull request #5 from fex-team/dev

  Show description for 1311c8e
  worry127722

  committed
  1311c8e

• 添加覆盖用例

  worry127722

  committed
  9a170c5

Commits on Apr 16, 2014

• 修改字体的bug

  carsonxu

  committed
  ca8bcc4

Commits on Apr 17, 2014

• Merge branch 'dev' of https://github.com/fex-team/umeditor into dev

  yancend

  committed
  2264d6d

• 1

  worry127722

  committed
  5782f13

Commits on Apr 18, 2014

• 修改图片拖拽改变大小

  carsonxu

  committed
  22150b2

• [test]

  yancend

  committed
  765f332

• Merge branch 'dev' of https://github.com/fex-team/umeditor into dev

  yancend

  committed
  4328a45

• Merge pull request #43 from worry127722/dev

  Show description for 33ce765
  yancend

  committed
  33ce765

Commits on Apr 21, 2014

• 修复地图bug

  carsonxu

  committed
  5ca62d3

• 删除一个css文件

  carsonxu

  committed
  dd5edf6

• Merge remote-tracking branch 'origin/dev' into dev

  carsonxu

  committed
  b8f4edd

• 修改地图插件

  carsonxu

  committed
  5e8cefd

Commits on Apr 25, 2014

• [test]添加getxy用例

  yancend

  committed
  b9f1d88

• Merge branch 'dev' of https://github.com/fex-team/umeditor into dev

  yancend

  committed
  cc534cf

• Merge pull request #6 from fex-team/dev

  Show description for 955a59c
  worry127722

  committed
  955a59c

Commits on May 12, 2014

• 修复 link xss bug

  carsonxu

  committed
  47ba314

Commits on Jun 5, 2014

• 修复上传图片返回内容有pre的bug

  carsonxu

  committed
  d9d2f82

• Merge remote-tracking branch 'origin/dev' into dev

  carsonxu

  committed
  9582f2b

Commits on Jun 10, 2014

• Update link.js

  Show description for 5618e86
  youxiachai

  committed
  5618e86

Commits on Jun 12, 2014

• Merge pull request #89 from youxiachai/patch-1

  Show description for 5e25743
  carsonxu

  committed
  5e25743

Commits on Jun 16, 2014

• Merge pull request #7 from fex-team/dev

  Show description for 4aadce1
  worry127722

  committed
  4aadce1

• [test]

  worry127722

  committed
  dc8ca07

• Merge pull request #95 from worry127722/dev

  Show description for 61a0393
  yancend

  committed
  61a0393

• 修改写死在代码里的upfile

  carsonxu

  committed
  c6dae80

• Merge remote-tracking branch 'origin/dev' into dev

  carsonxu

  committed
  45702fb

Commits on Jun 18, 2014

• [test]

  yancend

  committed
  21b6827

Commits on Jun 24, 2014

• 添加base64图片转存

  carsonxu

  committed
  f180211

• Merge remote-tracking branch 'origin/dev' into dev

  carsonxu

  committed
  7a96303

• 修改版本号

  carsonxu

  committed
  4b07d1e

• 修改getContent.php位置

  carsonxu

  committed
  65c1f7b

• 添加base64图片转存

  carsonxu

  committed
  9e35979

• 修复ff下fontsize的bug

  carsonxu

  committed
  a497149

Commits on Jun 25, 2014

• [test]

  worry127722

  committed
  9abe063

Commits on Jun 26, 2014

• Merge pull request #100 from worry127722/dev

  Show description for 8a3d5a7
  worry127722

  committed
  8a3d5a7

Commits on Sep 19, 2014

• 修改测试配置

  worry127722

  committed
  e37b519

• 修改测试配置

  worry127722

  committed
  46ade6b

Commits on Nov 19, 2014

• s

  worry127722

  committed
  6bd65fd

Commits on Dec 3, 2014

• 更新test

  worry127722

  committed
  1aea44f

• 更新test

  worry127722

  committed
  70542cb

Commits on Jul 22, 2015

• 修复issue、

  

  zeldajay

  committed
  d408054

• fix issue #228

  Show description for eb598f3
  

  zeldajay

  committed
  eb598f3

• Merge pull request #1 from zeldajay/zeldajay-patch-1

  Show description for 8e1bcbd
  

  zeldajay

  committed
  8e1bcbd

• 修复bug

  Show description for 121cb3d
  

  zeldajay

  committed
  121cb3d

Commits on Nov 21, 2015

• fix #256 #128

  wy-z

  committed
  aa63ef2

Commits on Nov 26, 2015

• del

  

  zhuwenxuan

  authored and

  zhuwenxuan

  committed
  300c5ae

Commits on Jul 6, 2016

• 修复调用destroy方法产生的页面dom结构变动bug

  Show description for f7b01d0
  HDRorz

  authored
  f7b01d0

• 修复第一次产生选中操作时控制台报错

  Show description for ad41363
  HDRorz

  authored
  ad41363

Commits on Jul 15, 2016

• Update Editor.js

  HDRorz

  authored
  56874b1

• 还是修复那个问题

  Show description for e15c4a8
  HDRorz

  authored
  e15c4a8

Commits on Jul 20, 2017

• Merge pull request #332 from HDRorz/dev

  Show description for 17f0e60
  Phinome

  authored
  17f0e60

• Merge pull request #259 from wy-z/dev

  Show description for d82d123
  Phinome

  authored
  d82d123

• Merge pull request #230 from zeldajay/dev

  Show description for 6e2e113
  Phinome

  authored
  6e2e113