Commit Graph
4271 Commits
Author SHA1 Message Date
zhouxin 7f920398c9 + Add unit test for computeTaskProgress and computeTasksProgress. 2023-04-26 10:49:14 +00:00
caoyanyi 24f75dd73b * Modify files get. 2023-04-25 10:49:10 +08:00
wangyidong 54d513129a * fix bug #34599. 2023-04-25 09:11:47 +08:00
管西迎 bdffadde69 Merge pull request 'unit_test' (#7) from unit_test into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/7
2023-04-24 16:48:51 +08:00
Hao Sun 8f349a2723 * zin: rename historyRecord to history 2023-04-24 15:40:40 +08:00
Hao Sun 0096b1c907 * zin: remove unused wgs 2023-04-24 15:39:33 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
hufangzhou 92175b0f48 * Fix bug #31818. 2023-04-21 16:51:39 +08:00
dingyongliang 4c606b9e41 * zin: refactor assignto. 2023-04-21 14:06:01 +08:00
liumengyi c6adbbc62b * Fix bug #32414. 2023-04-20 15:53:53 +08:00
liumengyi 01ffcbef5d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-20 15:22:32 +08:00
wangyidong a8f88d0178 * fix bug #33393. 2023-04-20 14:39:46 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
朱金勇 51a43d37d6 * Fix date display in task module. 2023-04-19 04:34:10 +00:00
liumengyi 168ebe2b56 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 09:08:44 +08:00
朱金勇 b310d35aac * Fix bug#34345. 2023-04-19 00:57:05 +00:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
朱金勇 c9637a0418 * Fix bug#34305. 2023-04-18 04:22:09 +00:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
朱金勇 3385f5d6e4 * Fix multiple task. 2023-04-17 08:18:39 +00:00
liumengyi b4baf69899 * Finish task #91355. 2023-04-17 09:28:08 +08:00
朱金勇 7969effc29 * Fix bug#34139, 34238, 34075. 2023-04-16 13:54:16 +00:00
朱金勇 e074e17dc8 * Fix bugs of dmdb. 2023-04-16 11:53:19 +00:00
dingyongliang ef28810ad4 * zin: add task assignto ui. 2023-04-07 16:10:13 +08:00
dingyongliang 83f777790b * zin: use Camel-Case. 2023-04-04 11:05:47 +08:00
dingyongliang 6d9e2b0fc7 * zin: add history record. 2023-03-27 17:22:20 +08:00
wangyidong aac5f7c4d2 * fix bug for maxcount config. 2023-03-23 14:49:40 +08:00
liumengyi fbf1a7a0bb * Fix bug #33093. 2023-03-20 07:26:56 +00:00
guofeilong d2f0e788fa * Code for bug #33060 . 2023-03-17 11:08:31 +08:00
管西迎 497ac481b8 Merge branch 'bugfix/32939_lmy' into 'master'
* Fix bug #32939.

See merge request easycorp/zentaopms!7216
2023-03-16 08:40:00 +00:00
liumengyi c18770de91 * Fix bug #32939. 2023-03-16 08:28:27 +00:00
liumengyi 5b3bef53c9 * Fix bug #33018. 2023-03-16 07:35:29 +00:00
孙广明 41538eb1db Merge branch 'feature/38477' into 'master'
* Fix bug of task #87014.

See merge request easycorp/zentaopms!7190
2023-03-15 05:38:41 +00:00
liumengyi 196f9035e9 * Modify language item. 2023-03-15 00:36:12 +00:00
liumengyi 5b546fd987 * Fix bug of task #87014. 2023-03-15 00:28:45 +00:00
liumengyi eeb106132c * Fix bug of task #87014. 2023-03-15 00:19:22 +00:00
liumengyi 6a5966d8ca * Fix bug of task #87013. 2023-03-14 09:20:55 +00:00
孙广明 d235b8e924 Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.

See merge request easycorp/zentaopms!7184
2023-03-14 09:15:08 +00:00
liumengyi 1d16c63d87 * Fix bug of task #87013. 2023-03-14 08:57:00 +00:00
liumengyi 0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00:00
tianshujie c524e23d7e * Skip form staging. 2023-03-13 14:00:16 +08:00
caoyanyi 1328ae82bc * Update project common language. 2023-03-07 15:38:49 +08:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
wangxuepeng f5699a3420 * Fix bug #85660. 2023-03-03 06:58:17 +00:00
wangxuepeng b611790d8c * Fix bug #85660. 2023-03-03 06:52:39 +00:00
wangxuepeng 843d2898fa * Fix bug #85660. 2023-03-02 07:57:13 +00:00
wangxuepeng 5c99963d4d * Fix bug #85660. 2023-03-02 05:48:00 +00:00
Yagami 477c1fe2f2 * Fix bug #32577. 2023-03-02 09:19:05 +08:00
Yagami bb6e606e90 * Fix bug #32566. 2023-03-01 16:56:15 +08:00