Commit Graph
1093 Commits
Author SHA1 Message Date
王怡栋 c14392a3ac * round for project progress. 2021-11-17 13:31:56 +08:00
王怡栋 bc81d745d8 * fix for statistical data. 2021-11-17 09:22:05 +08:00
王怡栋 d68ce78a66 * code for task #44325. 2021-11-16 14:40:42 +08:00
孙广明 102d718ecf Merge branch 'sprint/170' into 'sprint/170_zhengrunyu_44498'
# Conflicts:
#   module/project/model.php
2021-11-16 05:47:29 +00:00
zhengrunyu d5783e71b3 *Finish task #44498. 2021-11-16 13:43:05 +08:00
李玉春 b74f5ab258 Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Fix bug #43916.

See merge request easycorp/zentaopms!465
2021-11-16 03:20:54 +00:00
zhouxin dd5cf8c7bd Fix bug #43916. 2021-11-15 19:15:20 +08:00
李玉春 a8523d317a Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.

See merge request easycorp/zentaopms!437
2021-11-15 05:05:00 +00:00
tianshujie 50b4590655 * Fix bug #16194. 2021-11-12 14:53:51 +08:00
zhouxin e57d1d1cc7 Finish task #43916. 2021-11-12 14:06:44 +08:00
孙广明 6d625bb597 * Finish task #43998. 2021-11-10 09:43:04 +08:00
李玉春 98f519fe31 Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
#   module/branch/model.php
#   module/story/model.php
2021-11-09 07:53:17 +00:00
tianshujie 8e9dd74c0d * Modify code logic. 2021-11-09 15:47:31 +08:00
tianshujie 5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
zhengrunyu 0f975ee3c4 *Finish task #44157. 2021-11-09 13:48:06 +08:00
zhengrunyu 57bc70b75b *Finish task #44157. 2021-11-09 13:31:05 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
孙广明 9f85b1a557 * Fix kanban error. 2021-11-08 18:22:02 +08:00
孙广明 d49b7eac72 * Fix kanban error. 2021-11-08 17:35:09 +08:00
李玉春 c97af049d8 Merge branch 'sprint/171_sgm_43948' into 'spirnt/168_liyuchun_bug'
Sprint/171 sgm 43948

See merge request easycorp/zentaopms!346
2021-11-08 09:04:11 +00:00
孙广明 c7529ca96f * Code for task #43998. 2021-11-08 17:01:31 +08:00
孙广明 870b311f06 * Fix errors. 2021-11-08 16:32:18 +08:00
zhouxin 92fb767ff9 Finish task #43916. 2021-11-08 14:34:44 +08:00
孙广明 1ecb25aabc * Code for task #43994. 2021-11-08 13:18:53 +08:00
孙广明 3965d5339b * Finish task #44002, #44003... 2021-11-08 13:12:25 +08:00
王怡栋 a9f8491388 * adjust for flow. 2021-11-05 16:41:26 +08:00
孙广明 d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
孙广明 75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
zhengrunyu 6a20c5b9b9 *Finish task #43915. 2021-11-03 17:16:46 +08:00
王怡栋 076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
孙广明 ee28e0f7ef * Add bind product action. 2021-10-27 09:37:39 +08:00
李玉春 1ee2b61d95 Merge branch 'sprint/167_xieqiyu_15457' into 'sprint/167'
* Fix bug#15457.

See merge request easycorp/zentaopms!78
2021-10-18 01:17:58 +00:00
王怡栋 351b07352b Merge branch '15.6' into sprint/167 2021-10-18 08:53:13 +08:00
xieqiyu 3e8e0dbcce * Fix bug#15457. 2021-10-16 15:32:13 +08:00
xieqiyu 21ad4ecf0a * Code for bug#15543.Modify the consumed hours of the project in the block. 2021-10-16 08:27:28 +08:00
xieqiyu 5cd2f5d2db * Code for bug#15543. 2021-10-15 14:45:01 +08:00
xieqiyu 5697ba482a * Fix bug#15543. 2021-10-15 14:13:41 +08:00
hufangzhou dc8317d122 * Fix bug #15544. 2021-10-15 14:11:42 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
tianshujie f5e1ceb880 * Finish task #43169. 2021-10-14 09:24:16 +08:00
hufangzhou 1e173e756d * Fix bug #15498. 2021-10-13 16:15:57 +08:00
hufangzhou 013b6a37cd * Fix bug #15476. 2021-10-12 17:36:18 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
王怡栋 0fa52d3318 * adjust for review code. 2021-10-09 09:29:10 +08:00
王怡栋 ee39f52c2e * finish task #42846. 2021-09-29 11:51:17 +08:00
王怡栋 1c7301c929 * Save session with tab for project. 2021-09-27 16:04:03 +08:00
王怡栋 a33f9b096d * adjust for project link in classic mode. 2021-09-24 16:27:08 +08:00
zenggang e6ed9fba46 * Fix bug#14654 2021-09-15 14:19:01 +08:00
xieqiyu d53385ae04 * Fix bug#14879. 2021-09-15 14:04:23 +08:00
zenggang 321b257bad * Fix bug#14587 2021-09-14 16:19:41 +08:00