 caoyanyi
|
acc26ba24d
|
Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
# db/update20.0.beta2.sql
# lib/zin/func.php
# lib/zin/wg/fileselector/v1.php
# lib/zin/wg/upload/v1.php
# module/action/model.php
# module/backup/js/index.ui.js
# module/block/lang/vi.php
# module/block/ui/recentprojectblock.html.php
# module/block/zen.php
# module/common/lang/vi.php
# module/custom/lang/vi.php
# module/execution/js/kanban.ui.js
# module/execution/ui/story.html.php
# module/kanban/js/view.ui.js
# module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
# module/metric/test/calc/project/rate/cv_in_waterfall.php
# module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
# module/mr/control.php
# module/mr/ui/browsebyexecution.html.php
# module/product/zen.php
# module/programplan/zen.php
# module/project/model.php
# module/repo/lang/de.php
# module/repo/lang/en.php
# module/repo/lang/fr.php
# module/repo/lang/zh-cn.php
# module/space/ui/createapplication.html.php
# module/testcase/ui/view.html.php
# module/upgrade/model.php
# www/js/zui3/zen-editor/p-0aaccc7e.js
# www/js/zui3/zen-editor/p-276dd30f.js
# www/js/zui3/zen-editor/p-2b13cc9a.js
# www/js/zui3/zen-editor/p-38d18c5d.js
# www/js/zui3/zen-editor/p-3f6cad83.js
# www/js/zui3/zen-editor/p-51e3a048.js
# www/js/zui3/zen-editor/p-617d463f.js
# www/js/zui3/zen-editor/p-62c0132e.js
# www/js/zui3/zen-editor/p-6d22490c.js
# www/js/zui3/zen-editor/p-a563f50b.js
# www/js/zui3/zen-editor/p-bf31230c.js
# www/js/zui3/zen-editor/p-c6c95773.js
# www/js/zui3/zen-editor/p-d83dd3f0.js
# www/js/zui3/zen-editor/p-d8bedd14.js
# www/js/zui3/zen-editor/p-eaaa4129.js
# www/js/zui3/zen-editor/zen-editor.esm.js
# www/js/zui3/zui.zentao.css
# www/js/zui3/zui.zentao.js
|
2024-05-06 09:17:49 +08:00 |
|
|
liugang
|
1c13a31e99
|
* Rename $lang->colon to $lang->hyphen.
|
2024-04-28 14:35:26 +08:00 |
|
|
caoyanyi
|
3c929d3108
|
* Adjust unit test include class path.
|
2024-04-26 14:17:14 +08:00 |
|
|
liyang
|
354c300c86
|
* Modify unit test directory structure and data generation method.
|
2024-04-22 14:25:50 +08:00 |
|
|
dingguodong
|
926744bf4f
|
- Remove vi.php.
|
2024-04-17 09:11:48 +08:00 |
|
|
caoyanyi
|
2733df29ac
|
* Update copyright info.
|
2023-12-06 17:23:01 +08:00 |
|
|
caoyanyi
|
afc78deb2f
|
* Replace ChanzhiEPS to ZenTaoPMS.
|
2023-12-06 17:23:01 +08:00 |
|
|
caoyanyi
|
8e17266f28
|
* Update commit link info.
|
2023-12-06 13:42:44 +08:00 |
|
|
caoyanyi
|
a33ad4ad71
|
* Update copyright year.
|
2023-12-05 13:32:52 +08:00 |
|
|
hufangzhou
|
7fabe7858b
|
* Merge 18.9 weekly module.
|
2023-11-28 16:18:50 +08:00 |
|
|
zhouxin
|
77a2da90d9
|
* Batch modify quote for unit test.
|
2023-05-25 13:43:27 +08:00 |
|
|
zhouxin
|
4efea42989
|
+ Move unit test from test directory to each module.
|
2023-04-24 02:16:47 +00:00 |
|
|
caoyanyi
|
9ffce9d8a7
|
* Modify project lang to variable.
|
2023-03-06 10:19:48 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
王怡栋
|
ac066acdc9
|
Merge branch 'master_xieqiyu_83681' into 'master'
* Code for task#83681.
See merge request easycorp/zentaopms!6863
|
2023-02-06 09:23:47 +00:00 |
|
|
xieqiyu
|
91efd85783
|
* Code for task#83681.
|
2023-02-06 15:56:49 +08:00 |
|
|
wangyuting2
|
775c16402c
|
* Optimize code.
|
2023-02-06 13:24:45 +08:00 |
|
|
wangyuting2
|
34e4445859
|
* Fix the bug of not updating the weekly report.
|
2023-02-06 13:07:03 +08:00 |
|
|
wangyidong
|
2f03f91cf4
|
* adjust code.
|
2023-01-04 13:31:58 +08:00 |
|
|
wangyidong
|
9d013b80c5
|
* fix bug for compute weekly.
|
2023-01-04 10:28:52 +08:00 |
|
|
wangyidong
|
ccec9bcc16
|
Merge branch 'zentaopms279'
|
2023-01-03 08:39:33 +08:00 |
|
|
wangyidong
|
f85db70c20
|
* adjust for save weekly.
|
2022-12-30 14:46:20 +08:00 |
|
|
wangyidong
|
7c3958183f
|
* code for task #81412,81413.
|
2022-12-29 15:33:40 +08:00 |
|
|
chaideqing
|
c5790ca6e0
|
* Fix feedback1843.
|
2022-12-28 14:33:50 +08:00 |
|
|
wangyidong
|
56c5cac759
|
* code for task #81410.
|
2022-12-28 14:32:22 +08:00 |
|
|
wangyidong
|
aed2c5e2a2
|
* code for task #81417.
|
2022-12-27 11:01:08 +08:00 |
|
|
wangyidong
|
2da63834b3
|
* code for task #81407,81416,81417.
|
2022-12-27 10:53:23 +08:00 |
|
|
hufangzhou
|
d839f6f593
|
* Handle feedback #1479.
|
2022-11-28 05:10:00 +00:00 |
|
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
|
孙广明
|
3fc7602e08
|
Merge branch 'mayue_feedback#1261' into 'master'
Finish feedback#1261
See merge request easycorp/zentaopms!5907
|
2022-10-27 02:34:31 +00:00 |
|
|
mayue
|
426a116e96
|
* Finish feedback #1261.
|
2022-10-26 16:38:45 +08:00 |
|
|
陈涛
|
b606f8ba3a
|
Resolve feedback #785
|
2022-10-26 05:35:02 +00:00 |
|
|
陈涛
|
b878528be2
|
Resolve feedback #785
|
2022-10-26 03:08:44 +00:00 |
|
|
wangyidong
|
d300ee00da
|
Merge branch 'master' into zentaopms_239
|
2022-09-30 09:07:53 +08:00 |
|
|
liuyongkai
|
ca23350435
|
* Fix ui.
|
2022-09-23 07:49:04 +00:00 |
|
|
liuyongkai
|
0c9b2f4e94
|
* Fix ui.
|
2022-09-23 06:49:28 +00:00 |
|
|
dingyongliang
|
09e50c54e8
|
* task #70014, rm zebra bg.
|
2022-09-23 05:35:11 +00:00 |
|
|
liuyongkai
|
5bdea0af1d
|
* Finish stroy 35042.
|
2022-09-15 05:57:31 +00:00 |
|
|
liuyongkai
|
18c3f1637f
|
* Finish story 35042.
|
2022-09-15 03:14:23 +00:00 |
|
|
liuruogu
|
939602ade2
|
* Do task #69012.
|
2022-09-15 00:48:26 +00:00 |
|
|
liuruogu
|
7d02ac1f96
|
* Finish task #69012.
|
2022-09-14 08:59:36 +00:00 |
|
|
liuruogu
|
d1fbc1068b
|
* Finish task #69012.
|
2022-09-14 08:51:17 +00:00 |
|
|
liuruogu
|
41fad5460c
|
* Finish task #69012.
|
2022-09-14 08:41:29 +00:00 |
|
|
liuruogu
|
d6c8e4d1d9
|
* Finish task #69012.
|
2022-09-14 08:37:20 +00:00 |
|
|
wangyidong
|
0881e39c54
|
* adjust for multi task.
|
2022-09-09 16:14:08 +08:00 |
|
|
wangyidong
|
fdc9b93d82
|
* adjust for upgrade and holiday.
|
2022-09-08 16:08:03 +08:00 |
|
|
wangyidong
|
cf1399e0f6
|
* adjust for unit test.
|
2022-09-08 11:35:25 +08:00 |
|
|
wangyidong
|
4092d95876
|
* code for task #68204.
|
2022-09-07 15:01:27 +08:00 |
|
|
wangyidong
|
d7dfd0fd3b
|
* fix bug.
|
2022-09-07 11:55:48 +08:00 |
|
|
wangyidong
|
a8a703bf16
|
* finish task #68203.
|
2022-09-07 11:08:48 +08:00 |
|