Zhenfei.Li
|
1dacd25e5a
|
解决冲突时多提交了一些代码。删掉
|
6 years ago |
Zhenfei.Li
|
264baf812d
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~zhenfei.li/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 |
Zhenfei.Li
|
07325d390e
|
Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui
|
6 years ago |
windy
|
e4de592bd8
|
Merge pull request #769 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '7ce0e1c96f05448cb271872a8031a855829389d0':
update
无JIRA任务 title跟随问题
|
6 years ago |
windy
|
7ce0e1c96f
|
update
|
6 years ago |
windy
|
9c7ff8c507
|
无JIRA任务 title跟随问题
|
6 years ago |
Zhenfei.Li
|
d68de05a51
|
视觉让修改一下字体族,并增加无衬线字体族名称
|
6 years ago |
guy
|
ff149dd3f5
|
Merge pull request #767 in VISUAL/fineui from ~IMP/fineui_fui:master to master
* commit 'ba339f86f2e73ec01e37b9db5ef1d1ffeb18afbc':
添加函数
|
6 years ago |
imp
|
ba339f86f2
|
添加函数
|
6 years ago |
Kira
|
5b2a0d97cd
|
Merge pull request #766 in VISUAL/fineui from ~KIRA/fineui:master to master
* commit '45857de7c98af14dcce43a2081d049186ec4a9e9':
BI-34683 图标库更新
|
6 years ago |
Kira
|
45857de7c9
|
BI-34683 图标库更新
|
6 years ago |
windy
|
c62ce2a339
|
Merge pull request #764 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '6f01a0fab5130ffa4144acd12a4e9494f5ec3dbb':
update
BI-34242 气泡弹窗默认direction为bottom,left
|
6 years ago |
windy
|
6f01a0fab5
|
update
|
6 years ago |
windy
|
85804de500
|
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
|
2aa593716b
|
Merge pull request #765 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '446b715101fd3c8b4602747b18495a4cef0fd99e':
无jira任务,文件上传控件无合法文件的时候不应当发EVENT_CHANGE事件
|
6 years ago |
Dailer
|
446b715101
|
无jira任务,文件上传控件无合法文件的时候不应当发EVENT_CHANGE事件
|
6 years ago |
windy
|
e836c5afa8
|
BI-34242 气泡弹窗默认direction为bottom,left
|
6 years ago |
windy
|
374bcfa6a4
|
Merge pull request #763 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '338ab665063514c78b508d3ded85b19f977a7e65':
update
BI-34242 弹窗内容最大高度
无JIRA任务 和horizontal对齐
|
6 years ago |
windy
|
338ab66506
|
update
|
6 years ago |
windy
|
f5571a84c5
|
BI-34242 弹窗内容最大高度
|
6 years ago |
windy
|
f514445af1
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui
|
6 years ago |
windy
|
9eb67922be
|
无JIRA任务 和horizontal对齐
|
6 years ago |
windy
|
7a089b61b2
|
Merge pull request #762 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '2ce12cec9f82321c6a0ea1ba1c84f6cf199333ea':
无JIRA任务 alert层级
|
6 years ago |
windy
|
2ce12cec9f
|
Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui
|
6 years ago |
windy
|
fb156ea7a0
|
无JIRA任务 alert层级
|
6 years ago |
windy
|
8d148af0b9
|
Merge pull request #761 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '624455acdd1b6d7b42860262ca0630c45a80b52b':
无JIRA任务 file.js修改一下
无JIRA任务 换一下deepExtend
|
6 years ago |
windy
|
624455acdd
|
无JIRA任务 file.js修改一下
|
6 years ago |
windy
|
4117224c60
|
无JIRA任务 换一下deepExtend
|
6 years ago |
guy
|
75bd7305df
|
Merge pull request #760 in VISUAL/fineui from ~IMP/fineui_fui:master to master
* commit 'af000b90f660ea0a52ef4710503663a0cd6433d3':
BI-34250 大小调整
|
6 years ago |
imp
|
af000b90f6
|
BI-34250 大小调整
|
6 years ago |
Young
|
72431551e0
|
Merge pull request #759 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '44cca97c3c264430f5e79c0da5df90327f010f12':
update
无JIRA任务 确定取消调整高度后,masker偏移要调一下
|
6 years ago |
windy
|
44cca97c3c
|
update
|
6 years ago |
windy
|
2bfb9a2bb9
|
无JIRA任务 确定取消调整高度后,masker偏移要调一下
|
6 years ago |
windy
|
97204ddfc3
|
Merge pull request #758 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '95767e23c743bfe589141b797d8eeff793db8b7d':
BI-34242 popover不需要关心横向滚动
|
6 years ago |
windy
|
95767e23c7
|
BI-34242 popover不需要关心横向滚动
|
6 years ago |
Dailer
|
83f6eb8fa1
|
Merge pull request #757 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '6eb3a978382f16a3a02de81741ad0257970d3e46':
无jira任务,复选列表的demo有个小问题.
|
6 years ago |
Dailer
|
6eb3a97838
|
无jira任务,复选列表的demo有个小问题.
|
6 years ago |
windy
|
d92bebe6a2
|
Merge pull request #756 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '121317b3498d4a37311d0388b760958f4d32a9c0':
update
update
BI-32702 新增display:table布局以及adapt布局规则
|
6 years ago |
windy
|
121317b349
|
update
|
6 years ago |
windy
|
2907ed3486
|
update
|
6 years ago |
windy
|
fa1519155d
|
BI-32702 新增display:table布局以及adapt布局规则
|
6 years ago |
windy
|
5b324e9e8e
|
Merge pull request #755 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit 'f168af2bae9de7003627721448b46426724229ad':
无JIRA任务 el要包一下放置gap叠加
|
6 years ago |
windy
|
f168af2bae
|
无JIRA任务 el要包一下放置gap叠加
|
6 years ago |
windy
|
c100207d26
|
Merge pull request #754 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '8228fa3ff44ef1d44ef64ba6afc3645187d457d5':
BI-34248 calendar的排版根据周首的配置决定
|
6 years ago |
windy
|
8228fa3ff4
|
BI-34248 calendar的排版根据周首的配置决定
|
6 years ago |
windy
|
a21c1660e7
|
Merge pull request #753 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '84ffa84856e9a1f4a4a485541da1d0320361e50c':
update
BI-34242 气泡视觉统一 && 代码整理
|
6 years ago |
windy
|
84ffa84856
|
update
|
6 years ago |
windy
|
ca9613e2dc
|
BI-34242 气泡视觉统一 && 代码整理
|
6 years ago |
Teller
|
26ef374498
|
Merge pull request #752 in VISUAL/fineui from ~TELLER/fineui:feature-5.1/feature to master
* commit '1327a0cf2145e42f804457c6820eaeeae446597c':
BI-34245
|
6 years ago |
iapyang
|
1327a0cf21
|
BI-34245
|
6 years ago |