Commit Graph
495 Commits
Author SHA1 Message Date
王怡栋 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
liumengyi 36e9b91ba0 * Finish task #46660. 2021-12-28 15:11:27 +08:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
liyuchun 178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
liumengyi 259bfef9d9 * Add Kanban View. 2021-12-23 10:30:56 +08:00
孙广明 75a3d20358 Merge branch 'master' into 'sprint/179_tianshujie_46241'
# Conflicts:
#   module/group/lang/resource.php
#   module/kanban/css/space.css
#   module/kanban/js/view.js
2021-12-22 06:03:21 +00:00
tianshujie dab44100d5 * Finish task #46241. 2021-12-22 13:16:32 +08:00
hufangzhou 9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
liumengyi 96ded748b6 * Add punctuation. 2021-12-21 13:50:40 +08:00
liumengyi b8166358ad * Finish task #46244, #46243. 2021-12-21 13:46:31 +08:00
孙广明 84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
liumengyi 79c523399b * Modify kanban judgment in recycle bin. 2021-12-20 08:28:18 +08:00
liumengyi 7d3ad08bc6 * Finish task #46158, and fix bug #17657,#17655. 2021-12-17 15:39:41 +08:00