Commit Graph
1463 Commits
Author SHA1 Message Date
sunguangming 3c17a54dc6 * Code for task #71166. 2022-09-29 13:36:21 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
曹延义 5a652d9ef6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 15:57:00 +08:00
tanghucheng 83dbebc5b8 * Task#70759 Add relation productID for copyProject. 2022-09-28 11:16:33 +08:00
曹延义 d16362e3da * Set batch edit checkbox style to cookie. 2022-09-28 08:58:30 +08:00
wangyidong 2d42ff9e55 * code for task #70197. 2022-09-27 14:25:44 +08:00
tanghucheng 2fbae5ed72 * Finish task #70759. 2022-09-27 11:10:47 +08:00
tianshujie 3243e1d1c2 * Fix bug #27971. 2022-09-27 09:49:13 +08:00
王怡栋 444834b316 Merge branch 'sprint/zentaopms240' into 'sprint/zentaopms240_lanzongjun'
# Conflicts:
#   module/custom/js/mode.js
#   module/custom/lang/de.php
#   module/custom/lang/en.php
#   module/custom/lang/fr.php
#   module/custom/lang/zh-cn.php
#   module/custom/view/mode.html.php
#   module/project/control.php
#   module/project/lang/zh-cn.php
2022-09-27 00:28:36 +00:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
sunguangming f628589572 * Code for projecr priv. 2022-09-26 14:42:40 +08:00
lanzongjun 905a71ddf7 * fix bug meeting 2022-09-23 17:25:45 +08:00
liugang 5cf52d86dd * Fix bug #27584,27588,27596,27616,27620,27621,27631. 2022-09-23 15:45:00 +08:00
liugang ffc73c5d97 * Fix bug #27578. 2022-09-22 17:38:55 +08:00
lanzongjun 3438ffbbc0 * fix bug #27793 2022-09-22 15:27:04 +08:00
lanzongjun 4c7fe09c1e * fix bug #27793 2022-09-22 15:24:24 +08:00
wangyidong d4f7d6725f * fix for create project. 2022-09-21 14:20:57 +08:00
wangyidong 64689cbd17 * code for task #69707. 2022-09-20 15:44:33 +08:00
liugang 15f3ec081b * Fix bug #27562. 2022-09-19 16:30:49 +08:00
liugang a51e63ab52 * Finish task #69005. 2022-09-19 10:56:54 +08:00
tanghucheng 30ad85c622 * Finish task #69004. 2022-09-16 16:11:55 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
liuruogu cc80ff7209 * Finish task #69016. 2022-09-15 05:14:16 +00:00
liuruogu 04824e964b * Finish task #69016. 2022-09-15 05:12:30 +00:00
liuruogu 04cd8275fe * Finish task #69016. 2022-09-15 02:42:40 +00:00
tanghucheng 710b11ff0c * Finish task #69001. 2022-09-14 17:16:53 +08:00
liugang b45b3e3661 * Finish task #68999. 2022-09-14 14:07:00 +08:00
tianshujie 292b148253 * Finish task #68942. 2022-09-14 08:45:03 +08:00
tianshujie ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +08:00
xieqiyu 6cfb7f414f * Fix bug#27042. 2022-08-30 14:32:54 +08:00
tianshujie 915baa54b5 * Fix bug #26936. 2022-08-29 10:09:10 +08:00
tianshujie aa0f16c8e8 * Fix bug #26936. 2022-08-26 16:31:41 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
王怡栋 2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
zhouxudong 0a3c297b43 * Finish task #64882. 2022-08-19 02:18:16 +00:00
zhouxudong 9883b69c7d * Finish task #64882. 2022-08-18 09:21:35 +00:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
zhouxudong fea283edf4 * Finish task #64882. 2022-08-17 06:26:44 +00:00
lanzongjun 572021a1bd * fix params 2022-08-16 13:06:58 +08:00
lanzongjun 4b21f31e5c * fix bug #26462 2022-08-16 11:22:57 +08:00
lanzongjun 5b380fedb4 * fix bug cp project 2022-08-16 09:19:27 +08:00
tianshujie 72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
zhouxudong 7826781cff * Fix bug. 2022-08-11 08:53:49 +00:00
wangyidong 901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
xieqiyu bd18594c80 * Code for task#63579. 2022-08-10 15:09:57 +08:00
xieqiyu f8cf3855d2 * Code for task#63581. 2022-08-10 13:04:40 +08:00
zhouxudong 01c75c8370 * Finish task. 2022-08-09 15:08:33 +00:00
zhouxudong 808d01aa17 * Finish task. 2022-08-09 09:43:34 +00:00
zhouxudong 3cc9977663 * Finisha task. 2022-08-09 05:49:27 +00:00