guy
|
73150dcb93
|
add
|
7 years ago |
|
guy
|
c850a32d15
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui
# Conflicts:
# bi/base.js
# dist/bundle.min.js
|
7 years ago |
|
guy
|
b19ed21889
|
combo
|
7 years ago |
imp
|
c59f08ea20
|
Merge pull request #151 in ~GUY/fineui from ~IMP/fineui_guy:master to master
* commit 'efc8221cfa97d4df8a8d32c9af05d2da35b0a2ee':
update
update
update
|
7 years ago |
 imp
|
efc8221cfa
|
update
|
7 years ago |
|
imp
|
a2490b20f1
|
update
|
7 years ago |
|
imp
|
89bf9a8f23
|
Merge branch 'master' of ssh://www.finedevelop.com:7999/~imp/fineui_guy
# Conflicts:
# bi/case.js
|
7 years ago |
|
imp
|
bd7bdffc89
|
update
|
7 years ago |
windy
|
379f06da65
|
Merge pull request #150 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit 'a0acef3ed43521b6f4047797e93b63cf23093083':
singleSlider值没存
singleSlider值没存
|
7 years ago |
windy
|
a0acef3ed4
|
singleSlider值没存
|
7 years ago |
|
windy
|
fd0dafe48e
|
singleSlider值没存
|
7 years ago |
|
windy
|
f12a7e3312
|
Merge pull request #149 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit '872ec56231e4b1726541a4811852ea0ad8a7da45':
icon_text_trigger
|
7 years ago |
|
windy
|
872ec56231
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~windy/fineui
|
7 years ago |
|
windy
|
d3b05d2af2
|
icon_text_trigger
|
7 years ago |
|
guy
|
73e552f2e4
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui
|
7 years ago |
|
guy
|
cc9ff059de
|
add
|
7 years ago |
|
guy
|
eeda93e4fd
|
Merge pull request #102 in FUI/fineui from ~GUY/fineui:master to master
* commit '1690b1e6294310af32bf97c02badee1450c1e3fb':
add
update
增加步长
更新
|
7 years ago |
|
guy
|
1690b1e629
|
add
|
7 years ago |
|
windy
|
b61e36ebc6
|
Merge pull request #147 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit 'cfa399b7005911fd42c9a31cf6a22ccc41c49b91':
update
增加步长
|
7 years ago |
|
windy
|
cfa399b700
|
update
|
7 years ago |
|
windy
|
3d94090e4a
|
merge
|
7 years ago |
|
windy
|
077d04219d
|
增加步长
|
7 years ago |
|
guy
|
a03ffe358e
|
更新
|
7 years ago |
|
guy
|
b8cfd1c031
|
Merge pull request #101 in FUI/fineui from ~GUY/fineui:master to master
* commit 'd4666986852570d9d3aac77b130491eafbd77bf4':
label加1
|
7 years ago |
|
windy
|
d466698685
|
Merge pull request #145 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit '69610f4003ebd290b48dbc8564d97843a03758fe':
label加1
|
7 years ago |
|
windy
|
69610f4003
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~windy/fineui
|
7 years ago |
|
windy
|
a89b3a52cb
|
label加1
|
7 years ago |
|
guy
|
5872da29ac
|
Merge pull request #97 in FUI/fineui from ~GUY/fineui:master to master
* commit '8008cee0c57721be499d139edb00e8d8bbb0d62c':
bundle
|
7 years ago |
|
guy
|
8008cee0c5
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui
|
7 years ago |
|
guy
|
f20606c6a5
|
bundle
|
7 years ago |
|
guy
|
bf862cbd6a
|
Merge pull request #96 in FUI/fineui from ~GUY/fineui:master to master
* commit '059a8f459dbbde4408c92e99013c9d95e267e93e':
update
conflict
less and css
修改
silder
update
|
7 years ago |
|
guy
|
059a8f459d
|
Merge pull request #142 in ~GUY/fineui from ~IMP/fineui_guy:master to master
* commit 'abdb2d53962f726a2be96f6439074ebf2cc85e60':
update
conflict
less and css
|
7 years ago |
|
imp
|
abdb2d5396
|
update
|
7 years ago |
|
imp
|
7e2cde5346
|
conflict
|
7 years ago |
|
imp
|
b6e78bce91
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
imp
|
83e23c45fc
|
less and css
|
7 years ago |
|
windy
|
4becec327c
|
Merge pull request #141 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit 'e930bb1a9cada2a9dd2e63d352378b05e856801e':
修改
|
7 years ago |
|
windy
|
e930bb1a9c
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~windy/fineui
|
7 years ago |
|
windy
|
d21b65229a
|
修改
|
7 years ago |
|
imp
|
ddc495042b
|
Merge pull request #140 in ~GUY/fineui from ~IMP/fineui_guy:master to master
* commit 'c47a3916ea3d70928a1b40e8c375f1bc5ea14f8c':
silder
update
|
7 years ago |
|
imp
|
c47a3916ea
|
silder
|
7 years ago |
|
imp
|
19e10b61fb
|
Merge branch 'master' of ssh://www.finedevelop.com:7999/~imp/fineui_guy
|
7 years ago |
|
imp
|
a996073fca
|
update
|
7 years ago |
|
guy
|
47c747456d
|
Merge pull request #95 in FUI/fineui from ~GUY/fineui:master to master
* commit 'b49c9fca9b08dc59a8a6085d34c00efc669d7246':
修改提交
文档完善
update
update slider
add color_choose_popup
update
修改
update docs
add slider
|
7 years ago |
woodyjang
|
b49c9fca9b
|
解决冲突
|
7 years ago |
|
woodyjang
|
6a4d678f22
|
修改提交
|
7 years ago |
|
woodyjang
|
f1a8d6f4bd
|
文档完善
|
7 years ago |
|
windy
|
cb62578adc
|
Merge pull request #138 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit 'cb83b411b14225d28679e8d9582c93efea360b41':
update
|
7 years ago |
|
windy
|
cb83b411b1
|
update
|
7 years ago |
iapyang
|
9ee6cd69bb
|
update slider
|
7 years ago |
