Commit Graph

9 Commits (adaec8199faa42b6cf0a1e61c6d5ccd6e9c534b2)

Author SHA1 Message Date
Leopoldthecoder 3243b8fc98 Merge branch 'dev' into 1.2-merge1
# Conflicts:
#	package.json
#	src/utils/popup/index.js
#	yarn.lock
2017-02-09 17:33:42 +08:00
杨奕 58195fc69d Dialog: add title slot (#2657) 2017-02-04 16:43:25 +08:00
杨奕 0a408949a4 Dialog: unify api format (#2575) 2017-02-02 14:37:57 +08:00
Leopoldthecoder 723b2ab457 Dialog: add modalAppendToBody 2017-01-21 16:56:04 +08:00
baiyaaaaa 34e01710b5 remove button native modifier (#1232) 2016-11-20 22:39:33 +08:00
Leopoldthecoder a809a20361 Docs: misc updates 2016-11-14 18:55:17 +08:00
Leopoldthecoder 353dab8c55 JSFiddle: add missing <style> and <script> 2016-11-14 18:24:06 +08:00
Leopoldthecoder 7af57c84c5 i18n: remove redundant styles 2016-11-10 23:50:55 +08:00
杨奕 4ccb8ea9ae Merge i18n to master (#972)
* init i18n

* update router

* finish router

* Review: message/messageBox/notification

* Tag: update doc

* Review: pagination/popover/progress

* i18n: sync with master
2016-11-10 21:46:55 +08:00