Commit Graph
225 Commits
Author SHA1 Message Date
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
李玉春 6399c58056 Merge branch 'sprint/228_tianshujie_64976' into 'master'
Sprint/228 tianshujie 64976

See merge request easycorp/zentaopms!5017
2022-08-18 09:57:34 +00:00
tianshujie 98694da2ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-18 16:47:14 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
王怡栋 f3d49ef75f Merge branch 'sprint/max42_mayue_task#64939' into 'master'
Sprint/max42 mayue task#64939

See merge request easycorp/zentaopms!5010
2022-08-18 05:54:12 +00:00
mayue e95ecf9244 * Finish task #64939. 2022-08-17 16:20:17 +08:00
caoyanyi 8c1a24d3b5 Merge branch 'master' into zenops_41 2022-08-17 16:03:23 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +08:00
tanghucheng 517fd4b79e * Fix bug for gantt menu. 2022-08-15 15:44:47 +08:00
tanghucheng 2bc6e7a1e8 * Sort execution and project gantt menu . 2022-08-15 14:28:31 +08:00
liyuchun a4b8a6eba2 Merge branch 'master' into zenops_41 2022-08-15 09:38:48 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
liyuchun 6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
liyuchun f3044011d8 * Finish task #62870. 2022-08-01 05:58:24 +00:00
tianshujie cac6216a09 * Finish task #61967. 2022-07-26 10:50:16 +08:00
tianshujie 0c9f532ee0 * Finish task #61970,61969,61968,61966. 2022-07-25 10:40:09 +08:00
tianshujie e19b245d2a * Finish task #61177. 2022-07-20 08:56:53 +08:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
caoyanyi 99fa5aaae3 * Add gitea module. 2022-07-07 08:29:46 +08:00
孙广明 d175ae0f5e Merge branch 'master' into 'liyuchun_59437'
# Conflicts:
#   module/repo/control.php
2022-07-05 09:20:43 +00:00
liyuchun 8a3d924e2b * Finish task #59451. 2022-07-05 08:42:48 +00:00
王怡栋 ae7cc6764d Merge branch 'sgm_kanban' into 'master'
* Finish task #59701.

See merge request easycorp/zentaopms!4348
2022-07-05 07:08:41 +00:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
liyuchun 0044a55b76 * Finish task #59439. 2022-07-05 05:48:02 +00:00
liyuchun dd893ce8e1 * Finish task #59437,59438. 2022-07-04 07:36:29 +00:00
caoyanyi 30850025f5 * Modify tab menu. 2022-07-04 10:44:06 +08:00
xieqiyu 3dff44e506 * Fix bug#24370. 2022-06-30 08:24:25 +08:00
tanghucheng a8834418f1 * Fix bug #24340. 2022-06-27 16:50:39 +08:00
tianshujie 9edd795598 * Fix bug #23398. 2022-06-23 15:40:52 +08:00
tianshujie 6643dd1254 * Resolve issue #681. 2022-06-23 15:04:52 +08:00
caoyanyi dfbf69a211 * Finish task #57664. 2022-06-21 10:33:12 +08:00
liumengyi e661948d67 * Finish story #32879,#32887,#32935,#32934. 2022-05-31 09:21:05 +08:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00
tanghucheng a2c8d78177 * Fix bug . 2022-04-28 19:59:39 +08:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxin b9d8edc02a Fix bug #17224. 2022-03-17 02:51:52 +00:00
hufangzhou 8187472563 * Fix bug #20665. 2022-03-14 09:06:42 +08:00
孙广明 be4313a9df * Fix details. 2022-02-17 13:27:37 +08:00
sgm0422 47f0ca28d5 * Code for jira. 2022-02-10 21:25:41 +08:00
孙广明 94ccf64354 * Add merge jira. 2022-02-09 13:23:28 +08:00
hufangzhou ae4620917e * Fix bug #17993. 2022-01-25 10:34:29 +08:00
朱金勇 399fac5edc Merge branch 'sprint/scx_lang' into 'master'
*Code lang for international ZenTao.

See merge request easycorp/zentaopms!1521
2022-01-20 07:37:10 +00:00
songchenxuan 4ce9f83f06 *Code lang for international ZenTao. 2022-01-20 15:33:12 +08:00