windy
|
00219bf518
|
update
|
6 years ago |
windy
|
afa48e2ea6
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui
# Conflicts:
# dist/bundle.ie.min.js
# dist/bundle.min.js
# dist/fineui.ie.min.js
# dist/fineui.min.js
# dist/utils.min.js
|
6 years ago |
windy
|
3807432fca
|
BI-33222 改BI-27490导致的问题
|
6 years ago |
qcc
|
0411f51fa7
|
build
|
6 years ago |
Frank.Qiu
|
a11cb2723f
|
Merging in latest from upstream (VISUAL/fineui:refs/heads/master)
* commit '833e15d309c2a043a51603eb888807ac3f38c7ac':
update
update
Revert "update"
Revert "update"
Revert "update"
Revert "Revert "update""
Revert "update"
Revert "Revert "update""
Revert "update"
update
Revert "update"
update
build
无JIRA任务,isParent 用 parent
update
update
|
6 years ago |
guy
|
833e15d309
|
Merge pull request #716 in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'b05cca63caab344b4b10b827f6afa3c7cd9cfe97':
update
|
6 years ago |
guy
|
b05cca63ca
|
update
|
6 years ago |
fay
|
8854f4598b
|
Merge pull request #714 in VISUAL/fineui from ~FAY/fineui:master to master
* commit '5b901d9a2a22de68623e44abeb25bbb19168113c':
update
Revert "update"
Revert "update"
Revert "update"
Revert "Revert "update""
Revert "update"
Revert "Revert "update""
Revert "update"
update
Revert "update"
update
update
update
|
6 years ago |
Dailer
|
fa9cccba85
|
Merge pull request #712 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit 'ccc15e2744420a55dde812410d40647d126ad9c4':
build
无JIRA任务,isParent 用 parent
|
6 years ago |
fay
|
5b901d9a2a
|
update
|
6 years ago |
fay
|
2ae29be0a0
|
Revert "update"
This reverts commit 85d730d79d .
|
6 years ago |
fay
|
f44a051f03
|
Revert "update"
This reverts commit d57bb5bcb0 .
|
6 years ago |
fay
|
5494009030
|
Revert "update"
This reverts commit acd89f38e6 .
|
6 years ago |
fay
|
d7179d6e8f
|
Revert "Revert "update""
This reverts commit e9c7bce07a .
|
6 years ago |
fay
|
21f5987af6
|
Revert "update"
This reverts commit f7b1279d1b .
|
6 years ago |
fay
|
862ba43f28
|
Revert "Revert "update""
This reverts commit 47fcdf2211 .
|
6 years ago |
fay
|
47fcdf2211
|
Revert "update"
This reverts commit f7b1279d1b .
|
6 years ago |
fay
|
f7b1279d1b
|
update
|
6 years ago |
fay
|
e9c7bce07a
|
Revert "update"
This reverts commit d57bb5bcb0 .
|
6 years ago |
fay
|
acd89f38e6
|
update
|
6 years ago |
qcc
|
ae1b6062e7
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~frank.qiu/fineui
|
6 years ago |
qcc
|
7310ef5314
|
限制makeFirstPY多音字处理的长度
|
6 years ago |
Dailer
|
ccc15e2744
|
build
|
6 years ago |
Dailer
|
50eca83418
|
无JIRA任务,isParent 用 parent
|
6 years ago |
windy
|
63bf5e3082
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui
|
6 years ago |
windy
|
9bb458d209
|
update
|
6 years ago |
fay
|
d57bb5bcb0
|
update
|
6 years ago |
fay
|
85d730d79d
|
update
|
6 years ago |
guy
|
2821591ca4
|
Merge pull request #710 in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'ab184c2258d6231368115d59ed53f150d6220f0c':
update
|
6 years ago |
guy
|
ab184c2258
|
update
|
6 years ago |
lei.wang
|
b3ad0feb4b
|
Merge pull request #709 in VISUAL/fineui from ~LEI.WANG/fineui:master to master
* commit '17d72e0623133316f3aad448f07d2f23df10a6dc':
BI-33142
|
6 years ago |
MrErHu
|
17d72e0623
|
BI-33142
|
6 years ago |
Frank.Qiu
|
7720862530
|
Merge pull request #708 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master
* commit '36ed47ca35a06ffa11aea4b633c8f9ba7a84e9a5':
国际化处理把参数个数判断放到前面
|
6 years ago |
qcc
|
36ed47ca35
|
国际化处理把参数个数判断放到前面
|
6 years ago |
imp
|
11e8b568aa
|
Merge pull request #707 in VISUAL/fineui from ~IMP/fineui_fui:master to master
* commit '5546579fce0d6f541c5e2a836887788bc21df703':
国际化
|
6 years ago |
imp
|
5546579fce
|
国际化
|
6 years ago |
Teller
|
c65f14800f
|
Merge pull request #706 in VISUAL/fineui from ~TELLER/fineui:master to master
* commit '4fe4a2cdeb704305c95dbcce10e0b286a5ec9e09':
BI-33066
|
6 years ago |
iapyang
|
4fe4a2cdeb
|
BI-33066
|
6 years ago |
Dailer
|
11c60dee2b
|
Merge pull request #705 in VISUAL/fineui from ~IMP/fineui_fui:master to master
* commit 'c836f854209a1d9c0e2b6d5a01983092812de49e':
国际化
国际化
国际化
|
6 years ago |
imp
|
c836f85420
|
国际化
|
6 years ago |
imp
|
2daf93274b
|
国际化
|
6 years ago |
imp
|
1e6a6efce5
|
国际化
|
6 years ago |
Dailer
|
025e4741d9
|
Merge pull request #703 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit 'ff45591925df5928d2d2124d26d3bb1427536e05':
build
CORE-127 简化前端国际化写法
build
CORE-127 简化前端国际化写法
build
CORE-127 简化前端国际化写法
|
6 years ago |
Dailer
|
ff45591925
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui
# Conflicts:
# dist/bundle.ie.min.js
# dist/bundle.min.js
# dist/fineui.ie.min.js
# dist/fineui.min.js
# dist/utils.min.js
|
6 years ago |
Dailer
|
6141231d11
|
build
|
6 years ago |
Dailer
|
42d3384d26
|
CORE-127 简化前端国际化写法
|
6 years ago |
windy
|
8872dc1e56
|
Merge pull request #704 in VISUAL/fineui from ~LEI.WANG/fineui:master to master
* commit 'de4d5232925ad55209750f70e4832108c33bf540':
解决冲突
combo支持warningTitle
combo.text.value支持warningTitle提示,用于支持行列转化的标红
|
6 years ago |
Dailer
|
eb57e11b8d
|
build
|
6 years ago |
Dailer
|
313009e2e2
|
CORE-127 简化前端国际化写法
|
6 years ago |
MrErHu
|
de4d523292
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui
# Conflicts:
# dist/bundle.ie.min.js
# dist/bundle.min.js
# dist/fineui.ie.min.js
# dist/fineui.min.js
# dist/utils.min.js
|
6 years ago |