Commit Graph
1362 Commits
Author SHA1 Message Date
lanzongjun 493910031a * Finish Task #79466 2022-12-13 09:45:01 +08:00
lanzongjun 295bfadc5b * Finish Task #79671 2022-12-12 15:38:55 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
zenggang 3d676b613a * Fix bug#30719 2022-12-09 00:59:17 +00:00
xieqiyu a7b96c881a * Fix bug#30644. 2022-12-08 12:36:50 +08:00
lanzongjun 0adbd8e27a * Finish Bug #30541 2022-12-06 10:16:34 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
lanzongjun 1651a1492e edit story fix empty 2022-12-01 14:23:31 +08:00
lanzongjun b1831623e5 * Finish Task #77806 2022-11-30 15:16:44 +08:00
liuyongkai 9455b09e17 * Resolve feedback #1459. 2022-11-28 14:55:02 +08:00
liuyongkai 64fb4c10ca * Resolve feedback #1459. 2022-11-28 14:15:58 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
mayue fc4abe395d * Fix bug #30096. 2022-11-24 16:10:19 +08:00
xieqiyu 37122bb5a8 * Fix bug#30056. 2022-11-23 09:34:21 +08:00
王怡栋 3852627523 * fix bug #29557. 2022-11-21 11:30:59 +08:00
xieqiyu df629b33bf * Fix bug#29940. 2022-11-17 11:08:59 +08:00
王怡栋 9e0c3de9da Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
change story

See merge request easycorp/zentaopms!6188
2022-11-16 07:26:11 +00:00
王怡栋 2bb3cd3371 Merge branch 'fixbug' 2022-11-16 13:08:00 +08:00
lanzongjun 9e0ac41d78 change story 2022-11-16 11:31:21 +08:00
tanghucheng 3ce0869e1a * Replace '' to helper::dbIN for release linkStory. 2022-11-16 11:28:40 +08:00
tanghucheng 47398d1cf0 * Fix bug #29869. 2022-11-16 10:52:53 +08:00
lanzongjun 72c38e942e add param 2022-11-15 13:39:09 +08:00
lanzongjun 4d4b1565f4 * finish task #75923#75924 2022-11-15 10:23:54 +08:00
lanzongjun c512ab0d73 * finish task #75912 2022-11-14 17:06:33 +08:00
lanzongjun 991253d2a8 remove code 2022-11-14 14:48:18 +08:00
lanzongjun d6c741c436 * finish task #75911 2022-11-14 14:35:55 +08:00
孙广明 ca3de7cc84 Merge branch 'lyk_feedback_1411' into 'master'
* Resolve feedback #1411.

See merge request easycorp/zentaopms!6121
2022-11-11 06:50:22 +00:00
liuyongkai dd519c7587 * Resolve feedback #1411. 2022-11-11 13:02:26 +08:00
王怡栋 66b9e6b116 Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
#   framework/base/router.class.php
2022-11-11 02:49:32 +00:00
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
孙广明 1a65c652fc Merge branch 'master_xieqiyu_29483' into 'master'
* Fix bug#29483.

See merge request easycorp/zentaopms!6114
2022-11-11 01:41:38 +00:00
tianshujie ea99f50a0a * Fix bug #29361. 2022-11-11 09:36:10 +08:00
xieqiyu 318f8b7b31 * Fix bug#29483. 2022-11-11 01:32:38 +00:00
xieqiyu 53bde8fe9f * Fix bug#29533. 2022-11-10 05:38:49 +00:00
xieqiyu 4fc42ecaa8 * Fix bug#29457. 2022-11-10 00:33:46 +00:00
tanghucheng e09a070318 * Merge branch 'master' into transfer. 2022-11-09 15:44:42 +08:00
孙广明 f0037b4036 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* finish task #75330

See merge request easycorp/zentaopms!6080
2022-11-09 07:39:44 +00:00
xieqiyu b90a9f1742 * Finish task#75322. 2022-11-09 00:46:03 +00:00
lanzongjun 33551e41c1 * finish task #75330 2022-11-08 17:48:26 +08:00
王怡栋 ce2eda09f8 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* finish task #75318#75327#75328

See merge request easycorp/zentaopms!6075
2022-11-08 07:36:39 +00:00
lanzongjun bdfb04fabf * finish task #75318 2022-11-08 09:49:17 +08:00
xieqiyu 5467f11490 * Code for task#75325. Sync siblings when recall review. 2022-11-08 01:39:27 +00:00
xieqiyu 7f04f391e5 * Code for task#75325. Sync siblings when recall change. 2022-11-08 01:29:44 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
xieqiyu f01d68f80b * Code for task#75325. Finish submit review sync siblings. 2022-11-07 07:58:08 +00:00
liyuchun 7e02324b22 * Fix bug #27253. 2022-11-04 15:17:49 +08:00
孙广明 23c9fb28ce Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix code meeting and  fix bug  #29265

See merge request easycorp/zentaopms!6024
2022-11-04 01:54:15 +00:00
lanzongjun a41290618c * fix bug #29265 2022-11-04 09:28:58 +08:00
tanghucheng 934240acb6 * Code for change story. 2022-11-04 08:57:51 +08:00
lanzongjun 3a6b109c97 fix meeting code 2022-11-03 14:49:12 +08:00