285 Commits

Author SHA1 Message Date
cookfront
5580e2cdce Merge branch 'feature/code_review' 2017-04-01 16:04:48 +08:00
cookfront
8862e38623 docs popup fix 2017-04-01 16:04:32 +08:00
cookfront
4dc42004a5 uploader 2017-04-01 15:56:46 +08:00
cookfront
71d209469a Merge branch 'feature/code_review' 2017-04-01 15:52:08 +08:00
cookfront
641473e2b6 fix image preview 2017-04-01 15:51:47 +08:00
pangxie1991
1444d732b7 Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue 2017-04-01 14:21:58 +08:00
pangxie1991
3458bd2847 waterfall 文档 2017-04-01 14:21:48 +08:00
cookfront
36cbab827e Merge branch 'feature/code_review' 2017-04-01 11:43:47 +08:00
cookfront
780f900f5c image preview 2017-04-01 11:43:26 +08:00
cookfront
27d7cf128a Merge branch 'feature/code_review' 2017-04-01 11:37:09 +08:00
cookfront
fbf4a93424 docs 2017-04-01 11:36:44 +08:00
cookfront
167f9c75a2 Merge branch 'feature/code_review' 2017-03-31 20:47:38 +08:00
cookfront
4e9126e352 switch docs 2017-03-31 20:47:09 +08:00
cookfront
1295e00682 Merge branch 'feature/code_review' 2017-03-31 20:14:07 +08:00
cookfront
4d974ce619 popup docs 2017-03-31 20:12:45 +08:00
cookfront
adff0129dc popup docs 2017-03-31 16:31:31 +08:00
taiyong
574d4d8e9e Merge branch 'hostfix/uploader' into 'master'
Hostfix/uploader



See merge request !19
2017-03-31 15:25:08 +08:00
cookfront
78cbdc4765 icon 2017-03-31 14:58:20 +08:00
cookfront
e3bc352263 icon 2017-03-31 14:16:14 +08:00
cookfront
4626b1483f code review 2017-03-31 14:05:30 +08:00
cookfront
f31f5d84d8 Merge branch 'feature/code_review' 2017-03-31 10:56:26 +08:00
cookfront
a364634a34 fix build 2017-03-31 10:56:12 +08:00
cookfront
ea12a0cddd build docs 2017-03-31 10:12:54 +08:00
cookfront
defec4a4a3 Merge branch 'master' into feature/code_review 2017-03-30 21:22:40 +08:00
cookfront
e20022b868 code review 2017-03-30 21:22:14 +08:00
pangxie
7491de862a Merge branch 'hotfix/fix_toast_0330' into 'master'
feat: 简化toast为单个intance



See merge request !20
2017-03-30 20:16:36 +08:00
jiangruowei
5f8aab0d6e fix: fix typo 2017-03-30 20:16:28 +08:00
jiangruowei
b079435235 fix: minor fix 2017-03-30 20:08:13 +08:00
jiangruowei
fea8721f1e fix: minor fix 2017-03-30 20:07:03 +08:00
niunai
544c21e798 修改cell required实现 2017-03-30 18:13:53 +08:00
cookfront
e241d92cd9 fix cell 2017-03-30 17:40:15 +08:00
jiangruowei
b2886f8856 doc: update 2017-03-30 17:27:27 +08:00
jiangruowei
e560cef315 feat: add clear method 2017-03-30 17:26:49 +08:00
jiangruowei
9e0a6bb984 feat: 简化toast为单个intance 2017-03-30 17:23:38 +08:00
cookfront
09be7c9323 docs 2017-03-30 16:18:36 +08:00
cookfront
50d87fa634 search add change event 2017-03-30 14:47:52 +08:00
cookfront
3017419c8e fix tabs 2017-03-30 14:33:41 +08:00
cookfront
a11ccb635b Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue 2017-03-30 14:27:59 +08:00
cookfront
969e1f78e1 tabs add click event 2017-03-30 14:27:49 +08:00
niunai
874df43df0 按钮新增类型,layout补全文档 2017-03-30 14:23:36 +08:00
niunai
7bbb53e5f5 Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue 2017-03-28 14:43:57 +08:00
niunai
56a3922a01 修复datetimepicker的问题 2017-03-28 14:43:53 +08:00
cookfront
0b90ae90d7 fix progress docs 2017-03-28 11:03:10 +08:00
cookfront
0a1db61b8a fix examples 2017-03-27 19:18:55 +08:00
cookfront
0083a23d6f fix examples 2017-03-27 19:17:10 +08:00
cookfront
6f51c93d6c fix example redirect 2017-03-27 18:59:43 +08:00
cookfront
03af3b3eba swipe add indicator 2017-03-27 17:06:30 +08:00
cookfront
a991aea581 fix docs 2017-03-24 22:02:38 +08:00
cookfront
f089a405a3 fix example 2017-03-24 17:32:31 +08:00
taiyong
cc409518b3 Merge branch 'master' into hostfix/uploader 2017-03-24 16:47:49 +08:00