Commit Graph

182 Commits

Author SHA1 Message Date
wangfupeng d45cf4ae67 merge master 2020-06-28 15:11:25 +08:00
wangfupeng 13cda57ac2 Merge branch 'dev' into feature-menus-link 2020-06-28 15:09:16 +08:00
wangfupeng a7fe49b09e test: Tooltip 2020-06-28 14:54:30 +08:00
lkw199711 d17c690bfc test:fontSize修改 2020-06-28 11:42:59 +08:00
lkw199711 8f84196092 feat: 修改字号添加 2020-06-27 17:53:20 +08:00
q378532364 3d9f5dfeba feat:增加功能Italic 2020-06-24 23:05:58 +08:00
lkw199711 9306fcbdd0 Merge remote-tracking branch 'origin/dev' into feature-strikethrough
# Conflicts:
#	src/config/menus.ts
#	src/menus/menu-list.ts
2020-06-24 17:46:14 +08:00
lkw199711 a3ce557e64 test:更改变量命名为驼峰 2020-06-24 17:43:00 +08:00
wangfupeng e984cc6373 fix: 修改链接 删除链接 2020-06-24 11:08:58 +08:00
wangfupeng 7261d4d2b2 merge dev 2020-06-23 10:54:39 +08:00
NeverSellSuteAC 00f334e8c1 feat:设置字体功能实现 2020-06-22 17:27:18 +08:00
lkw199711 f707c03b24 test:修改更正代码注释'加粗'=>'删除线' 2020-06-20 23:23:57 +08:00
lkw199711 10ebbe4352 Merge remote-tracking branch 'origin/dev' into feature-strikethrough
# Conflicts:
#	src/config/menus.ts
#	src/menus/menu-list.ts
2020-06-20 23:09:52 +08:00
lkw199711 511cdd05dc 修改更正代码注释'加粗'=>'加删除线' 2020-06-20 23:02:18 +08:00
wangfupeng 71b7496608 test: 粘贴文本和 html 2020-06-20 19:26:03 +08:00
lkw199711 500aea8ebf 1.{}两侧增加空格
2.更改部分错误代码
2020-06-19 20:21:34 +08:00
王福朋 6923608c8c
Merge pull request #8 from wangeditor-team/feature-text-API
getJSON 和处理 tab
2020-06-19 10:36:08 +08:00
王福朋 fe10d45bff
Merge pull request #6 from wangeditor-team/feature-underline
Feature underline
2020-06-18 22:38:20 +08:00
NeverSellSuteAC a9a3aa22b0 test:修改测试内容中的部分描述和名称 2020-06-18 22:30:22 +08:00
wangfupeng 99ed076d27 Merge branch 'master' into dev 2020-06-18 22:06:26 +08:00
NeverSellSuteAC 2675c8e401 feat:增加下划线功能,注册下划线到编辑器菜单 2020-06-18 21:47:00 +08:00
wangfupeng 09030ce733 feat: 增加 txt.getJSON API 2020-06-18 17:36:13 +08:00
lkw199711 5bbf749f20 1.新增加删除线功能 2020-06-18 08:45:05 +08:00
wangfupeng 3b6a8df29b fixed: 单元测试问题 2020-06-15 11:49:39 +08:00
wangfupeng 63e9da46d3 refactor: 统一处理 class 属性权限:public protected private 2020-06-15 11:42:38 +08:00
wangfupeng b04adc24a7 feat: 增加配置 styleWIthCSS 2020-06-12 14:19:11 +08:00
wangfupeng 79dfe31a2f test: menus 2020-06-06 15:09:44 +08:00
wangfupeng 1938fa76a2 test: editot.txt API 2020-06-06 10:47:39 +08:00
wangfupeng d72a08a1c0 test: editor config 2020-06-05 17:37:40 +08:00
wangfupeng 046ce1939d test: command 2020-06-05 15:07:19 +08:00
wangfupeng f091f10942 test: 初始化编辑器 & Selection API 2020-06-03 18:32:01 +08:00
git b1fa271b30 chore: 项目环境 2020-05-18 09:29:26 +08:00