Commits

Branch selector

 dev-1.4.0

User selector

All users

All time

Commit History

Commits on May 22, 2014

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

  yancend

  committed
  bc8b8c7

  Copy full SHA for bc8b8c7

• Merge pull request #229 from edsgerlin/patch-1

  Show description for 269dc66
  campaign

  committed
  269dc66

  Copy full SHA for 269dc66

• Merge pull request #250 from worry127722/dev-1.4.0

  Show description for 2c78433
  yancend

  committed
  2c78433

  Copy full SHA for 2c78433

• 修复xss漏洞

  carsonxu

  committed
  7d9b05f

  Copy full SHA for 7d9b05f

• 修复xss漏洞

  carsonxu

  committed
  17cee0b

  Copy full SHA for 17cee0b

• Merge pull request #33 from fex-team/dev-1.4.0

  Show description for 943003f
  worry127722

  committed
  943003f

  Copy full SHA for 943003f

• [test]补充用例

  worry127722

  committed
  799b9a5

  Copy full SHA for 799b9a5

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

  carsonxu

  committed
  ae54548

  Copy full SHA for ae54548

• 添加retainOnlyLabelPasted配置项

  carsonxu

  committed
  992aad0

  Copy full SHA for 992aad0

Commits on May 21, 2014

• [test]

  yancend

  committed
  0d3447d

  Copy full SHA for 0d3447d

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

  yancend

  committed
  4c0f9c2

  Copy full SHA for 4c0f9c2

• [test]

  yancend

  committed
  fcddef0

  Copy full SHA for fcddef0

• Merge branch 'dev-1.4.0' of https://github.com/worry127722/ueditor into dev-1.4.0

  worry127722

  committed
  fc8a570

  Copy full SHA for fc8a570

• [test]

  worry127722

  committed
  78ebb5f

  Copy full SHA for 78ebb5f

• Merge pull request #32 from fex-team/dev-1.4.0

  Show description for 51d99f9
  worry127722

  committed
  51d99f9

  Copy full SHA for 51d99f9

• Merge pull request #188 from worry127722/dev-1.4.0

  Show description for 8b84274
  yancend

  committed
  8b84274

  Copy full SHA for 8b84274

Commits on May 20, 2014

• [test] json2str 不使用原生方法

  yancend

  committed
  ca48382

  Copy full SHA for ca48382

• Change Microsoft Yahei to Microsoft YaHei.

  

  Edsger Lin

  committed
  195adfd

  Copy full SHA for 195adfd

• Fix errors in the names of programming languages.

  Show description for f6cdccb
  

  Edsger Lin

  committed
  f6cdccb

  Copy full SHA for f6cdccb

• Fix errors in the names of programming languages.

  Show description for f34bdf2
  

  Edsger Lin

  committed
  f34bdf2

  Copy full SHA for f34bdf2

• [test]添加pre标签中tabKey用例

  worry127722

  committed
  648ee67

  Copy full SHA for 648ee67

• 修改路径定位方式， 解决上次修复未能解决的问题

  Show description for d43368d
  

  hancong03

  committed
  d43368d

  Copy full SHA for d43368d

• Merge pull request #31 from fex-team/dev-1.4.0

  Show description for 3324e8d
  worry127722

  committed
  3324e8d

  Copy full SHA for 3324e8d

• 修复java版本在某些服务器部署环境下找不到配置文件正确位置的bug

  Show description for 9ab0e9c
  

  hancong03

  committed
  9ab0e9c

  Copy full SHA for 9ab0e9c

Commits on May 19, 2014

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

  carsonxu

  committed
  7561e75

  Copy full SHA for 7561e75

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

  carsonxu

  committed
  7c2cbde

  Copy full SHA for 7c2cbde

• [Issue #218] fix asp session bug

  techird

  committed
  d0e730a

  Copy full SHA for d0e730a

• 添加enableContextMenu配置项

  carsonxu

  committed
  58345d5

  Copy full SHA for 58345d5

• merge

  techird

  committed
  f9aee31

  Copy full SHA for f9aee31

• merge readme

  techird

  committed
  c536213

  Copy full SHA for c536213

• 升级 ASP 说明文档

  techird

  committed
  b705a19

  Copy full SHA for b705a19

Commits on May 18, 2014

• 配置ZeroClipboard的flash地址参数名称错误

  carsonxu

  committed
  2cd4fed

  Copy full SHA for 2cd4fed

• 修改getActionUrl方法

  carsonxu

  committed
  886c3cd

  Copy full SHA for 886c3cd

Commits on May 16, 2014

• 修改php编码

  carsonxu

  committed
  b2ef654

  Copy full SHA for b2ef654

• cs文件不转编码

  carsonxu

  committed
  563e092

  Copy full SHA for 563e092