superman
|
ec49402e67
|
Merge pull request #889 in BA/design from ~SYOKI/design:release to release
* commit '883271c3265d8405c6fad907244ec53851497f4a':
【国际化修改】修改部分翻译 庄奇 syoki 20170523
|
7 years ago |
syoki
|
883271c326
|
【国际化修改】修改部分翻译 庄奇 syoki 20170523
|
7 years ago |
superman
|
d06178baf2
|
Merge pull request #888 in BA/design from ~RICHIE/design:release to release
* commit '8b0d6872d98491659721b39a4dce059f969a1e4e':
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
|
7 years ago |
richie
|
8b0d6872d9
|
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
|
7 years ago |
superman
|
9597aa2161
|
Merge pull request #885 in BA/design from ~PLOUGH/design:release to release
* commit 'ab36e7b5bb9a054f5cae40c377dfca513c061470':
REPORT-2675 部分国际化key找不到,加载顺序问题
|
7 years ago |
plough
|
ab36e7b5bb
|
REPORT-2675 部分国际化key找不到,加载顺序问题
|
7 years ago |
superman
|
6f651d744e
|
Merge pull request #881 in BA/design from ~PLOUGH/design:release to release
* commit 'd686f00e6f753efb602d2ff6eaae2b86b722224c':
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
7 years ago |
plough
|
d686f00e6f
|
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
7 years ago |
superman
|
1e55080808
|
Merge pull request #870 in BA/design from ~PLOUGH/design:release to release
* commit '77ccca677c51611cd7d4c769ec94103e8f3a5733':
REPORT-2644 master国际化问题
|
7 years ago |
plough
|
77ccca677c
|
merge
|
7 years ago |
superman
|
b75425f52a
|
Merge pull request #871 in BA/design from ~HUGH/design:release to release
* commit 'cc4994a9eb6feea66425bd927d98322045ac9a58':
去掉之前接口冗余操作
表单支持背景接口
增加限制,不允许添加同分组名的插件
|
7 years ago |
superman
|
dbdbeadae7
|
Merge pull request #872 in BA/design from ~SYOKI/design:release to release
* commit 'a1a46908205ad1eadadcad95e67eb650330a3a1e':
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
|
7 years ago |
syoki
|
a1a4690820
|
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
|
7 years ago |
hugh
|
cc4994a9eb
|
去掉之前接口冗余操作
|
7 years ago |
hugh
|
abc43081b6
|
表单支持背景接口
|
7 years ago |
hugh
|
3688b4f903
|
Merging in latest from upstream (BA/design:refs/heads/release)
* commit 'ee78c63f92afe56ea6112748becef733305a637b': (343 commits)
国际化
无JIRA任务,国际化翻译更新
无JIRA任务,国际化翻译更新
REPORT-2626 移除国际化文件中的无效key
REPORT-2626 移除国际化文件中的无效key
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
Signed-off-by: unknown <李晓丽>
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
REPORT-2483 & REPORT-2484 国际化key转移;外文版的国际化文件和中文版不一致
无JIRA任务 新release合并遗漏
无任务,line separator
REPORT-2537
无任务,冲突调整,release到dev
无JIRA任务,国际化,把release、master中的key合并到dev中
无JIRA任务,解决冲突
ct
ct
ct
ct
1
...
|
7 years ago |
plough
|
f66f6b7fa6
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~plough/design into release
|
7 years ago |
plough
|
fe74e83e73
|
REPORT-2644 master国际化问题
|
7 years ago |
superman
|
ee78c63f92
|
Merge pull request #865 in BA/design from ~PLOUGH/design:release to release
* commit 'bc4c93cdd666feaeae36ef64a4f654642b908557':
国际化
无JIRA任务,国际化翻译更新
无JIRA任务,国际化翻译更新
|
7 years ago |
plough
|
bc4c93cdd6
|
国际化
|
7 years ago |
plough
|
b98d554a41
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~plough/design into release
|
7 years ago |
plough
|
19934d8f12
|
无JIRA任务,国际化翻译更新
|
7 years ago |
plough
|
e51da95007
|
无JIRA任务,国际化翻译更新
|
7 years ago |
superman
|
87a2952e64
|
Merge pull request #862 in BA/design from ~LILY/design:release to release
* commit 'ce71b0ea0dce16214aff2e347588bd988a9ddb0b':
Signed-off-by: unknown <李晓丽>
|
7 years ago |
superman
|
32667bbdd5
|
Merge pull request #864 in BA/design from ~PLOUGH/design:release to release
* commit '7e78f2cff896043767bc2ea33499f7315f79034d':
REPORT-2626 移除国际化文件中的无效key
REPORT-2626 移除国际化文件中的无效key
|
7 years ago |
plough
|
7e78f2cff8
|
REPORT-2626 移除国际化文件中的无效key
|
7 years ago |
plough
|
d60a80e98e
|
REPORT-2626 移除国际化文件中的无效key
|
7 years ago |
superman
|
7c05e158f4
|
Merge pull request #863 in BA/design from ~SYOKI/design:release to release
* commit '4aef54dbd72b742031360cedb15ecd9c92b02918':
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
|
7 years ago |
syoki
|
4aef54dbd7
|
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
|
7 years ago |
unknown
|
ce71b0ea0d
|
Signed-off-by: unknown <李晓丽>
|
7 years ago |
superman
|
9d59d65b2c
|
Merge pull request #860 in BA/design from ~SYOKI/design:release to release
* commit '5a1c073c5adbb71830928ba49fa780c25602d987':
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
|
7 years ago |
syoki
|
5a1c073c5a
|
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
|
7 years ago |
superman
|
32d1e9198e
|
Merge pull request #855 in BA/design from ~PLOUGH/design:release to release
* commit '1bf142a0f61136fe01b8cffb1bf801c5b8b46b9e':
REPORT-2483 & REPORT-2484 国际化key转移;外文版的国际化文件和中文版不一致
|
7 years ago |
plough
|
1bf142a0f6
|
REPORT-2483 & REPORT-2484 国际化key转移;外文版的国际化文件和中文版不一致
|
7 years ago |
superman
|
813a4ca769
|
Merge pull request #852 in BA/design from ~ZACK/design:release to release
* commit '123a421b435cb713900bd8bebfabcbdcd58aea49':
无JIRA任务 新release合并遗漏
|
7 years ago |
superman
|
29351a19a1
|
Merge pull request #851 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '1f9e12a5e6f8c58eb2fd1e0cf0c551a78cf51d4e':
无任务,line separator
REPORT-2537
|
7 years ago |
zack
|
123a421b43
|
无JIRA任务 新release合并遗漏
|
7 years ago |
yaoh.wu
|
1f9e12a5e6
|
无任务,line separator
|
7 years ago |
yaoh.wu
|
d618c242ac
|
REPORT-2537
|
7 years ago |
superman
|
5149516688
|
Merge pull request #847 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit '329d11029ab8c9dff04a09364255e03b692d6df0':
无任务,冲突调整,release到dev
|
7 years ago |
yaoh.wu
|
329d11029a
|
无任务,冲突调整,release到dev
|
7 years ago |
superman
|
a43cb7488a
|
Merge pull request #846 in BA/design from ~PLOUGH/design:dev to dev
* commit '53f18866a267b3a97979306dc3dc73948089792d':
无JIRA任务,国际化,把release、master中的key合并到dev中
无JIRA任务,解决冲突
|
7 years ago |
plough
|
53f18866a2
|
无JIRA任务,国际化,把release、master中的key合并到dev中
|
7 years ago |
plough
|
860bfde6bc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
7 years ago |
plough
|
ee26840e53
|
无JIRA任务,解决冲突
|
7 years ago |
superman
|
3cde36a1ad
|
Merge pull request #833 in BA/design from ~PLOUGH/design:dev to dev
* commit 'a574cb0b6de6a0c358581086c4e659707f2f8182':
REPORT-2343 [代码质量]=>去掉多余代码
REPORT-2343 [代码质量]=>多次出现的字符串改为常量;统一命名
REPORT-2343 [代码质量]=>去掉无用代码
REPORT-2343 [代码质量]=>兼容之前的对象流读写
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取, 直接readObject不太好.
|
7 years ago |
superman
|
7597e86eba
|
Merge pull request #843 in BA/design from ~NEIL/design:release to dev
* commit '487e1b17c31dec3809a4581d75b439a0043c1774': (60 commits)
ct
ct
ct
ct
1
ct
REPORT-2526 tab交互改良后续--tab页签调整的视觉调整
框选改错啦。
无JIRA任务 master的boundsWidget到release
控件的框选问题
REPORT-2381 客户bug历史遗留问题,空指针引发控件属性面板生成失败最终导致报表切换失败
国际化修改 日文 design部分 第1-200个key修改翻译 庄奇 syoki
组件复用边界粘贴,之前考虑的片面了,修改下
组件复用边界复制
REPORT-2273 远程设计数据库连接成功,预览报错,datasourcexml保存失败问题修复
REPORT-2368 修改控件设置界面对“基本属性”面板的初始化
REPORT-2368 预定义控件设置了不可见,在参数面板上还是可见的
REPORT-1344 命名规范
无jira任务,代码被误杀了
report-1945 frm本地组件复用
...
|
7 years ago |
neil
|
487e1b17c3
|
ct
|
7 years ago |
neil
|
d0ebad3d07
|
ct
|
7 years ago |
neil
|
7801180007
|
Merge pull request #1 in ~NEIL/design from master to release
* commit '89240801d5b1d94e66d95824c6d4499c8143e8fe': (39 commits)
ct
无jira任务,代码被误杀了
report-1945 frm本地组件复用
面板中增加一些接口方法(Vancharts新插件发布需要,eason与FR商讨确认,可以直接修改master)
REPORT-2430 master收集的模板信息日志显示删掉
无JIRA任务 解决代码冲突
修复不能自定义参数面板控件标签的bug
调整布局
还原代码
调整布局
还原代码
调整布局
还原代码,修改客户bug
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
REPORT-2242 填报提交设置的若干问题修改
调整布局
调整布局
更改为aspectJ构建
还原修改
使用aspectJ构建
...
|
7 years ago |