guy
|
6a1117283e
|
Merge branch 'BI4.1' of http://cloud.finedevelop.com:2015/scm/fui/fineui
# Conflicts:
# bi/core.js
# dist/bundle.min.js
|
7 years ago |
|
guy
|
2ffc1ec534
|
update
|
7 years ago |
|
guy
|
c97797e2de
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~guy/fineui
# Conflicts:
# dist/bundle.min.js
|
7 years ago |
|
guy
|
22952abb49
|
update
|
7 years ago |
|
guy
|
7ee3a09d52
|
update
|
7 years ago |
|
guy
|
7c0464579c
|
update
|
7 years ago |
windy
|
cdeae3ff2b
|
Merge pull request #285 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit 'b749a4007aecb74283481ec6815994e7e80b296b':
button的warning状态
|
7 years ago |
windy
|
b749a4007a
|
button的warning状态
|
7 years ago |
|
guy
|
0370544d19
|
update
|
7 years ago |
|
windy
|
b4dc7f0b65
|
Merge pull request #284 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit '2eefbb2ec15a75424a600816c8f40b65a6b652d3':
增加light-highlight和light-negative
|
7 years ago |
|
windy
|
2eefbb2ec1
|
增加light-highlight和light-negative
|
7 years ago |
|
guy
|
844eafe098
|
update
|
7 years ago |
Young
|
851707813b
|
Merge pull request #283 in ~GUY/fineui from ~YOUNG/fineuig:master to master
* commit '5e22ddb74f72ce967c8b9ed474bae80dbb174462':
update
箭头方向问题
|
7 years ago |
|
Young
|
5e22ddb74f
|
update
|
7 years ago |
|
Young
|
2b59ba54b2
|
箭头方向问题
|
7 years ago |
|
windy
|
aabb3234b6
|
Merge pull request #282 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit '7dbd902d2d43f237876e67231feaa07081e9e991':
update
sql.editor可以插入字段参数
|
7 years ago |
|
windy
|
7dbd902d2d
|
update
|
7 years ago |
|
windy
|
420ee05cbd
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~windy/fineui
# Conflicts:
# dist/bundle.min.js
|
7 years ago |
|
windy
|
6210ceddfc
|
sql.editor可以插入字段参数
|
7 years ago |
|
guy
|
842a38f6a1
|
update
|
7 years ago |
|
guy
|
a53fac2cda
|
update
|
7 years ago |
|
guy
|
c07a97316f
|
update
|
7 years ago |
|
guy
|
b872e08bd5
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
guy
|
88c882be07
|
update
|
7 years ago |
|
guy
|
81b675fab0
|
Merge pull request #219 in FUI/fineui from ~GUY/fineui:master to master
* commit 'ccf20dd0196d50f07dfb96b16011e5f40495cbc7':
update
|
7 years ago |
|
windy
|
ccf20dd019
|
Merge pull request #281 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit 'c60c44803658d4f599058b1e6ed9a098aafbb642':
update
|
7 years ago |
|
windy
|
c60c448036
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~windy/fineui
|
7 years ago |
|
windy
|
588d64e7b0
|
update
|
7 years ago |
|
guy
|
0bda0f93a5
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
guy
|
780c835166
|
update
|
7 years ago |
|
guy
|
ec1e874b30
|
Merge pull request #218 in FUI/fineui from ~GUY/fineui:master to master
* commit '267c4bd3ed4849615c7bb87b579624297cde96a8':
dist
灰化
update
relationview 标红
|
7 years ago |
imp
|
267c4bd3ed
|
Merge pull request #280 in ~GUY/fineui from ~IMP/fineui_guy:master to master
* commit '7f5596284427d24d8eb215e1b52b7b277c275c7e':
dist
|
7 years ago |
 imp
|
7f55962844
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~imp/fineui_guy
|
7 years ago |
|
imp
|
f68b447bd9
|
dist
|
7 years ago |
|
windy
|
892fad4fd6
|
Merge pull request #279 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit '93201d038adee44b34542fd084a23660809cd39d':
灰化
|
7 years ago |
|
windy
|
93201d038a
|
灰化
|
7 years ago |
|
imp
|
817d888c86
|
Merge pull request #278 in ~GUY/fineui from ~IMP/fineui_guy:master to master
* commit '27d896aa71ea70c926ff2729dbfbc5a591e9925d':
update
|
7 years ago |
|
imp
|
27d896aa71
|
update
|
7 years ago |
|
windy
|
b22e2501cb
|
Merge pull request #277 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit '2b4033f7d06afbb1df3308536142f0343e467619':
relationview 标红
|
7 years ago |
|
windy
|
2b4033f7d0
|
relationview 标红
|
7 years ago |
|
guy
|
24fc83f1cd
|
Merge pull request #217 in FUI/fineui from ~GUY/fineui:master to master
* commit '09e5f9d3e211cc7d829634a52455b81e95ffc9b4':
样式
relationview支持联合主键
relationView同一层级的两个region高度不同，矮的那个下部的连线会少一截
|
7 years ago |
|
windy
|
09e5f9d3e2
|
Merge pull request #276 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit 'd6ba1ada5bfcc2d9fa6b6f231794080ec09afe27':
样式
|
7 years ago |
|
windy
|
d6ba1ada5b
|
样式
|
7 years ago |
|
windy
|
032138b31d
|
Merge pull request #275 in ~GUY/fineui from ~WINDY/fineui:master to master
* commit '4ca1f226b81677832f925713921ed18de0e61c6a':
relationview支持联合主键
relationView同一层级的两个region高度不同，矮的那个下部的连线会少一截
|
7 years ago |
|
windy
|
4ca1f226b8
|
relationview支持联合主键
|
7 years ago |
|
windy
|
7ec9d108db
|
relationView同一层级的两个region高度不同，矮的那个下部的连线会少一截
|
7 years ago |
|
guy
|
51aea8dcc6
|
update
|
7 years ago |
|
guy
|
793b4b305f
|
Merge pull request #216 in FUI/fineui from ~GUY/fineui:master to master
* commit '35be7fa841eaebbf5fb2ff520c11f6fab88ddb96':
select_level_tree的populate处理items
|
7 years ago |
 Frank.Qiu
|
35be7fa841
|
select_level_tree的populate处理items
|
7 years ago |
|
guy
|
b4e1934434
|
update
|
7 years ago |
