Commit Graph

  • f21c6a89ae Pull request #1160: 无jira 解决冲突 Hades 2020-10-28 17:39:46 +0800
  • 0d341d52eb 无jira 解决冲突 hades 2020-10-28 17:36:04 +0800
  • 9d02c89074 Merge pull request #1157 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-28 17:02:53 +0800
  • c6204d7c4e Pull request #1147: REPORT-40646 远程设计对接平台密码策略 国际化 Hades 2020-10-28 16:56:00 +0800
  • 8c7e94c7ea Merge pull request #1154 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-27 18:07:06 +0800
  • 3f91298768 Merge pull request #1153 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-27 17:52:39 +0800
  • 95459aa7e3 Merge pull request #1152 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-27 17:01:37 +0800
  • 7f776f25ee Merge pull request #1151 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-10-27 17:00:47 +0800
  • 39aea41712 Pull request #1148: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-27 17:00:18 +0800
  • e88c0d71fb Merge pull request #1150 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-10-27 17:00:18 +0800
  • 91c6dc45d4 Merge pull request #1149 in DESIGN/design-i18n from final/10.0 to persist/10.0 superman 2020-10-27 16:50:24 +0800
  • c808a5d3b4 Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~lidongy/design-i18n into release/10.0 lidongy 2020-10-27 15:37:32 +0800
  • 22f2a2182f REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-27 15:37:19 +0800
  • b8b47a8775 Pull request #1146: CHART-15902 分类轴标签显示方式界面 Qinghui.Liu 2020-10-27 14:06:26 +0800
  • 3546624b8d REPORT-40646 远程设计对接平台密码策略 国际化 hades 2020-10-27 11:49:48 +0800
  • d3c5aa88f2 Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0 Qinghui.Liu 2020-10-27 11:09:49 +0800
  • 07a94e3a24 CHART-15902 分类轴标签显示方式界面 Qinghui.Liu 2020-10-26 17:18:52 +0800
  • 680f82cd93 Merge pull request #1145 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-26 17:01:00 +0800
  • 6ff0ff3a09 Merge pull request #1139 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-26 10:47:17 +0800
  • d86be5066b Merge pull request #1138 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-26 10:24:52 +0800
  • 7218dda0c1 Merge pull request #1137 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-10-26 10:24:37 +0800
  • ff6e1d70d2 Merge pull request #1134 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-10-24 17:00:16 +0800
  • 6d8ed4225d Merge pull request #1133 in DESIGN/design-i18n from final/10.0 to persist/10.0 superman 2020-10-23 17:45:33 +0800
  • 6689a3ebff Merge pull request #1132 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-23 17:01:25 +0800
  • 87f2a55c97 Merge pull request #1131 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-23 17:00:57 +0800
  • ffb23a902e Merge pull request #1130 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-23 17:00:41 +0800
  • 94412f4d40 Pull request #1127: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-23 16:04:43 +0800
  • 7cabd12131 REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-23 11:37:02 +0800
  • 0354377fa9 Merge pull request #1112 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-21 19:33:45 +0800
  • e7ee4c4d25 Merge pull request #1111 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-21 19:11:45 +0800
  • fb9c2b7558 Merge pull request #1110 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-21 17:01:45 +0800
  • c29214af51 Merge pull request #1109 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-10-21 17:01:24 +0800
  • 389f225b45 Merge pull request #1108 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-10-21 17:00:53 +0800
  • caa05bfefb Merge pull request #1107 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-20 18:33:36 +0800
  • 716ee00ab2 Merge pull request #1106 in DESIGN/design-i18n from final/10.0 to persist/10.0 10.0.10.2020.10.20 superman 2020-10-20 18:24:10 +0800
  • 9210cb6ea0 Pull request #1101: REPORT-41753【预定义样式】如果新设计器远程老jar,显示的默认预定义不是兼容 kerry 2020-10-20 17:20:50 +0800
  • 42c09e417e REPORT-41753【预定义样式】如果新设计器远程老jar,显示的默认预定义不是兼容 kerry 2020-10-20 14:24:12 +0800
  • 0191c85eb9 Merge pull request #1090 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-19 12:55:17 +0800
  • 72603e697a Pull request #1080: REPORT-35149 增加不支持tab的提示 kerry 2020-10-19 09:18:04 +0800
  • 09d6bee3e7 Merge pull request #1085 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-16 17:01:09 +0800
  • 4bef9167bb Merge pull request #1084 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-16 17:00:48 +0800
  • 2dcd137500 Merge pull request #1083 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-16 17:00:27 +0800
  • 4559e79b3f REPORT-35149 增加不支持tab的提示 kerry 2020-10-16 15:28:22 +0800
  • 446dd69dde Pull request #1079: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-16 09:32:24 +0800
  • 6f43d7ecf5 REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-16 09:15:45 +0800
  • 596b2235cc Merge pull request #1078 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-15 18:03:46 +0800
  • 490b80d10f Merge pull request #1074 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-15 18:03:02 +0800
  • 4f89612753 Merge pull request #1073 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-15 17:25:00 +0800
  • b51fb6bfd2 Merge pull request #1072 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-10-15 17:00:36 +0800
  • 6fd0351658 Merge pull request #1070 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-15 09:24:51 +0800
  • c57cac09cc Merge pull request #1068 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-15 09:24:37 +0800
  • 7a0542beb3 Merge pull request #1069 in DESIGN/design-i18n from release/10.0 to final/10.0 superman 2020-10-15 09:16:59 +0800
  • affcb75c86 Merge pull request #1067 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-14 17:00:23 +0800
  • 334bf1b396 Pull request #1064: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-14 13:32:07 +0800
  • 681b216f7b REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-14 10:40:31 +0800
  • 20811cf7b5 Merge pull request #1058 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-12 17:31:37 +0800
  • 6da5cc2b9e Merge pull request #1057 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-12 17:31:17 +0800
  • c34c63c811 Merge pull request #1056 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-12 17:00:25 +0800
  • a329402dd3 Pull request #1053: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-12 16:49:12 +0800
  • 6fe1e52bdc REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-10-12 11:21:38 +0800
  • db23a4bd41 Pull request #1047: 无jira 解决冲突 Hades 2020-10-10 18:03:02 +0800
  • 7d3d289bd1 无jira 解决冲突 hades 2020-10-10 17:51:35 +0800
  • 962a35c96b Merge pull request #1045 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-10 17:23:57 +0800
  • b7bbd32872 Merge pull request #1044 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-10 17:00:21 +0800
  • 4fa39117ce Pull request #1041: CHART-15940 标签增加文本方向 Qinghui.Liu 2020-10-10 09:36:44 +0800
  • 410e7151f1 CHART-15940 解决国际化文件冲突 Qinghui.Liu 2020-10-09 18:11:19 +0800
  • 82e3711257 Pull request #990: Research/10.0 ju.ju 2020-09-30 17:53:52 +0800
  • c6dae44cb3 Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/design/design-i18n into research/10.0 ju 2020-09-30 17:53:13 +0800
  • 034c2d7a2f Pull request #988: REPORT-26209 chore:国际化crm模板->代码库同步 ju.ju 2020-09-30 17:45:29 +0800
  • 7e45f88df9 Merge branch 'bugfix/10.0' of ssh://code.fineres.com:7999/~ju/design-i18n-111 into feature/10.0 ju 2020-09-30 17:44:35 +0800
  • af23f0d325 Merge pull request #986 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-09-30 17:00:16 +0800
  • bbe4a15677 Merge pull request #983 in DESIGN/design-i18n from bugfix/10.0 to release/10.0 superman 2020-09-30 16:01:01 +0800
  • f48c528d66 Pull request #982: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-09-30 11:02:06 +0800
  • a58cabc6f0 REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-09-30 09:42:57 +0800
  • 1a56396f7a Pull request #975: REPORT-35149 预定义样式优化及与图表统一 kerry 2020-09-30 09:20:53 +0800
  • 110f355ade REPORT-35149 预定义样式优化及与图表统一 kerry 2020-09-29 17:20:49 +0800
  • ea759d6958 Merge pull request #965 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-09-27 20:14:00 +0800
  • 7a1abdb4e3 Merge pull request #964 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-09-27 20:13:30 +0800
  • 5c535d5122 Merge pull request #963 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-09-27 20:12:43 +0800
  • f1686631cd Merge pull request #962 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-09-27 20:12:06 +0800
  • aa73c7679c Merge pull request #961 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-09-27 20:11:31 +0800
  • bc1683f439 Pull request #960: 无jira任务, final/10.0 合 persist/10.0 10.0.9.2020.09.27 Kara 2020-09-27 20:07:52 +0800
  • 170328f3fb Merge pull request #934 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-09-25 09:49:35 +0800
  • 195d48b02a Pull request #933: 无jira 解决冲突 ju.ju 2020-09-25 09:49:13 +0800
  • a8a927fe75 无jira 解决冲突 hades 2020-09-25 09:47:20 +0800
  • a2a0d07e3c 无jira 解决冲突 hades 2020-09-25 09:18:48 +0800
  • 0b401908d2 Merge pull request #930 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-09-25 09:04:36 +0800
  • db1f35a6fb Pull request #924: REPORT-38516 【回归】模板重命名界面,输入框显示不全 Yvan 2020-09-23 17:01:27 +0800
  • 34b2e1a3a1 Pull request #925: CHART-15510 标签增加文本方向 Qinghui.Liu 2020-09-23 17:00:16 +0800
  • 0edc91cfef Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0 Qinghui.Liu 2020-09-23 12:47:26 +0800
  • 3e4594254e REPORT-39338 【回归】内置服务器启动进度条会先展示上次的进度再初始化 更新修改方案:不改变弹窗大小,将原本文字标签setPreferredSize注释掉,在FlowLayout布局下,标签大小会自适应,另外测试的时候发现在日语和韩语下文字显示不全,这是个以前就存在的问题,与产品和国际化同学沟通了,精简翻译,这次顺便一起改了 CHART-15905 最新的release插件,打开cpt空白,打开frm的,右侧面板打不开 【问题原因】之前改动的UISpinner,添加了一种传参为double、double、double、int的构造方法,与另一个原有的double、double、double、double冲突了,因为代码内很多地方都是传了四个int值进来,然后被绑定了新添加的那种构造方法 【改动思路】将新添加的构造方法传参修改为double、double、double、double、int,对第四个double值进行判断,如果等于Double.MIN_VALUE,就不做处理,否则正常设置为defaultValue Yvan 2020-09-23 09:36:58 +0800
  • 5a2626ead1 Merge pull request #923 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-09-22 17:00:44 +0800
  • ebb3d68a34 标签增加文本方向 Qinghui.Liu 2020-09-22 11:47:38 +0800
  • 04a3dbc062 Pull request #918: CHART-15566 国际化 Bjorn 2020-09-22 10:36:10 +0800
  • f72c932f6d CHART-15566 国际化 白岳 2020-09-22 10:08:47 +0800
  • 1521e1ebad Merge pull request #902 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-09-19 17:00:23 +0800
  • 2a4611e6d3 Merge pull request #901 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-09-19 17:00:20 +0800
  • 114f84a751 Merge pull request #900 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-09-19 17:00:17 +0800
  • e605f4cb00 Pull request #892: CHART-15510 调整富文本标签和数据点提示界面 eason 2020-09-18 17:11:42 +0800
  • c0c8bb5acc Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0 Qinghui.Liu 2020-09-18 16:27:12 +0800