Hades
|
04dc95569b
|
Merge pull request #1549 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'bfe2d205322f0fd4fb8b5a684cacd710120c3775':
REPORT-28701 设计器-文件选择器优化,替换为系统原生文件选择弹窗
|
5 years ago |
Hades
|
e2c2899760
|
Merge pull request #1548 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '746ca6e969cceace13b8eef3511b281d6c5fe84b':
REPORT-28907 同步fire && REPORT-28351 强转问题同步到release && MOBILE-26199 提供tab标题样式接口
|
5 years ago |
Qinghui.Liu
|
3c9245c79c
|
CHART-12817 修改显示策略文案和默认值
|
5 years ago |
hades
|
bfe2d20532
|
REPORT-28701 设计器-文件选择器优化,替换为系统原生文件选择弹窗
|
5 years ago |
hades
|
746ca6e969
|
REPORT-28907 同步fire && REPORT-28351 强转问题同步到release && MOBILE-26199 提供tab标题样式接口
|
5 years ago |
Hades
|
9ecbf7576c
|
Merge pull request #1545 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'ba343eb2b487f9c3c278fffd5c8efb35b0f4cb00':
REPORT-29003 错误报告问题
|
5 years ago |
Bjorn
|
a79effce52
|
Merge pull request #1546 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '3f3c67455862e0aa4dfc1a8dfd997a45edcb0903':
CHART-11709 代码质量
CHART-11709
CHART-11709 自定义配色设置优化
|
5 years ago |
Hades
|
70452bee41
|
Merge pull request #1547 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'd2713dced7d238913526a90fab781f1c40f5955e':
REPORT-28351 强转问题
|
5 years ago |
白岳
|
3f3c674558
|
CHART-11709 代码质量
|
5 years ago |
hades
|
d2713dced7
|
REPORT-28351 强转问题
|
5 years ago |
白岳
|
011f0098d8
|
CHART-11709
|
5 years ago |
白岳
|
6b3a7dc6ff
|
CHART-11709 自定义配色设置优化
|
5 years ago |
Kara
|
5245903fcc
|
Merge pull request #1544 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '57115393825ba779904ec9f52c7a8f84da3ff3f5':
REPORT-29003 错误报告问题
|
5 years ago |
hades
|
5711539382
|
REPORT-29003 错误报告问题
|
5 years ago |
hades
|
ba343eb2b4
|
REPORT-29003 错误报告问题
|
5 years ago |
Kara
|
0a1982c324
|
Merge pull request #1543 in DESIGN/design from ~JEO/report-design:final/10.0 to final/10.0
* commit '4ab79ba72139765353af1df014af0e325b2b9806': (316 commits)
REPORT-28830 提示优化
REPORT-28894 多次切换远程的问题 && xml不可读处理
fix mac下不用awt的库读写
REPORT-28873
REPORT-28792 表单添加tab块问题
fix dock name
fix 遗漏
REPORT-28846 && REPORT-28830 && REPORT-27109
REPORT-27106 && REPORT-28229
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
CHART-13064 修改含有自动button的颜色选择器高度
fix import
REPORT-27106 && REPORT-27144
CHART-13065 调整字符间距
CHART-13063 修改试管仪表盘布局文案
REPORT-28186 mac出现短暂原生java图标问题
REPORT-28368 死锁问题 常量不需要每次读取
REPORT-28257 && REPORT-28257
合代码冲突
REPORT-28368 死锁问题 常量不需要每次读取
...
|
5 years ago |
jeo
|
4ab79ba721
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
# designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
|
5 years ago |
Hades
|
55d062d235
|
Merge pull request #1541 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '630e28c14701ed8ea2bf808c455b4443ef2c7483':
REPORT-28830 提示优化
|
5 years ago |
hades
|
630e28c147
|
REPORT-28830 提示优化
|
5 years ago |
Hades
|
74ddb8790e
|
Merge pull request #1540 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '8dd916387bbd87b8a36b6bc919ecc246b0696bf9':
REPORT-28894 多次切换远程的问题 && xml不可读处理
|
5 years ago |
hades
|
8dd916387b
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
5 years ago |
hades
|
ef9e7cf130
|
REPORT-28894 多次切换远程的问题 && xml不可读处理
|
5 years ago |
Hades
|
a79377fb4a
|
Merge pull request #1539 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '3b042ad1d84b525c5f90324f53bf392b96dc6621':
fix mac下不用awt的库读写
REPORT-28873
REPORT-28792 表单添加tab块问题
|
5 years ago |
hades
|
3b042ad1d8
|
fix mac下不用awt的库读写
|
5 years ago |
hades
|
48f0d92f78
|
REPORT-28873
|
5 years ago |
hades
|
1a8bf02e6c
|
REPORT-28792 表单添加tab块问题
|
5 years ago |
Hades
|
76967f3c0a
|
Merge pull request #1538 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a691ce2f76d823aba88a97fc1cfe290c30690e34':
fix dock name
fix 遗漏
REPORT-28846 && REPORT-28830 && REPORT-27109
|
5 years ago |
hades
|
a691ce2f76
|
fix dock name
|
5 years ago |
hades
|
c2a9b82806
|
fix 遗漏
|
5 years ago |
hades
|
0a5213bd15
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
5 years ago |
hades
|
0107dc1f7d
|
REPORT-28846 && REPORT-28830 && REPORT-27109
|
5 years ago |
Hades
|
391898c918
|
Merge pull request #1537 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '81b36cdd4185f3e883626d6cd56471821859ad94':
REPORT-27106 && REPORT-28229
|
5 years ago |
richie
|
65d8d522cf
|
Merge pull request #1533 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '455caa72fcdf5f86332d325bd64f1bdcc81c81a6':
无JIRA任务 升级新的JxBrowser+language level提升到1.8
无JIRA任务 第三方短信服务器接口
|
5 years ago |
hades
|
81b36cdd41
|
REPORT-27106 && REPORT-28229
|
5 years ago |
Hades
|
0bb39046f5
|
Merge pull request #1535 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '91c9b0535d35dbdb087e44c7052e9b450659412f':
fix import
REPORT-27106 && REPORT-27144
|
5 years ago |
Harrison
|
0ca385d1f6
|
Merge pull request #1534 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit 'c24078b110d2eec4077b2956150e4e84be8efa85':
REPORT-27647 模板组件的安装下载-模板组件复用插件 图片需要先加载进去。 set 的时候就晚了
|
5 years ago |
Qinghui.Liu
|
3877a21cf4
|
Merge pull request #1536 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '76f3423349e4b955828404c771221b77e6926a37':
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
CHART-13064 修改含有自动button的颜色选择器高度
CHART-13065 调整字符间距
CHART-13063 修改试管仪表盘布局文案
|
5 years ago |
Qinghui.Liu
|
76f3423349
|
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
|
5 years ago |
Qinghui.Liu
|
235422b755
|
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
|
5 years ago |
Qinghui.Liu
|
c4e900ef74
|
CHART-13064 修改含有自动button的颜色选择器高度
|
5 years ago |
hades
|
91c9b0535d
|
fix import
|
5 years ago |
hades
|
4c89737094
|
REPORT-27106 && REPORT-27144
|
5 years ago |
Qinghui.Liu
|
29c32eaee5
|
CHART-13065 调整字符间距
|
5 years ago |
Harrison
|
c24078b110
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
图片需要先加载进去。 set 的时候就晚了
|
5 years ago |
Qinghui.Liu
|
d5e6daeff9
|
CHART-13063 修改试管仪表盘布局文案
|
5 years ago |
richie
|
455caa72fc
|
无JIRA任务 升级新的JxBrowser+language level提升到1.8
|
5 years ago |
richie
|
448827b14a
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '50d9d36180a069769470b1fe9cbedfb7b68ff631':
无jira 同步到feature
REPORT-27647 模板组件的安装下载-模板组件复用插件 处理下可能的 npe
REPORT-27647 模板组件的安装下载-模板组件复用插件 修复部分监听上的问题
|
5 years ago |
richie
|
50d9d36180
|
Merge pull request #1532 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '2379bd527e5778ac60b58ceefdc0f07aebf6e236':
无jira 同步到feature
|
5 years ago |
hades
|
2379bd527e
|
无jira 同步到feature
|
5 years ago |
Hades
|
6877b95101
|
Merge pull request #1531 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a4584870bd2fa7b88e18d18c7233ffbd7e341208':
REPORT-28186 mac出现短暂原生java图标问题
REPORT-28368 死锁问题 常量不需要每次读取
|
5 years ago |