Commit Graph
589 Commits
Author SHA1 Message Date
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
孙广明 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
tanghucheng 1c730049d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-03 14:11:48 +08:00
tianshujie c13808d8df * Finish task #62943,62941,62940,62942. 2022-08-02 15:01:24 +08:00
tanghucheng 5ee43ad1f8 * rename exporttemplet to exporttemplate. 2022-08-01 16:03:38 +08:00
liyuchun f3044011d8 * Finish task #62870. 2022-08-01 05:58:24 +00:00
liumengyi 5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
王怡栋 80c3b67ee1 Merge branch 'sprint/tianshujie_code' into 'master'
Sprint/tianshujie code

See merge request easycorp/zentaopms!4600
2022-07-20 01:15:46 +00:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
孙广明 425a6f8aa5 Merge branch 'liyuchun_60452' into 'zenops_38'
* Finish task #60453.

See merge request easycorp/zentaopms!4474
2022-07-12 09:24:39 +00:00
liyuchun 6cef93edd9 * Finish task #60453. 2022-07-12 06:30:13 +00:00
caoyanyi e5ffd04c34 * Finish task #60565,60566. 2022-07-12 09:45:31 +08:00
caoyanyi 1aa80a3989 * Modify tips. 2022-07-07 09:05:21 +08:00
caoyanyi 99fa5aaae3 * Add gitea module. 2022-07-07 08:29:46 +08:00
caoyanyi 955b2f0d4c * Modify clone url. 2022-07-06 13:25:28 +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
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
liumengyi 8f0073050f * Finish task #58288. 2022-06-22 15:23:38 +08:00
liumengyi 2fce450bb8 * Fix bug for task #58063. 2022-06-22 09:54:08 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
liyuchun e447ec9a11 * Remove unused code. 2022-06-16 08:57:09 +00:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
tianshujie 450ecef008 * Fix bug #23201. 2022-06-13 10:12:29 +08:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00