windy
|
94ccb0b854
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui
# Conflicts:
# dist/_fineui.min.js
# dist/bundle.min.js
# dist/fineui.min.js
|
7 years ago |
|
windy
|
567a965b90
|
BI-18028
|
7 years ago |
|
windy
|
66d0965ae3
|
update
|
7 years ago |
guy
|
d98912473c
|
Merge pull request #348 in FUI/fineui from ~FAY/fineui:master to master
* commit '4a65dac78e72fca369971338d8d22dce6993a7c0':
update
update
Revert "update"
update
update
|
7 years ago |
 fay
|
4a65dac78e
|
update
|
7 years ago |
|
fay
|
85f0530431
|
update
|
7 years ago |
fay
|
d88e007738
|
Merging in latest from upstream (FUI/fineui:refs/heads/master)
* commit '04d9ab307aefd840ef343de179fd9660e6b882ee':
update
update
|
7 years ago |
|
fay
|
b5eb5a2bef
|
Revert "update"
This reverts commit 39f6435b58.
|
7 years ago |
|
fay
|
c7fc741dea
|
update
|
7 years ago |
|
windy
|
2ea1544143
|
update
|
7 years ago |
|
guy
|
04d9ab307a
|
update
|
7 years ago |
|
guy
|
e3585d9c29
|
update
|
7 years ago |
|
windy
|
39af078aa1
|
BI-18614
|
7 years ago |
|
fay
|
39f6435b58
|
update
|
7 years ago |
|
windy
|
a2f03f1fa6
|
BI-18606
|
7 years ago |
|
windy
|
406e63d108
|
BI-18625
|
7 years ago |
|
windy
|
84733e762a
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fui
|
7 years ago |
|
windy
|
c99c2a610a
|
BI-18326 && BI-18585
|
7 years ago |
|
guy
|
73698055cf
|
update
|
7 years ago |
|
guy
|
778acd3575
|
update
|
7 years ago |
|
guy
|
baa8c86111
|
update
|
7 years ago |
|
guy
|
6be7d1dd0a
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
guy
|
0c11c6a755
|
update
|
7 years ago |
|
guy
|
3bf1c70b5f
|
Merge pull request #346 in FUI/fineui from ~WINDY/fui:master to master
* commit '94dad118a1dd272c65738e0c51d4c5745ce07b55':
update
|
7 years ago |
|
guy
|
55729af6cf
|
update
|
7 years ago |
|
windy
|
94dad118a1
|
update
|
7 years ago |
|
guy
|
30786c667b
|
Merge pull request #345 in FUI/fineui from ~WINDY/fui:master to master
* commit '6d8b582837d5ea95c52f60a5182b94625b07028d':
update
update
update
inline布局 && rich_editor && code_editor
update
|
7 years ago |
|
windy
|
6d8b582837
|
update
|
7 years ago |
|
windy
|
5b84ada5d0
|
update
|
7 years ago |
|
windy
|
0c5944d450
|
update
|
7 years ago |
|
windy
|
3c95dea58c
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui
# Conflicts:
# dist/_fineui.min.js
# dist/bundle.min.js
# dist/fineui.min.js
|
7 years ago |
|
windy
|
96a415a431
|
inline布局 && rich_editor && code_editor
|
7 years ago |
|
guy
|
81e6c5b486
|
Merge pull request #342 in FUI/fineui from ~LEI.WANG/fineui:master to master
* commit '85330b021d4313a10a32a14598d36160f25ac0c8':
no message
BI-17963 1. bi.code_editor应该在初始化时应该根据传入的style初始化样式(该组件提供了setStyle getStyle方法) 2. bi.textarea_editor存在属性style按照逻辑应该调用setStyle
|
7 years ago |
|
windy
|
47ac527dfb
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui
# Conflicts:
# dist/bundle.min.js
|
7 years ago |
MrErHu
|
85330b021d
|
no message
|
7 years ago |
|
MrErHu
|
7fad24299d
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui
# Conflicts:
# dist/_fineui.min.js
# dist/bundle.min.js
# dist/fineui.min.js
|
7 years ago |
|
guy
|
8e8568e43c
|
update
|
7 years ago |
|
guy
|
28d1e3b9ab
|
update
|
7 years ago |
|
MrErHu
|
fc9b243e61
|
BI-17963
1. bi.code_editor应该在初始化时应该根据传入的style初始化样式(该组件提供了setStyle getStyle方法)
2. bi.textarea_editor存在属性style按照逻辑应该调用setStyle
|
7 years ago |
|
guy
|
8ff4e2771f
|
update
|
7 years ago |
|
guy
|
63d96752bb
|
update
|
7 years ago |
|
guy
|
eaea5cb9a5
|
update
|
7 years ago |
|
guy
|
85d6287cf1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dist/_fineui.min.js
# dist/bundle.min.js
# dist/fineui.min.js
|
7 years ago |
|
guy
|
07d977a435
|
update
|
7 years ago |
|
windy
|
f83e0ab114
|
update
|
7 years ago |
|
guy
|
ace8a6fbc5
|
Merge pull request #338 in FUI/fineui from ~WINDY/fui:master to master
* commit '74ac7ddafe8232d790bf80536669aa9500a90f64':
update
BI-18130 && BI-18215 && BI-18282 && BI-18267 && BI-18301 && BI-18336 && BI-18348 && BI-18330 && BI-18327 && BI-18326 && BI-18319 && BI-18309
update
BI-18276 年月份
update
BI-18321 默认本月的问题
|
7 years ago |
|
windy
|
74ac7ddafe
|
update
|
7 years ago |
|
windy
|
4456968c20
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui
# Conflicts:
# dist/_fineui.min.js
# dist/bundle.min.js
# dist/fineui.min.js
|
7 years ago |
|
windy
|
b4d4973a48
|
BI-18130 && BI-18215 && BI-18282 && BI-18267 && BI-18301 && BI-18336 && BI-18348 && BI-18330 && BI-18327 && BI-18326 && BI-18319 && BI-18309
|
7 years ago |
|
guy
|
eb895a515c
|
update
|
7 years ago |
