superman
69c03601d2
Merge pull request #708 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'c8ee32c761be35bce2ce20baa6f8b1f372eba83e':
4 years ago
Kara
c8ee32c761
Pull request #706 : Final/10.0
...
Merge in DESIGN/design-i18n from ~JEO/design-i18n:final/10.0 to final/10.0
* commit 'cdf97173c4d5bf4fee0a5b892e8f6a6c0e63d10c': (25 commits)
REPORT-26209 国际化crm模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-14912 国际化
CHART-14928 数据格式改为数据形式
CHART-12124 国际化
REPORT-26209 国际化CRM模板->代码库同步
解决冲突
CHART-11549 修改箱型图条件属性界面
REPORT-26209 国际化CRM模板->代码库同步
无jira任务 打包
REPORT-35463 添加了“BUG需求反馈”和“技术支持”的KEY
REPORT-26209 国际化CRM模板->代码库同步
CHART-9760 国际化
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
系列和数据点提示界面
整理数据集数据
REPORT-35307 将原本的「校验出错信息」,改为「不满足校验公式则提示」并国际化
...
4 years ago
superman
0253dcb500
Merge pull request #701 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'd9c4e848df01fee52fab15b80cd81d226c8b0762':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
superman
d9c4e848df
Merge pull request #700 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'cdf97173c4d5bf4fee0a5b892e8f6a6c0e63d10c':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
cdf97173c4
Pull request #693 : REPORT-26209 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '9aaaa9abe6b516d0a34612e5994c49cd87f2707c':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
superman
c2846d7319
Merge pull request #697 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '82d58dadf349452ce83f90e1c8157269160293ad':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
82d58dadf3
Merge pull request #696 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '3a614dce600f0dea72b37219927d7630f005f65c':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
9aaaa9abe6
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
3a614dce60
Pull request #692 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'ee394c234da5fc0822562333b20cd31689f58c84':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
ee394c234d
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
80fdce7209
Merge pull request #679 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '0e0bdaca6320731d79226a537f19b54c0a79d6c5':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
0e0bdaca63
Merge pull request #678 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'e8225f7e5343b9e4d66889ad4780f90e1d329879':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
e8225f7e53
Pull request #675 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'aa0a0a761a5f5547235755ec40c11907a44c0d84':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
aa0a0a761a
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
1e9a285c50
Merge pull request #674 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'c3bec9605aa697fc484d259e2f26f9f2011bcf51':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
c3bec9605a
Merge pull request #669 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'bfde8b0ed619f2399e5a82cd53da2a491fd90e48':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
bfde8b0ed6
Pull request #658 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '18c6d7442f940527e7c26b64ee7cfda67c837f7e':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
18c6d7442f
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
6cbc464140
Merge pull request #657 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '57a9695f7229d5e82f6ba5065a5953213e9110eb':
CHART-14912 国际化
4 years ago
superman
57a9695f72
Merge pull request #656 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '0688726f79db6e5408f19332f04673da739f3816':
CHART-14912 国际化
4 years ago
Bjorn
0688726f79
Pull request #653 : CHART-14912 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0
* commit 'c5baf199b92bcefc9f4660c2ee6c9b28faea0366':
CHART-14912 国际化
4 years ago
白岳
c5baf199b9
CHART-14912 国际化
4 years ago
superman
2dd8db48a8
Merge pull request #652 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'c8f0d73eefdd037ed6d15d9d6ca6a9512c3bd90a':
CHART-14928 数据格式改为数据形式
4 years ago
superman
c8f0d73eef
Merge pull request #651 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'dc92f74d341600166c6309a40fd74883beec1b19':
CHART-14928 数据格式改为数据形式
4 years ago
superman
dc92f74d34
Merge pull request #648 in DESIGN/design-i18n from bugfix/10.0 to release/10.0
...
* commit '07b80814a0841b1ce267b8a87c9b5bcd1554f2e9':
无jira任务 打包
REPORT-26837 国际化
4 years ago
Qinghui.Liu
4186cce3af
Pull request #647 : CHART-14928 数据格式改为数据形式
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit 'e4cd9f2484a82e759b8bcfb1ff0907398494ddb6':
CHART-14928 数据格式改为数据形式
4 years ago
Qinghui.Liu
e4cd9f2484
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
4 years ago
Qinghui.Liu
8dc44323bf
CHART-14928 数据格式改为数据形式
4 years ago
superman
01e7e3f268
Merge pull request #646 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '07b80814a0841b1ce267b8a87c9b5bcd1554f2e9':
CHART-12124 国际化
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
07b80814a0
Merge pull request #645 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c16a0f4be9e7c518b3b78599bab821a42d8d9e57':
CHART-12124 国际化
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
c16a0f4be9
Pull request #641 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'cc275051ee78d049516efecea2eec1bb0088d647':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
Bjorn
3658c0d3f0
Pull request #642 : CHART-12124 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0
* commit 'b98c883513f6913893d1711e3e8e426ef1fe1e13':
CHART-12124 国际化
4 years ago
白岳
b98c883513
CHART-12124 国际化
4 years ago
lidongy
cc275051ee
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
afc8eaf8bf
Merge pull request #632 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '019432cd81d22a9dc2da7c9c384b29db11d755d8':
解决冲突
CHART-11549 修改箱型图条件属性界面
4 years ago
superman
019432cd81
Merge pull request #631 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '6fd6c99cedb3308ec2aed42118d8773bec8bf594':
解决冲突
CHART-11549 修改箱型图条件属性界面
4 years ago
Qinghui.Liu
6fd6c99ced
Pull request #628 : CHART-11549 修改箱型图条件属性界面
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit '12b09c6c25d58b8004baea8d80f2c51579632991':
解决冲突
CHART-11549 修改箱型图条件属性界面
4 years ago
Qinghui.Liu
12b09c6c25
解决冲突
4 years ago
Qinghui.Liu
5f95094e77
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
4 years ago
Qinghui.Liu
6f4c259f6a
CHART-11549 修改箱型图条件属性界面
4 years ago
superman
2f38c95d69
Merge pull request #627 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '3c6b3e7e0c1ff6c370a33522ce0c6d28c436d9b2':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
3c6b3e7e0c
Merge pull request #626 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'b01bae16a8029ecb8472bf98f05cd64426800563':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
b01bae16a8
Pull request #623 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'aaa112990679048c14fd4a9a12849f820b17da2d':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
aaa1129906
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
95f195e36f
Merge pull request #618 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '94db00241a2acf3d9f43898050ec7c4402d5982b':
4 years ago
superman
94db00241a
Merge pull request #617 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c9073f48a0459d086fd394e24507cf0744e46c83':
4 years ago
superman
c9073f48a0
Merge pull request #616 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '2df2a99ea276369b1150ffa3eec3a902050611b2':
4 years ago
superman
2df2a99ea2
Merge pull request #615 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'c42ff1745760fafccafaef51d9f61f0dabd7d4e7':
4 years ago
superman
c42ff17457
Merge pull request #614 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit '7d19a3f31a37a7a654db2552942c961f3227e7a3':
4 years ago
superman
baeeaa38f5
Merge pull request #605 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'cb70fd406ec60bf976f961291223d20d764c43bb':
无jira任务 打包
REPORT-35463 添加了“BUG需求反馈”和“技术支持”的KEY
REPORT-26209 国际化CRM模板->代码库同步
4 years ago