windy
|
4b742aa0a5
|
merge: build
|
6 years ago |
|
windy
|
07581ca91d
|
Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui
# Conflicts:
# dist/2.0/fineui.ie.min.js
# dist/2.0/fineui.min.js
# 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
|
5a065f6d07
|
Merge pull request #878 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '7d7ce0801b0afb2fccb6df44bac2dd93df94c5e8':
DEC-6986 fix:ie10以下无背景会鼠标穿透
|
6 years ago |
|
dailer
|
7d7ce0801b
|
DEC-6986 fix:ie10以下无背景会鼠标穿透
|
6 years ago |
|
windy
|
b7dbd09c12
|
BI-42011 fix: single_select_insert_combo的添加值交互与复选框统一
|
6 years ago |
guy
|
efc5740e88
|
Merge pull request #876 in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'cb4808861a774b2019c9f3114518fa93cefde04b':
context
|
6 years ago |
|
guy
|
cb4808861a
|
context
|
6 years ago |
windy
|
d925432af8
|
Merge pull request #875 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit 'ad31e7ca18a3d0fdcf97183e3c4e429b0e4124ef':
BI-41630 fix: 视觉统一
|
6 years ago |
|
windy
|
ad31e7ca18
|
BI-41630 fix: 视觉统一
|
6 years ago |
|
windy
|
cbd591ebd3
|
Merge pull request #874 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '7a5f076dae69126104c431e405c4079c4918991a':
DEC-6957 fix: IE11下textarea输入回车不换行 && 视觉调整
|
6 years ago |
|
windy
|
7a5f076dae
|
DEC-6957 fix: IE11下textarea输入回车不换行 && 视觉调整
|
6 years ago |
|
windy
|
19675501c6
|
Merge pull request #873 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '35a349e1af8757483ec60e84ff0d145c864b56f8':
refactor: 还原
merge: build一下
BI-41691 refactor: 视觉加一组深色边框线
|
6 years ago |
|
windy
|
35a349e1af
|
refactor: 还原
|
6 years ago |
|
windy
|
473ec783a6
|
merge: build一下
|
6 years ago |
|
windy
|
508379e3f0
|
BI-41691 refactor: 视觉加一组深色边框线
|
6 years ago |
|
guy
|
f0d9efc981
|
Merge pull request #872 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '8f081f616ccaeb61b029f41be37a834d307d4a9d':
build
|
6 years ago |
|
guy
|
77c7e279f1
|
Merge pull request #870 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '1c79394691827ca287d3441529d7fefba81c4757':
merge: build一下
merge
BI-41691 refactor: checkbox默认宽高和Event报错
|
6 years ago |
|
dailer
|
8f081f616c
|
build
|
6 years ago |
|
windy
|
1c79394691
|
merge: build一下
|
6 years ago |
|
windy
|
074cd45c2c
|
Merge pull request #869 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '419301326803e1d192595b060c6b327074e48125':
update
|
6 years ago |
|
windy
|
ab4e7915e8
|
merge
|
6 years ago |
|
windy
|
54ef35cc92
|
Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui
# Conflicts:
# dist/2.0/fineui.ie.js
# dist/2.0/fineui.ie.min.js
# dist/2.0/fineui.js
# dist/2.0/fineui.min.js
# dist/bundle.ie.js
# dist/bundle.ie.min.js
# dist/bundle.js
# dist/bundle.min.js
# dist/core.js
# dist/fineui.ie.js
# dist/fineui.ie.min.js
# dist/fineui.js
# dist/fineui.min.js
# dist/fineui_without_jquery_polyfill.js
# dist/utils.min.js
# src/core/shortcut.js
|
6 years ago |
|
windy
|
9c813c584c
|
BI-41691 refactor: checkbox默认宽高和Event报错
|
6 years ago |
|
dailer
|
4193013268
|
update
|
6 years ago |
|
guy
|
b30a54d37f
|
Merge pull request #868 in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'ccc4eae1274f33892ac8dfd07f1ba1ad20a884a9':
组件注册
|
6 years ago |
|
guy
|
ccc4eae127
|
组件注册
|
6 years ago |
|
Dailer
|
4e34541897
|
Merge pull request #867 in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '5b227e9b99b8587d704b1f196acfd9647fb5205c':
无JIRA任务 baseCls 和 less 文件中定义的类名不一致
|
6 years ago |
|
dailer
|
5b227e9b99
|
无JIRA任务 baseCls 和 less 文件中定义的类名不一致
|
6 years ago |
|
guy
|
2d5b64c9f4
|
Merge pull request #866 in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'd6db584cb5c5aa7e26f6d94437658459010526e5':
布局
布局
|
6 years ago |
|
guy
|
d6db584cb5
|
布局
|
6 years ago |
|
guy
|
5a635569f8
|
布局
|
6 years ago |
|
guy
|
b4109f0235
|
Merge pull request #865 in VISUAL/fineui from ~GUY/fineui:master to master
* commit '497e2c6813626e15c47088b45f4ecbf9d7063c3b':
布局
|
6 years ago |
|
guy
|
59cf540c80
|
Merge pull request #864 in VISUAL/fineui from ~GUY/fineui:master to master
* commit '50e7592e2c0c6839067734d4e58203722a994aad':
布局
|
6 years ago |
|
guy
|
50e7592e2c
|
Merging in latest from upstream (VISUAL/fineui:refs/heads/master)
* commit 'b6cabc91549cf22e9a65b832feb8b50952a65798':
无JIRA style: 更新一下字体文件
|
6 years ago |
 Frank.Qiu
|
b6cabc9154
|
Merge pull request #863 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master
* commit 'fd3638a7b436ad9d3d64c7d983d6bc2e73cb6e4b':
无JIRA style: 更新一下字体文件
|
6 years ago |
|
guy
|
497e2c6813
|
布局
|
6 years ago |
|
guy
|
1e2fa7a78b
|
布局
|
6 years ago |
qcc
|
fd3638a7b4
|
无JIRA style: 更新一下字体文件
|
6 years ago |
|
guy
|
d392b04a74
|
Merge pull request #858 in VISUAL/fineui from ~WINDY/fineui:master to master
* commit '8512a45a4528b050013206eaa38877994cf1b0af':
refactor: build
merge
merge
无JIRA任务 fix: adapt布局考虑strech
DEC-6878 fix: disabled状态下的样式改了 && 还原common.less
|
6 years ago |
|
windy
|
8512a45a45
|
refactor: build
|
6 years ago |
|
windy
|
5a5e722f5d
|
Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui
# Conflicts:
# dist/2.0/fineui.ie.min.js
# dist/2.0/fineui.min.css
# dist/2.0/fineui.min.js
# dist/bundle.ie.min.js
# dist/bundle.min.css
# dist/bundle.min.js
# dist/fineui.ie.min.js
# dist/fineui.min.css
# dist/fineui.min.js
# dist/utils.min.js
|
6 years ago |
|
guy
|
380f81acca
|
Merge pull request #862 in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'e5fb91a3079a83c139fd48044c0db7b2b8389ec8':
布局
|
6 years ago |
|
guy
|
e5fb91a307
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
guy
|
5b2a52819f
|
布局
|
6 years ago |
|
windy
|
912948e8fe
|
merge
|
6 years ago |
|
windy
|
706c71aaa1
|
Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui
# Conflicts:
# dist/2.0/fineui.ie.min.js
# dist/2.0/fineui.min.css
# dist/2.0/fineui.min.js
# dist/bundle.ie.min.js
# dist/bundle.min.css
# dist/bundle.min.js
# dist/fineui.ie.min.js
# dist/fineui.min.css
# dist/fineui.min.js
# dist/utils.min.js
|
6 years ago |
|
guy
|
cf802a7576
|
Merge pull request #861 in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'abef8dcee41ed37d04c4abe8ae0148f154fa7583':
布局
|
6 years ago |
|
windy
|
cc513fcfb0
|
merge
|
6 years ago |
|
guy
|
abef8dcee4
|
布局
|
6 years ago |
|
windy
|
10accb7991
|
Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui
# Conflicts:
# dist/2.0/fineui.ie.min.js
# dist/2.0/fineui.min.css
# dist/2.0/fineui.min.js
# dist/bundle.ie.min.js
# dist/bundle.min.css
# dist/bundle.min.js
# dist/fineui.ie.min.js
# dist/fineui.min.css
# dist/fineui.min.js
# dist/utils.min.js
|
6 years ago |
