guy
|
6f341421a9
|
Merge pull request #394 in FUI/fineui from ~WINDY/fui:master to master
* commit 'f47ba3ef0a052e447103f630a8e3b366da6079d9':
update
BI-19488
update
BI-19065
|
7 years ago |
windy
|
f47ba3ef0a
|
update
|
7 years ago |
|
windy
|
a80ac1083b
|
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 |
 fay
|
8e831fa08a
|
dist
|
7 years ago |
|
fay
|
0cfca7565d
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~fay/fineui
|
7 years ago |
|
fay
|
68a1fa6e46
|
update
|
7 years ago |
|
windy
|
b9f4810392
|
BI-19488
|
7 years ago |
|
windy
|
170f6b756a
|
update
|
7 years ago |
|
guy
|
465a95cb73
|
Merge pull request #391 in FUI/fineui from ~LEI.WANG/fineui:master to master
* commit '31a00f8f654e116e322ab921472f3d4721f77ed5':
BI-19738 getBeginDate不应该返回undefined，会导致其他的问题
|
7 years ago |
|
windy
|
b72ab25768
|
BI-19065
|
7 years ago |
MrErHu
|
31a00f8f65
|
BI-19738
getBeginDate不应该返回undefined，会导致其他的问题
|
7 years ago |
|
guy
|
114df62079
|
Merge pull request #390 in FUI/fineui from ~WINDY/fui:master to master
* commit '50a4fb20c7b7053013b137d0f30d41ebb1f1f921':
BI-20011
|
7 years ago |
|
windy
|
50a4fb20c7
|
BI-20011
|
7 years ago |
|
guy
|
00dd41b1c6
|
Merge pull request #388 in FUI/fineui from ~YOUNG/fineui:master to master
* commit '07502a72964bd8fa5f120db63d030024a8f6681f':
BI-20234 表格的汇总改合计
|
7 years ago |
|
guy
|
8c8657fe11
|
Merge pull request #389 in FUI/fineui from ~LEI.WANG/fineui:master to master
* commit 'ed9f7ff864daf4f43503a6bd64ed271c311cb2cf':
BI-20265
|
7 years ago |
Young
|
07502a7296
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~young/fineui
|
7 years ago |
|
Young
|
e87eed7947
|
BI-20234 表格的汇总改合计
|
7 years ago |
|
MrErHu
|
ed9f7ff864
|
BI-20265
|
7 years ago |
|
guy
|
446a201978
|
Merge pull request #387 in FUI/fineui from ~LEI.WANG/fineui:master to master
* commit '37b50f2ded65909eca72ed5e3a6b31137eefa10a':
BI-20265 滚动表格位置的同时，需要同时修正滚动条的位置，否则会出现二者不统一的问题
|
7 years ago |
|
MrErHu
|
37b50f2ded
|
BI-20265
滚动表格位置的同时，需要同时修正滚动条的位置，否则会出现二者不统一的问题
|
7 years ago |
|
guy
|
c80989a6d9
|
Merge pull request #386 in FUI/fineui from ~YOUNG/fineui:master to master
* commit '0afd686d32f962c2facdf11567cad659e2702fc2':
BI-20297 将fineui的滑块控件国际化处理一下
|
7 years ago |
|
Young
|
0afd686d32
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~young/fineui
|
7 years ago |
|
Young
|
92360e17ee
|
BI-20297 将fineui的滑块控件国际化处理一下
|
7 years ago |
|
guy
|
35533b10d6
|
Merge pull request #385 in FUI/fineui from ~TELLER/fineui:bugfix/BI-19837 to master
* commit '1f6aab1bbe672a936c60a6e88524916ac197a402':
update
update
update
update
update
update
update
update
|
7 years ago |
iapyang
|
1f6aab1bbe
|
update
|
7 years ago |
|
guy
|
faf3e84bbe
|
BI-20382
|
7 years ago |
|
iapyang
|
268258db9d
|
update
|
7 years ago |
|
iapyang
|
9cd0de13c8
|
update
|
7 years ago |
|
iapyang
|
21b95d0fd8
|
update
|
7 years ago |
|
iapyang
|
2c00a08b9e
|
update
|
7 years ago |
|
iapyang
|
99a9e3c91e
|
update
|
7 years ago |
|
iapyang
|
907dd1948f
|
update
|
7 years ago |
|
iapyang
|
9e486983cf
|
update
|
7 years ago |
|
guy
|
b5bf953bf7
|
Merge pull request #384 in FUI/fineui from ~WINDY/fui:master to master
* commit '3a4c6e2933e104fbf3ac34d8ec556942efa580c9':
BI-20237
|
7 years ago |
|
windy
|
3a4c6e2933
|
BI-20237
|
7 years ago |
|
guy
|
c24f6ea79c
|
Merge pull request #383 in FUI/fineui from ~WINDY/fui:master to master
* commit 'aaa76c1e96027d63821c57ed681c08e6ea409573':
BI-20011
|
7 years ago |
|
windy
|
aaa76c1e96
|
BI-20011
|
7 years ago |
|
guy
|
565072e987
|
Merge pull request #382 in FUI/fineui from ~WINDY/fui:master to master
* commit '57f463ae6481fbd7808004a47530675ce9c8858c':
update
BI-19889
update
|
7 years ago |
|
windy
|
57f463ae64
|
update
|
7 years ago |
|
windy
|
d64a3692f5
|
BI-19889
|
7 years ago |
|
windy
|
ab6cf1eb63
|
update
|
7 years ago |
|
guy
|
9ca22c6e8a
|
Merge pull request #381 in FUI/fineui from ~WINDY/fui:master to master
* commit '5a2e53cfd83e00255c6dc23e0d68092ff784f299':
BI-19454
|
7 years ago |
|
windy
|
5a2e53cfd8
|
BI-19454
|
7 years ago |
|
guy
|
72a3b0ce7b
|
Merge pull request #380 in FUI/fineui from ~WINDY/fui:master to master
* commit '6e8e43c8b5ea4255ce13ebc79788a07b1542fe49':
update
BI-19821
|
7 years ago |
|
windy
|
6e8e43c8b5
|
update
|
7 years ago |
|
windy
|
e2559a64d5
|
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
|
7f57da816f
|
Merge pull request #379 in FUI/fineui from ~LEI.WANG/fineui:master to master
* commit '0ebd65e532e5a637aaf063daea41d1c33e5ec650':
BI-18860 上次修改bi.multi_select_bar的时候，代码有冲突导致这个部分重复了，做了两次监听处理，失误。
|
7 years ago |
|
MrErHu
|
0ebd65e532
|
BI-18860
上次修改bi.multi_select_bar的时候，代码有冲突导致这个部分重复了，做了两次监听处理，失误。
|
7 years ago |
|
windy
|
56fed8ca67
|
BI-19821
|
7 years ago |
|
guy
|
7b9e432862
|
Merge pull request #377 in FUI/fineui from ~WINDY/fui:master to master
* commit 'f79e531dcc7cda436443a41b39e08affe81ae6c5':
update
update
BI-18963
BI-18672
|
7 years ago |
