Commit Graph
1152 Commits
Author SHA1 Message Date
王怡栋 cb3671ed66 Merge branch 'zentaopms_239_task#73470' into 'zentaopms_239'
* Finish task #73470.

See merge request easycorp/zentaopms!5896
2022-10-26 08:46:55 +00:00
wangyuting2 f8f329ec94 * Finish task #73470. 2022-10-26 07:01:57 +00:00
wangyuting2 ce602cc78e * Finish task #73061. 2022-10-24 08:00:00 +00:00
wangyidong 9719597cbf * adjust for my audit. 2022-10-19 17:27:09 +08:00
wangyuting2 ecaff099cd * Finish task #72773. 2022-10-19 05:45:15 +00:00
sunguangming bf4779c68b * Fix bug #28414. 2022-10-11 13:30:37 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
李玉春 ffc0440271 Merge branch 'zentaopms_239' into 'zentaopms_239_wangjianhua_70793'
# Conflicts:
#   module/project/lang/de.php
#   module/project/lang/en.php
#   module/project/lang/fr.php
#   module/project/lang/zh-cn.php
2022-10-09 02:25:26 +00:00
wangyuting2 a3b9b7bb52 * Optimize code. 2022-10-08 00:34:06 +00:00
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tanghucheng 82172a408a * Fix bug for pri. 2022-09-29 16:34:33 +08:00
wangyidong 04cc70c4cc * adjust for task #70545. 2022-09-29 13:45:24 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
tanghucheng 8d3ec9efdb * Finish task #70757. 2022-09-28 13:55:41 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
tanghucheng 571fdb40f8 * Finish task #70760. 2022-09-26 16:46:32 +08:00
sunguangming 80430df79d * Finish task #70101. 2022-09-26 14:20:42 +08:00
daitingting 5ca27beec8 * Enabled program language in upgrade mode. 2022-09-21 02:29:17 +00:00
daitingting 8490bf7dbf * Rename noExecution to noSprint.
* Optimize codes.
2022-09-21 01:12:39 +00:00
zhouxin 6ff8f6ba41 * Resolve feedback. 2022-09-20 17:24:37 +08:00
wangyidong 78d1de70c2 * code for task #69248. 2022-09-16 16:28:50 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
曾刚 d0e33c4e3c * Fix bug#27141,27153 2022-09-01 06:53:32 +00:00
zenggang 6c48f5ec97 * Finish task#67260 2022-08-30 06:39:36 +00:00
liumengyi 8afdaa7d27 * Fix bug #26887. 2022-08-25 15:15:14 +08:00
tianshujie 5e06502b84 * Fix bug #26858. 2022-08-25 09:49:55 +08:00
xieqiyu a36eb814db * Add story type for submit review. 2022-08-23 21:52:11 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
xieqiyu 4cbf16a82d * * Modify recall story and delete change assign. 2022-08-19 15:28:14 +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 2851fd4c2c * Resolve issue #720. 2022-08-18 16:24:43 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +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
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
dongli 4597794f91 * Fix bug #63665. 2022-08-11 07:37:20 +00:00
孙广明 0ce4f4dd1d Merge branch 'liyuchun_64397' into 'zenops_41'
* Finish task #64269.

See merge request easycorp/zentaopms!4897
2022-08-11 00:20:46 +00:00
liyuchun 6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
liyuchun 273698d8e6 * Finish task #64269. 2022-08-10 06:54:20 +00:00
tanghucheng 3eccc858eb * Format Code for port. 2022-08-08 10:57:31 +08:00
tanghucheng 28f896e84c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 08:11:14 +08:00
胡方舟 ea3ce57b94 Merge branch 'sprint/221_dongli_62948' into 'master'
* Finish task #62948

See merge request easycorp/zentaopms!4796
2022-08-04 06:17:11 +00:00
tanghucheng 5f4699ceec Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-04 14:10:36 +08:00
dongli bcd6fd0c0f * Finish task #62948 2022-08-04 06:10:02 +00:00
sunguangming 728834da26 * Finish task #62733. 2022-08-04 09:49:35 +08:00