Commit Graph

  • 9f8fdd4e21 Merge pull request #1467 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-12-18 17:01:50 +0800
  • 994a230a7d Merge pull request #1466 in DESIGN/design-i18n from final/10.0 to persist/10.0 10.0.12.2020.12.17 superman 2020-12-17 18:54:18 +0800
  • f50b89bd17 Merge pull request #1454 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-12-15 17:02:47 +0800
  • 9a4edfd0d8 Merge pull request #1453 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-12-15 17:02:14 +0800
  • 5dda39a330 Merge pull request #1452 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-12-15 17:01:36 +0800
  • 6807010d62 Merge pull request #1451 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-12-15 17:01:15 +0800
  • 6b5d1dddd6 Pull request #1449: CHART-15835 国际化 Bjorn 2020-12-15 14:37:01 +0800
  • 8303cd9eb1 CHART-15835 国际化 白岳 2020-12-15 14:14:46 +0800
  • c5aa0cc6a4 Merge pull request #1448 in DESIGN/design-i18n from release/10.0 to final/10.0 superman 2020-12-14 17:40:40 +0800
  • 52b7f6b5a2 Merge pull request #1442 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-12-13 17:03:12 +0800
  • e7ac2ae509 Merge pull request #1441 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-12-13 17:02:29 +0800
  • 39de66c2c3 Merge pull request #1440 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-12-13 17:02:07 +0800
  • c836020cc3 Merge pull request #1439 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-12-13 17:01:38 +0800
  • adeaf8e05d Merge pull request #1438 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-12-13 17:01:10 +0800
  • a68496f69f Merge pull request #1437 in DESIGN/design-i18n from final/10.0 to persist/10.0 superman 2020-12-13 10:05:17 +0800
  • e41e68708a Merge pull request #1431 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-12-11 17:22:46 +0800
  • 2e35af60d2 Merge pull request #1430 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-12-11 17:22:10 +0800
  • 573ee15075 Merge pull request #1429 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-12-11 17:21:24 +0800
  • a8b61bbb0b Pull request #1426: REPORT-26209 chore: 国际化crm模板->代码库同步 lidongy 2020-12-11 10:22:34 +0800
  • c3955533d7 REPORT-26209 chore: 国际化crm模板->代码库同步 lidongy 2020-12-11 10:08:04 +0800
  • f9c82cbd88 REPORT-26209 chore: 国际化crm模板->代码库同步 lidongy 2020-12-11 09:11:22 +0800
  • 51568d19be Merge pull request #1425 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-12-10 17:04:43 +0800
  • 9b74e4b35b Merge pull request #1424 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-12-10 17:03:58 +0800
  • 3550d08ffe Merge pull request #1423 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-12-10 17:02:07 +0800
  • 27175ef30b Pull request #1415: MOBILE-30240 移动端控件顺序名字改下 修正中文字段值 wei 2020-12-10 08:42:00 +0800
  • 9faca1b32e Merge remote-tracking branch 'upstream/release/10.0' into release/10.0 johntsai 2020-12-09 14:43:14 +0800
  • 812f927568 MOBILE-30240 移动端控件顺序名字改下 修正中文字段值 johntsai 2020-12-09 14:39:37 +0800
  • 156510bd03 Merge pull request #1414 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-12-08 17:01:22 +0800
  • ebde5bc188 Pull request #1409: REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化 Henry.Wang 2020-12-08 15:08:56 +0800
  • fb6b6875fc REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化 Henry.Wang 2020-12-07 17:17:44 +0800
  • a3d4f00c43 Merge pull request #1383 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-12-02 18:29:40 +0800
  • 61614d7a2c Merge pull request #1382 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-12-02 17:24:57 +0800
  • 27a0086e15 Merge pull request #1381 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-12-02 17:01:29 +0800
  • 87e0d2902e Merge pull request #1380 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-12-02 17:01:05 +0800
  • 66e1e6fcd4 Merge pull request #1379 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-12-02 17:00:45 +0800
  • 5495c98bfb Pull request #1378: CHART-17209 地图配置 eason 2020-12-02 16:50:54 +0800
  • 280498df90 Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~eason/design-i18n into release/10.0 eason 2020-12-02 16:49:00 +0800
  • 2bb4970bba fix:CHART-17209 地图配置 eason 2020-12-02 16:48:50 +0800
  • 8225965bef Merge pull request #1377 in DESIGN/design-i18n from bugfix/10.0 to release/10.0 superman 2020-12-02 15:53:15 +0800
  • cf2ce793eb Merge pull request #1374 in DESIGN/design-i18n from final/10.0 to persist/10.0 superman 2020-12-01 17:06:49 +0800
  • a458fa7bb5 Merge pull request #1340 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-25 19:33:55 +0800
  • af413dc5c8 Merge pull request #1339 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-11-25 19:33:21 +0800
  • f7ec40d8ed Merge pull request #1338 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-25 19:32:56 +0800
  • 720ac9d375 Merge pull request #1337 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-11-25 19:32:27 +0800
  • 789c5868ad Merge pull request #1336 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-11-25 17:00:51 +0800
  • 3712a226f8 Merge pull request #1335 in DESIGN/design-i18n from final/10.0 to persist/10.0 10.0.11.2020.11.25 superman 2020-11-25 11:01:46 +0800
  • 15ede4645f Merge pull request #1324 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-24 11:05:25 +0800
  • 7c796f8270 Merge pull request #1318 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-11-23 17:06:46 +0800
  • a1b282b5f3 Merge pull request #1317 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-23 17:06:30 +0800
  • 9104b8187c Pull request #1314: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-11-23 09:36:55 +0800
  • fb34b6d461 REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-11-22 23:45:14 +0800
  • 43353f9b9e Merge pull request #1298 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-19 19:23:38 +0800
  • 737e91f153 Merge pull request #1297 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-11-19 17:54:44 +0800
  • 44c44c8ba9 Merge pull request #1296 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-19 17:00:58 +0800
  • 9e1fc2dd3d Merge pull request #1295 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-11-19 17:00:44 +0800
  • c2ccbb4e28 Pull request #1293: REPORT-42606 国际化显示问题 Kara 2020-11-19 11:39:41 +0800
  • f6f288e732 REPORT-42606 国际化显示问题 hades 2020-11-19 11:37:14 +0800
  • 04772de14b Merge pull request #1292 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-18 17:03:22 +0800
  • 2eb7aa8578 Merge pull request #1291 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-11-18 17:02:17 +0800
  • 0104f77b8b Merge pull request #1290 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-18 17:01:25 +0800
  • 1795fc7885 Merge pull request #1289 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-11-18 17:00:31 +0800
  • b87c5a0b77 Merge pull request #1287 in DESIGN/design-i18n from release/10.0 to final/10.0 superman 2020-11-18 15:41:23 +0800
  • a87bb48280 Pull request #1286: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-11-18 13:32:30 +0800
  • 250ef66a5b REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-11-18 10:13:03 +0800
  • 4e113587e3 Merge pull request #1280 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-16 17:34:55 +0800
  • 6f8d8e187d Pull request #1279: 无jira任务,解决冲突 ju 2020-11-16 17:34:19 +0800
  • 467caff3be Merge branch 'bugfix/10.0' of ssh://code.fineres.com:7999/~kerry/design-i18n into feature/10.0 kerry 2020-11-16 17:31:14 +0800
  • cf6b9a1606 Merge pull request #1277 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-16 17:00:43 +0800
  • f18d17479a Pull request #1269: REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-11-16 10:52:28 +0800
  • 70c21ef800 REPORT-26209 chore:国际化crm模板->代码库同步 lidongy 2020-11-15 16:46:24 +0800
  • 8ccbd06d31 调整 lidongy 2020-11-15 15:34:30 +0800
  • 27eaa1f077 Merge pull request #1262 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-13 17:03:07 +0800
  • 726c8560f6 Merge pull request #1261 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-11-13 17:02:18 +0800
  • 1e050ac339 Merge pull request #1260 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-13 17:01:45 +0800
  • 66301d580c Merge pull request #1259 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-11-13 17:01:06 +0800
  • d1d229be8e Merge pull request #1258 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-11-13 17:00:38 +0800
  • ba364c4fe1 Merge pull request #1257 in DESIGN/design-i18n from final/10.0 to persist/10.0 superman 2020-11-13 16:27:27 +0800
  • 67da7d7e42 Merge pull request #1206 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-04 20:15:22 +0800
  • 82a95b6c6e Merge pull request #1205 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-11-04 20:15:18 +0800
  • 0c0c50bbdc Merge pull request #1204 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-04 20:15:14 +0800
  • 2a3c14a37b Pull request #1196: REPORT-35149 增加国际化key kerry 2020-11-04 17:22:22 +0800
  • f90fc88658 Merge pull request #1201 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-04 17:01:13 +0800
  • d469aecfb3 Merge pull request #1200 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-11-04 17:00:48 +0800
  • 0aa38f6875 Merge pull request #1199 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-11-04 17:00:29 +0800
  • 041db5442e REPORT-35149 增加国际化key kerry 2020-11-04 16:55:10 +0800
  • 3192e7ed55 Merge pull request #1195 in DESIGN/design-i18n from bugfix/10.0 to release/10.0 superman 2020-11-04 16:13:53 +0800
  • c5e668f1e4 Merge pull request #1179 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-11-02 09:58:57 +0800
  • 0c12a0b226 Pull request #1178: 无jira 解决冲突 ju.ju 2020-10-30 18:09:36 +0800
  • 146515f46b 无jira 解决冲突 hades 2020-10-30 18:02:35 +0800
  • 03ce10412a Merge pull request #1176 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-30 17:34:53 +0800
  • b55176a406 Pull request #1173: REPORT-35149 预定义样式功能feature合到release kerry 2020-10-30 14:45:48 +0800
  • 6cb20ba768 修改 kerry 2020-10-30 10:52:50 +0800
  • 552e0b09c9 REPORT-35149 预定义样式功能feature合到release kerry 2020-10-30 10:46:10 +0800
  • 6c06d03fde Merge pull request #1172 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-29 17:03:43 +0800
  • 122197019a Merge pull request #1171 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 superman 2020-10-29 17:03:28 +0800
  • c1a3daa484 Merge pull request #1170 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 superman 2020-10-29 17:02:50 +0800
  • a1ff334a8b Merge pull request #1169 in DESIGN/design-i18n from final/10.0 to release/10.0 superman 2020-10-29 17:02:25 +0800
  • ef3b6c3e60 Merge pull request #1168 in DESIGN/design-i18n from persist/10.0 to final/10.0 superman 2020-10-29 17:00:45 +0800
  • 0af4d12cd6 Merge pull request #1164 in DESIGN/design-i18n from final/10.0 to persist/10.0 superman 2020-10-29 16:57:01 +0800
  • 6766403ad6 Merge pull request #1161 in DESIGN/design-i18n from feature/10.0 to research/10.0 superman 2020-10-28 18:26:57 +0800