Commit Graph
3521 Commits
Author SHA1 Message Date
tianshujie 5582354037 * When repairing the project and execution linked products, the branch judgment problem. 2021-11-11 09:42:37 +08:00
tianshujie 11887cffe9 * The product is selected by default when modifying the branch. 2021-11-11 09:00:05 +08:00
tianshujie fb7f493036 * Modify the error code. 2021-11-10 09:58:49 +08:00
tianshujie fe99d1fafb * Finish task #43901. 2021-11-09 19:56:48 +08:00
tianshujie 9e622a2995 * Merge conflicts. 2021-11-09 16:27:06 +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 eedcc1aed5 * Modify code logic. 2021-11-09 10:28:16 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
zhouxin 92fb767ff9 Finish task #43916. 2021-11-08 14:34:44 +08:00
zhengrunyu 64d4d04c7e *Finish task #43915. 2021-11-04 13:13:10 +08:00
zhengrunyu 01a7ed9151 *Finish task #43915. 2021-11-04 13:09:02 +08:00
zhengrunyu 5b47d67d93 *Finish task #43915. 2021-11-04 13:05:19 +08:00
zhengrunyu 79e7052af0 *Finish task #43915. 2021-11-03 17:23:38 +08:00
zhengrunyu 3a5bbcdaf7 *Finish task #43915. 2021-11-03 17:20:24 +08:00
zhengrunyu 6a20c5b9b9 *Finish task #43915. 2021-11-03 17:16:46 +08:00
hufangzhou 8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
mayue af5c3178ee *Fix a bug #15696. 2021-10-28 16:21:31 +08:00
tianshujie 69743fa3a4 * Fix bug #15698. 2021-10-21 08:32:55 +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
李玉春 88323d34da Merge branch 'sprint/167_hufangzhou_15544' into 'sprint/167'
* Fix bug #15544.

See merge request easycorp/zentaopms!76
2021-10-15 06:19:33 +00: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
Hao Sun d8327a0cdc * Task #43195, fix project creating guide modal not show as expected sometimes. 2021-10-15 11:18:37 +08:00
朱金勇 e50c3c65d9 Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'
* Finish task#43179

See merge request easycorp/zentaopms!49
2021-10-15 01:05:33 +00:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
hufangzhou 52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
李玉春 8e1161b02c Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167'
* Finish task #43169.

See merge request easycorp/zentaopms!64
2021-10-14 05:05:12 +00: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
zenggang dbe27dff42 * Fix bug#15490 2021-10-13 08:13:02 +00:00
hufangzhou 013b6a37cd * Fix bug #15476. 2021-10-12 17:36:18 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
zenggang 5f35a398ad * Finish task#43179 2021-10-11 07:26:18 +00:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
朱金勇 ff09127219 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.

See merge request easycorp/zentaopms!41
2021-10-09 01:32:30 +00:00
王怡栋 0fa52d3318 * adjust for review code. 2021-10-09 09:29:10 +08:00
zenggang cc28a1a037 * Fix bug#14382 2021-09-30 14:53:36 +08:00
王怡栋 ee39f52c2e * finish task #42846. 2021-09-29 11:51:17 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
王怡栋 1c7301c929 * Save session with tab for project. 2021-09-27 16:04:03 +08:00
王怡栋 47c0876b9d * fix bug #15389. 2021-09-27 16:03:40 +08:00
王怡栋 a33f9b096d * adjust for project link in classic mode. 2021-09-24 16:27:08 +08:00