Commit Graph
510 Commits
Author SHA1 Message Date
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
liumengyi d2f30493a3 * Code format for task#54350. 2022-05-19 11:17:15 +08:00
liumengyi b8c091aa27 * Finish task #54350. 2022-05-18 15:17:51 +08:00
wangyidong 8aad51ace3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-18 10:29:11 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
tianshujie c0d9625c1d * Add testcase of kanban module. 2022-05-17 17:07:36 +08:00
tianshujie e2e88e4952 * Finish task #54391. 2022-05-17 14:53:43 +08:00
hufangzhou b9a60485c3 * Fix bug #22439. 2022-05-13 09:33:37 +08:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
lanzongjun 9b3b3b1e1a * fix bug #21988 2022-04-27 13:50:25 +08:00
tianshujie 0530b892e4 * Fix bug #18710. 2022-04-06 15:22:15 +08:00
tanghucheng 8f95192d7a * Fix bug #21034,21059. 2022-03-25 13:39:45 +08:00
liyuchun 07622ec7af * Fix bug #18151. 2022-03-24 16:21:06 +08:00
zhouxin 8d17a390c0 * Fix bug #15517. 2022-03-22 09:23:21 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zenggang ed17f3b7bb * Finish task#51105,51102 2022-03-18 05:17:53 +00:00
zenggang 70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
zhouxin 34696a7372 Fix bug #17224. 2022-03-16 08:05:15 +00:00
zenggang 4464d75123 * Finish task#50685,50680,50672 2022-03-16 05:20:20 +00:00
caoyanyi 1c14ab9738 * Modify dynamic datas. 2022-03-14 16:17:43 +08:00
zenggang 894689a7e3 * Fix bug#19819 2022-02-22 07:31:02 +00:00
liyuchun f02be68a50 * Fix bug #19438. 2022-02-11 14:52:02 +08:00
liyuchun fc724cd56e * Adjust language. 2022-02-11 08:53:47 +08:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
孙广明 72de0a1b9c Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
#   db/update16.2.sql
#   module/group/lang/resource.php
#   module/kanban/js/view.js
#   module/kanban/model.php
2022-01-24 07:28:48 +00:00
xieqiyu 8959feba2a * Optimize the code. 2022-01-24 12:07:16 +08:00
xieqiyu 895d345775 * Code for task#47991. 2022-01-24 09:59:49 +08:00
xieqiyu c582ffed5b * Code for task#47989. 2022-01-24 09:20:26 +08:00
xieqiyu 6e5e5f96f6 * Code for task#47993. 2022-01-23 20:34:31 +08:00
xieqiyu 71b287e1fa * Code for task#47987. 2022-01-23 19:37:44 +08:00
xieqiyu 1f79e9e7dd * Code for task#47995. 2022-01-22 22:24:49 +08:00
xieqiyu 0ffb6f3f8d * Code for task#47995. 2022-01-21 14:24:54 +08:00
liumengyi d0739e40e3 * Fix bug for task #47976. 2022-01-21 12:16:16 +08:00
liyuchun 5724bd4fc5 * Fix bug #18435,#18437. 2022-01-17 13:37:11 +08:00
liyuchun 19905f7eda * Fix bug #18450,18447. 2022-01-14 11:26:28 +08:00
王怡栋 f991a29236 Merge branch 'devops19' into 'devops19_liyuchun_47232'
# Conflicts:
#   module/sonarqube/lang/en.php
#   module/sonarqube/lang/zh-cn.php
#   module/sonarqube/view/browseproject.html.php
2022-01-14 00:48:58 +00:00
liyuchun 4bf49c5da7 * Finish task #47232. 2022-01-13 16:25:56 +08:00
caoyanyi e2d8d506b3 * Fix bug #18370,18371,18372,18379. 2022-01-13 05:08:08 +00:00
caoyanyi 8d303e4db1 * Finish task #47227. 2022-01-12 07:44:16 +00:00
liyuchun c5aaae3eb8 * Finish task #47233. 2022-01-12 14:16:34 +08:00
songchenxuan 721cdba3d3 *Case action lang. 2022-01-10 14:11:28 +08:00
songchenxuan 16670c5483 *Fix bug #18074. 2022-01-06 17:36:55 +08:00
songchenxuan 3e5df731bc *Fix bug #18074. 2022-01-06 17:32:48 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
李玉春 2bb6bb8825 Merge branch 'refactor' into 'master'
Refactor

See merge request easycorp/zentaopms!1229
2021-12-31 04:25:42 +00:00
liumengyi 3dd747f40a * Modify judgment for split chid plan. 2021-12-31 10:59:37 +08:00
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
liumengyi e0d72a4c25 * Refactoring code for update status. 2021-12-31 09:40:46 +08:00
zenggang bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
xieqiyu 2b7249da7a * Code for task#46521. 2021-12-30 08:47:06 +08:00